feat:家庭医生初始化

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

@@ -119,7 +119,14 @@ public class PatientServiceImpl implements PatientService {
             List<PatientSignEntity> patientSignEntities = getPatientSignList(reqVo.getPhone(), reqVo.getPackageOrderId(),
                     signStatus, status);
             if (!patientSignEntities.isEmpty()) {
-                return BaseResponse.error("已经有进行中的签约或者改签医生，不能再进行签约或者改签！！！");
+                if (!SignStatus.CANCEL.getValue().equals(reqVo.getSignStatus())) {
+                    return BaseResponse.error("已经有进行中的签约或者改签医生，不能再进行签约或者改签！！！");
+                }
+                PatientSignEntity patientSignEntity = patientSignEntities.get(0);
+                Date signCreateTime = patientSignEntity.getCreateTime();
+                if (signCreateTime.after(signStartTime) && signCreateTime.before(signEndTime)) {
+                    return BaseResponse.error("已经有进行中的签约或者改签医生，不能再进行签约或者改签！！！");
+                }
             }
         } else {
             QueryWrapper<PatientSignEntity> psWrapper = new QueryWrapper<>();