From a926f6324dd4e077bb6001a6bc0eaf2edf1aafb4 Mon Sep 17 00:00:00 2001
From: zhangheng <3226558941@qq.com>
Date: Thu, 25 Jul 2024 09:52:37 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B6=88=E6=81=AF=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/subscribeTaskServiceImpl.java        | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/postdischarge-quartz/src/main/java/com/xinelu/quartz/service/impl/subscribeTaskServiceImpl.java b/postdischarge-quartz/src/main/java/com/xinelu/quartz/service/impl/subscribeTaskServiceImpl.java
index 5cbc5709..990efc22 100644
--- a/postdischarge-quartz/src/main/java/com/xinelu/quartz/service/impl/subscribeTaskServiceImpl.java
+++ b/postdischarge-quartz/src/main/java/com/xinelu/quartz/service/impl/subscribeTaskServiceImpl.java
@@ -2,7 +2,6 @@ package com.xinelu.quartz.service.impl;
 
 import com.alibaba.fastjson2.JSON;
 import com.xinelu.common.config.WeChatAppletChatConfig;
-import com.xinelu.common.enums.PatientTypeEnum;
 import com.xinelu.common.enums.RouteNodeNameEnum;
 import com.xinelu.common.enums.SubscribeStatusEnum;
 import com.xinelu.mobile.domain.TemplateContent;
@@ -57,9 +56,17 @@ public class subscribeTaskServiceImpl implements SubscribeTaskService {
                 continue;
             }
             //判断路径节点，组装数据
-
+            LocalDate localDate = null;
             PatientVO patientVO = patientList.stream().filter(Objects::nonNull).filter(item -> signPatientManageRouteNode.getPatientId().equals(item.getPatientId())).findFirst().orElse(new PatientVO());
-            LocalDate localDate = patientVO.getDischargeTime().plusDays(signPatientManageRouteNode.getRouteNodeDay());
+            if (Objects.nonNull(patientVO.getDischargeTime())) {
+                localDate = patientVO.getDischargeTime().plusDays(signPatientManageRouteNode.getRouteNodeDay());
+            }
+            if (Objects.nonNull(patientVO.getVisitDate())) {
+                localDate = patientVO.getVisitDate().plusDays(signPatientManageRouteNode.getRouteNodeDay());
+            }
+            if (Objects.isNull(localDate)) {
+                continue;
+            }
             boolean before = localDate.isBefore(LocalDate.now()) || localDate.isEqual(LocalDate.now());
             if (before) {
                 signPatientManageRouteNode.setOpenId(patientVO.getOpenId());
@@ -67,8 +74,7 @@ public class subscribeTaskServiceImpl implements SubscribeTaskService {
                 signPatientManageRouteNode.setRouteNodeName(RouteNodeNameEnum.getNameByInfo(signPatientManageRouteNode.getRouteNodeName()).getName());
                 patientVOList.add(signPatientManageRouteNode);
             }
-            patientVOList.add(signPatientManageRouteNode);
-
+        }
 
 //            //如果节点 适用范围是 出院后或就诊/出院后
 //            if (signPatientManageRouteNode.getRouteNodeName().equals(RouteNodeNameEnum.AFTER_DISCHARGE.getInfo()) || signPatientManageRouteNode.getRouteNodeName().equals(RouteNodeNameEnum.AFTER_VISIT_DISCHARGE.getInfo())) {
@@ -116,9 +122,6 @@ public class subscribeTaskServiceImpl implements SubscribeTaskService {
 //                }
 //            }
 
-       }
-
-
         List<Long> signPatientManageRouteNodeIds = new ArrayList<>();
         //发送
         for (PatientVO patientVO : patientVOList) {