From 117d7e3eb343fd5426f8dd10c10f88f032a3dedf Mon Sep 17 00:00:00 2001
From: zhangheng <3226558941@qq.com>
Date: Fri, 2 Aug 2024 09:27:47 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F=E6=B6=88=E6=81=AF?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../quartz/service/impl/SendTextMessageServiceImpl.java      | 5 +++--
 .../xinelu/quartz/service/impl/subscribeTaskServiceImpl.java | 5 +++--
 2 files changed, 6 insertions(+), 4 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 70eb37d0..bf65284e 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
@@ -22,6 +22,7 @@ import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
 import java.time.LocalDate;
+import java.time.temporal.ChronoUnit;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
@@ -89,8 +90,8 @@ public class SendTextMessageServiceImpl implements SendTextMessageService {
             boolean before = localDate.isBefore(LocalDate.now()) || localDate.isEqual(LocalDate.now());
             if (before) {
                 //超出7天，更改状态
-                int i = LocalDate.now().compareTo(localDate);
-                if (i >= pushMessageRestrictions.getTime()) {
+                long until = LocalDate.now().until(localDate, ChronoUnit.DAYS);
+                if (until >= pushMessageRestrictions.getTime()) {
                     expiredManageRouteNodeIds.add(textMessage.getSignPatientManageRouteNodeId());
                     continue;
                 }
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 ae97afac..17055df1 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
@@ -21,6 +21,7 @@ import org.springframework.stereotype.Service;
 import javax.annotation.Resource;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
+import java.time.temporal.ChronoUnit;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
@@ -86,8 +87,8 @@ public class subscribeTaskServiceImpl implements SubscribeTaskService {
             }
             boolean before = localDate.isBefore(LocalDate.now()) || localDate.isEqual(LocalDate.now());
             if (before) {
-                int i = LocalDate.now().compareTo(localDate);
-                if (i >= pushMessageRestrictions.getTime()) {
+                long until = LocalDate.now().until(localDate, ChronoUnit.DAYS);
+                if (until >= pushMessageRestrictions.getTime()) {
                     expiredManageRouteNodeIds.add(patientVO.getSignPatientManageRouteNodeId());
                     continue;
                 }