feat:家庭医生初始化

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

@@ -180,7 +180,7 @@ public class ImChatTemplateImpl implements ImChatTemplate {
                                 }
                             } else if (i == 1) {
                                 Map<String, Object> imageMap = new HashMap<>();
-                                if (reportDetailVo.getReportType().equals(1)) {
+//                                if (reportDetailVo.getReportType().equals(1)) {
                                     imageMap.put("UserAction", CommonConstants.USER_ACTION);
                                     imageMap.put("applicationCode", IMInformConstants.IM_SYSTEM_BUSINESS_CODE);
                                     imageMap.put("appointmentId", sendImMsgDTO.getAdmId());
@@ -197,7 +197,7 @@ public class ImChatTemplateImpl implements ImChatTemplate {
                                     imageMap.put("toApplicationCode", IMInformConstants.IM_SYSTEM_BUSINESS_CODE);
 
                                     msgType = "TIMCustomElem";
-                                }
+//                                }
                                 content = JSONObject.toJSONString(imageMap);
                             } else if (i == 2) {
                                 if (Objects.nonNull(reportDetailVo)) {

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

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