diff --git a/postdischarge-quartz/src/main/java/com/xinelu/quartz/service/impl/SendTextMessageServiceImpl.java b/postdischarge-quartz/src/main/java/com/xinelu/quartz/service/impl/SendTextMessageServiceImpl.java index c5311fe3..afd2e8f0 100644 --- a/postdischarge-quartz/src/main/java/com/xinelu/quartz/service/impl/SendTextMessageServiceImpl.java +++ b/postdischarge-quartz/src/main/java/com/xinelu/quartz/service/impl/SendTextMessageServiceImpl.java @@ -70,12 +70,12 @@ public class SendTextMessageServiceImpl implements SendTextMessageService { } boolean before = localDate.isBefore(LocalDate.now()) || localDate.isEqual(LocalDate.now()); if (before) { - textMessage.setRouteNodeName(RouteNodeNameEnum.AFTER_DISCHARGE.getName()); + textMessage.setRouteNodeName(RouteNodeNameEnum.getNameByInfo(textMessage.getRouteNodeName()).getName()); messages.add(textMessage); } } - //判断路径节点,组装数据 + //判断路径节点,组装数据 // if (textMessage.getRouteNodeName().equals(RouteNodeNameEnum.AFTER_DISCHARGE.getInfo()) || textMessage.getRouteNodeName().equals(RouteNodeNameEnum.AFTER_VISIT_DISCHARGE.getInfo())) { // if (textMessage.getPatientType().equals(PatientTypeEnum.DISCHARGED_PATIENT.getInfo()) && Objects.nonNull(textMessage.getDischargeTime())) { // LocalDate localDate = textMessage.getDischargeTime().plusDays(textMessage.getRouteNodeDay()); @@ -107,23 +107,24 @@ public class SendTextMessageServiceImpl implements SendTextMessageService { // } // } // } - //发送 - if (CollectionUtils.isNotEmpty(messages)) { - List ids = new ArrayList<>(); - for (TextMessage message : messages) { - SmsInfoDTO smsInfoDTO = new SmsInfoDTO(); - smsInfoDTO.setPhoneNumbers(message.getPatientPhone()); - smsInfoDTO.setSignName(aliYunSmsTwoConfig.getSignName()); - // 根据模版id发送 - smsInfoDTO.setTemplateCode(message.getTextMessageId()); - Boolean aBoolean = smsSendUtils.sendTextMessage(smsInfoDTO); - if (aBoolean) { - ids.add(message.getSignPatientManageRouteNodeId()); - } - } - if (CollectionUtils.isNotEmpty(ids)) { - signPatientManageRouteNodeMapper.updateMessageStatusByIds(ids); + //发送 + if (CollectionUtils.isNotEmpty(messages)) { + List ids = new ArrayList<>(); + for (TextMessage message : messages) { + SmsInfoDTO smsInfoDTO = new SmsInfoDTO(); + smsInfoDTO.setPhoneNumbers(message.getPatientPhone()); + smsInfoDTO.setSignName(aliYunSmsTwoConfig.getSignName()); + // 根据模版id发送 + smsInfoDTO.setTemplateCode(message.getTextMessageId()); + Boolean aBoolean = smsSendUtils.sendTextMessage(smsInfoDTO); + if (aBoolean) { + ids.add(message.getSignPatientManageRouteNodeId()); } } + //修改节点状态 + if (CollectionUtils.isNotEmpty(ids)) { + signPatientManageRouteNodeMapper.updateMessageStatusByIds(ids); + } } } +}