feat:家庭医生初始化

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

@@ -158,15 +158,14 @@ public class ImChatTemplateImpl implements ImChatTemplate {
                 List<MessageInfo> messageInfos = new ArrayList<>();
                 PatientSignInfo patientSignInfo = getPatientSignInfo(sendImMsgDTO.getAdmId());
                 MessageInfo messageInfo = new MessageInfo();
-                content = MessageFormat.format(content, patientSignInfo.getDoctorName());
-                if (!StringUtils.isEmpty(sendImMsgDTO.getOldAdmId())) {
-                    PatientSignInfo oldPatientSignInfo = getPatientSignInfo(sendImMsgDTO.getOldAdmId());
-                    log.info("之前的oldPatientSignInfo={}", oldPatientSignInfo);
-                    log.info("来源patientSignInfo={}", patientSignInfo);
-                    content = MessageFormat.format(content, oldPatientSignInfo.getDoctorName(), patientSignInfo.getDoctorName());
 
-                    // 改签的时候判断患者健康计划是否开启，开启则不发送健康计划信息
+                // 报告异常特殊处理
+                if (MsgTempTypeEnum.REP_ANO.getValue().equals(sendImMsgDTO.getType())) {
+                    content = MessageFormat.format(content, patientSignInfo.getDoctorName(), sendImMsgDTO.getIntention());
+                } else {
+                    if (!StringUtils.isEmpty(sendImMsgDTO.getOldAdmId())) {
                         if (MsgTempTypeEnum.UP_SUC.getValue().equals(sendImMsgDTO.getType())) {
+                            content = MessageFormat.format(content, patientSignInfo.getDoctorName());
                             if (!Objects.nonNull(componentsList.get(i).getConditionFlag())
                                     && CommonConstants.STATUS_VALID.equals(componentsList.get(i).getConditionFlag())) {
                                 // 查询用户健康计划是否开启状态
@@ -180,12 +179,17 @@ public class ImChatTemplateImpl implements ImChatTemplate {
                                     }
                                 }
                             }
+                        } else {
+                            PatientSignInfo oldPatientSignInfo = getPatientSignInfo(sendImMsgDTO.getOldAdmId());
+                            log.info("之前的doctorName={}", oldPatientSignInfo.getDoctorName());
+                            log.info("来源的doctorName={}", oldPatientSignInfo.getDoctorName());
+                            content = MessageFormat.format(content, oldPatientSignInfo.getDoctorName(), patientSignInfo.getDoctorName());
                         }
+
+                    } else {
+                        content = MessageFormat.format(content, patientSignInfo.getDoctorName());
                     }
 
-                // 报告异常特殊处理
-                if (MsgTempTypeEnum.REP_ANO.getValue().equals(sendImMsgDTO.getType())) {
-                    content = MessageFormat.format(content, patientSignInfo.getDoctorName(), sendImMsgDTO.getIntention());
                 }
 
                 if (SenderEnum.DOCTOR.getDesc().equals(componentsList.get(i).getSender())) {