From d2674e49055317f89445de87e760e321a1d7b76a Mon Sep 17 00:00:00 2001
From: zhangheng <3226558941@qq.com>
Date: Thu, 25 Jul 2024 17:34:20 +0800
Subject: [PATCH] =?UTF-8?q?=E7=9F=AD=E4=BF=A1=E6=8E=A8=E9=80=81=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/SendTextMessageServiceImpl.java      | 37 ++++++++++---------
 1 file changed, 19 insertions(+), 18 deletions(-)

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<Long> 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<Long> 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);
+            }
         }
     }
+}