fix:bug fix

server-service/src/main/java/com/makeit/service/platform/alarm/impl/PlatAlarmRecordServiceImpl.java

@@ -422,11 +422,11 @@ public class PlatAlarmRecordServiceImpl extends ServiceImpl<PlatAlarmRecordMappe
      */
     private void noticeByChannel(PlatAlarmConfig alarmConfig, PlatAlarmRecord alarmRecord, Set<String> phoneSet,Set<String> emailSet,
                                  List<SendTypeEnum> notifyChannelList, List<MsgSendDTO.ReceiverInfo> receiverInfos) {
-        log.info("开始短信通知:{},老人：{}", JSON.toJSONString(alarmConfig), alarmRecord.getElderName());
-        if (StrUtil.isNotBlank(alarmRecord.getElderIds()) && StrUtil.isBlank(alarmRecord.getElderName())) {
+        String elderName = alarmRecord.getElderName();
+        log.info("开始短信通知:{},老人：{}", JSON.toJSONString(alarmConfig), elderName);
+        if (StrUtil.isNotBlank(alarmRecord.getElderIds()) && StrUtil.isBlank(elderName)) {
             List<PlatElder> platElders = platElderService.listByIds(Arrays.asList(alarmRecord.getElderIds().split(",")));
-            String elderName = platElders.stream().map(PlatElder::getName).collect(Collectors.joining(","));
-            alarmRecord.setElderName(elderName);
+            elderName = platElders.stream().map(PlatElder::getName).collect(Collectors.joining(","));
             log.info("开始短信通知--通知老人：{}", elderName);
         }
         String notifyChannel = alarmConfig.getNotifyChannel();
@@ -464,24 +464,24 @@ public class PlatAlarmRecordServiceImpl extends ServiceImpl<PlatAlarmRecordMappe
                 msgSendDTO.setEmailSet(emailSet);
                 msgSendDTO.setOriContent(alarmRecord.getContent());
                 msgSendDTO.setSubject(alarmRecord.getContent());
-                msgSendDTO.setParam(alarmRecord.getElderName());
+                msgSendDTO.setParam(elderName);
                 msgSendDTO.setReceiverInfos(receiverInfos);
                 String alarmType = alarmConfig.getAlarmType();
                 //告警类型 数据字典 1 长者跌倒 2 呼吸异常 3 心率异常 4 行为异常 5 离床异常
                 if (StringUtils.equals(alarmType, "1")) {
-                    msgSendDTO.setParam(alarmRecord.getElderName(),alarmRecord.getRegionName());
+                    msgSendDTO.setParam(elderName,alarmRecord.getRegionName());
                 }
                 if (StringUtils.equals(alarmType, "2")) {
-                    msgSendDTO.setParam(alarmRecord.getElderName(),alarmRecord.getRemark());
+                    msgSendDTO.setParam(elderName,alarmRecord.getRemark());
                 }
                 if (StringUtils.equals(alarmType, "3")) {
-                    msgSendDTO.setParam(alarmRecord.getElderName(),alarmRecord.getRemark());
+                    msgSendDTO.setParam(elderName,alarmRecord.getRemark());
                 }
                 if (StringUtils.equals(alarmType, "4")) {
-                    msgSendDTO.setParam(alarmRecord.getElderName(),alarmRecord.getRegionName());
+                    msgSendDTO.setParam(elderName,alarmRecord.getRegionName());
                 }
                 if (StringUtils.equals(alarmType, "5")) {
-                    msgSendDTO.setParam(alarmRecord.getElderName(), "");
+                    msgSendDTO.setParam(elderName, "");
                 }
                 msgSendDTO.setAlarmType(alarmConfig.getAlarmType());
                 //todo 小程序消息