From 19dd57131f576222e7183660a8a7f8c993daf6a0 Mon Sep 17 00:00:00 2001 From: zhangchao Date: Sat, 27 Jan 2024 11:06:11 +0800 Subject: [PATCH] =?UTF-8?q?#fix=20=E4=BC=98=E5=8C=96=E4=B8=80=E9=94=AE?= =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E8=AE=A2=E5=8D=95=E6=9F=A5=E8=AF=A2=E7=9A=84?= =?UTF-8?q?=E9=80=BB=E8=BE=91=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- oss/src/main/java/com/lyms/oss/utils/DateUtils.java | 4 ++++ .../com/lyms/talkonlineweb/service/impl/LymsHisInfoServiceImpl.java | 4 ++-- .../src/main/java/com/lyms/talkonlineweb/task/ServiceContentTask.java | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/oss/src/main/java/com/lyms/oss/utils/DateUtils.java b/oss/src/main/java/com/lyms/oss/utils/DateUtils.java index 591564a..04c0e9f 100644 --- a/oss/src/main/java/com/lyms/oss/utils/DateUtils.java +++ b/oss/src/main/java/com/lyms/oss/utils/DateUtils.java @@ -174,4 +174,8 @@ public class DateUtils { DateTime dateTime = new DateTime(date); return dateTime.plusYears(years).toDate(); } + + public static void main(String[] args) { + System.out.println(DateUtils.format(DateUtils.addDateDays(new Date(),-14))); + } } diff --git a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/service/impl/LymsHisInfoServiceImpl.java b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/service/impl/LymsHisInfoServiceImpl.java index f6f1f14..a118abd 100644 --- a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/service/impl/LymsHisInfoServiceImpl.java +++ b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/service/impl/LymsHisInfoServiceImpl.java @@ -282,8 +282,8 @@ public class LymsHisInfoServiceImpl extends ServiceImpl queryWrapper = new QueryWrapper<>(); queryWrapper.eq("pid",patient.getId()); - queryWrapper.gt("status",0); - queryWrapper.gt("createdtime", DateUtil.addDay(new Date(),-2)); + queryWrapper.eq("status",1); + queryWrapper.ge("service_end_time", new Date()); List list = lymsOrderService.list(queryWrapper); if(CollectionUtils.isEmpty(list)){ String remark= "患者还没有缴费，暂时不能上传"; diff --git a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/task/ServiceContentTask.java b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/task/ServiceContentTask.java index 96a11e4..e41d39c 100644 --- a/talkonlineweb/src/main/java/com/lyms/talkonlineweb/task/ServiceContentTask.java +++ b/talkonlineweb/src/main/java/com/lyms/talkonlineweb/task/ServiceContentTask.java @@ -34,7 +34,7 @@ public class ServiceContentTask { log.info("serviceContent startup"); Date day=new Date(); String seven= DateUtils.format(DateUtils.addDateDays(day,-7)); - String fourteen= DateUtils.format(DateUtils.addDateDays(day,-15)); + String fourteen= DateUtils.format(DateUtils.addDateDays(day,-14)); String twenty=DateUtils.format(DateUtils.addDateDays(day,-21)); String twentyEight=DateUtils.format(DateUtils.addDateDays(day,-28)); String startStr=" 00:00:00"; -- 1.8.3.1