feat:家庭医生初始化

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

@@ -95,17 +95,11 @@ public class PatientServiceImpl implements PatientService {
         Long deptId = reqVo.getDeptId();
         String deptName = reqVo.getDeptName();
         List<PatientSignEntity> patientSignEntities = new ArrayList<>();
-        if (SignStatus.SIGNED.getValue().equals(reqVo.getSignStatus())) {
-            patientSignEntities = getPatientSignList(reqVo.getPhone(), reqVo.getPackageOrderId(),
-                    SignStatus.SIGNED.getValue(), StatusEnum.IN_CONSULTATION.getValue());
-            if (!patientSignEntities.isEmpty()) {
-                return BaseResponse.error("已经有进行中的签约的医生，不能再进行签约！！！");
-            }
-        } else if (SignStatus.CANCEL.getValue().equals(reqVo.getSignStatus())) {
+        if (!SignStatus.NORMAL.getValue().equals(reqVo.getSignStatus())) {
             patientSignEntities = getPatientSignList(reqVo.getPhone(), reqVo.getPackageOrderId(),
-                    SignStatus.CANCEL.getValue(), StatusEnum.IN_CONSULTATION.getValue());
+                    reqVo.getSignStatus(), StatusEnum.IN_CONSULTATION.getValue());
             if (!patientSignEntities.isEmpty()) {
-                return BaseResponse.error("已经有进行中的改签医生，不能再进行改签签约！！！");
+                return BaseResponse.error("已经有进行中的签约或者改签医生，不能再进行签约或者改签！！！");
             }
         } else {
             QueryWrapper<PatientSignEntity> psWrapper = new QueryWrapper<>();
@@ -150,6 +144,11 @@ public class PatientServiceImpl implements PatientService {
             }
         }
 
+        // 改签或者排班医生获取签约的id
+        if (!SignStatus.SIGNED.getValue().equals(reqVo.getSignStatus())) {
+            patientSignEntities = getPatientSignList(reqVo.getPhone(), reqVo.getPackageOrderId(),
+                    SignStatus.SIGNED.getValue(), StatusEnum.IN_CONSULTATION.getValue());
+        }
         PatientSignEntity patientSignEntity = new PatientSignEntity();
         patientSignEntity.setAdmId(admId);
         patientSignEntity.setAppCode(CommonConstants.APP_CODE);