feat:家庭医生初始化

family-doctor-server/src/main/java/com/ebaiyihui/family/doctor/server/service/impl/PatientServiceImpl.java

@@ -110,8 +110,14 @@ public class PatientServiceImpl implements PatientService {
         }
 
         if (!SignStatus.NORMAL.getValue().equals(reqVo.getSignStatus())) {
+            Integer signStatus = SignStatus.SIGNED.getValue();
+            Integer status = StatusEnum.IN_CONSULTATION.getValue();
+            if (SignStatus.CANCEL.getValue().equals(reqVo.getSignStatus())) {
+                signStatus = SignStatus.CANCEL.getValue();
+                status = StatusEnum.FINISH_APPLY.getValue();
+            }
             List<PatientSignEntity> patientSignEntities = getPatientSignList(reqVo.getPhone(), reqVo.getPackageOrderId(),
-                    SignStatus.SIGNED.getValue(), StatusEnum.IN_CONSULTATION.getValue());
+                    signStatus, status);
             if (!patientSignEntities.isEmpty()) {
                 return BaseResponse.error("已经有进行中的签约或者改签医生，不能再进行签约或者改签！！！");
             }
@@ -216,7 +222,7 @@ public class PatientServiceImpl implements PatientService {
             notifyConsultDataDTO.setSupplierCode(CommonConstants.SUPPLIER_CODE_JTYS);
             thirdOrderPushUtil.syncBenefitUsedOrder(notifyConsultDataDTO);
 
-            if(SignStatus.CANCEL.getValue().equals(reqVo.getSignStatus())){
+            if (SignStatus.CANCEL.getValue().equals(reqVo.getSignStatus())) {
                 // 推送第三方权益使用
                 NotifyConsultDataDTO notifyConsultDataDTO2 = new NotifyConsultDataDTO();
                 notifyConsultDataDTO2.setActivateOrderId(reqVo.getPackageOrderId());
@@ -308,7 +314,7 @@ public class PatientServiceImpl implements PatientService {
         List<ScheduleRecordEntity> scheduleRecordEntities = scheduleRecordMapper.selectByDate(String.valueOf(CommonConstants.ORGAN_CODE), 5, date, 1, hourAndSecond);
         log.info("当前排班医生:{}", JSON.toJSONString(scheduleRecordEntities));
 
-        if (!CollectionUtils.isEmpty(scheduleRecordEntities)){
+        if (!CollectionUtils.isEmpty(scheduleRecordEntities)) {
             scheduleRecordEntities.stream().filter(scheduleRecordEntity -> !scheduleRecordEntity.getDoctorId().equals(doctorId)).collect(Collectors.toList());
         }