feat:家庭医生初始化

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

@@ -128,22 +128,21 @@ 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, status);
-            if (!patientSignEntities.isEmpty()) {
-                if (SignStatus.SIGNED.getValue().equals(reqVo.getSignStatus())) {
-                    return BaseResponse.error("已经有进行中的签约或者改签医生，不能再进行签约或者改签！！！");
+            if (SignStatus.SIGNED.getValue().equals(reqVo.getSignStatus())) {
+                List<PatientSignEntity> patientSignEntities = getPatientSignList(reqVo.getPhone(), reqVo.getPackageOrderId(),
+                        signStatus, status);
+                if (!patientSignEntities.isEmpty()) {
+                    if (SignStatus.SIGNED.getValue().equals(reqVo.getSignStatus())) {
+                        return BaseResponse.error("已经有进行中的签约或者改签医生，不能再进行签约或者改签！！！");
+                    }
                 }
+            } else {
                 log.info("signCreateTime={}, signStartTime={}, signEndTime={}", signCreateTime, signStartTime, signEndTime);
                 if (signCreateTime.after(signStartTime) && signCreateTime.before(signEndTime)) {
                     return BaseResponse.error("已经有进行中的签约或者改签医生，不能再进行签约或者改签！！！");
                 }
-//                oldPatientSignEntity = patientSignEntity;
             }
+
         } else {
             QueryWrapper<PatientSignEntity> psWrapper = new QueryWrapper<>();
             PatientSignEntity patientSign = new PatientSignEntity();