From 7aa0f8986846d8aa9f58b3a856ad1ae3f2017e92 Mon Sep 17 00:00:00 2001 From: liquanyu Date: Tue, 8 Nov 2022 16:16:38 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=A4=E7=99=8C=E8=BF=BD=E8=AE=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/lyms/platform/query/CancerScreeningQuery.java | 4 ++-- .../platform/operate/web/service/impl/CervicalCancerServiceImpl.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/platform-dal/src/main/java/com/lyms/platform/query/CancerScreeningQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/CancerScreeningQuery.java index 7ba7fd3..32c6642 100644 --- a/platform-dal/src/main/java/com/lyms/platform/query/CancerScreeningQuery.java +++ b/platform-dal/src/main/java/com/lyms/platform/query/CancerScreeningQuery.java @@ -385,7 +385,7 @@ public class CancerScreeningQuery extends BaseQuery implements IConvertToNativeQ if (yqDaysStart != null && yqDaysEnd != null) { Date start = DateUtil.addDay(currentDate,-yqDaysEnd); - Date end = DateUtil.addDay(currentDate,-yqDaysStart); + Date end = DateUtil.addDay(currentDate,-yqDaysStart+1); if (null != c) { c = c.and("nextDate").gte(start).lte(end); } else { @@ -393,7 +393,7 @@ public class CancerScreeningQuery extends BaseQuery implements IConvertToNativeQ } } else if (yqDaysStart != null) { - Date end = DateUtil.addDay(currentDate,-yqDaysStart); + Date end = DateUtil.addDay(currentDate,-yqDaysStart+1); condition=condition.and("nextDate", end, MongoOper.LTE); } else if (yqDaysEnd != null) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/CervicalCancerServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/CervicalCancerServiceImpl.java index 3bce740..6e5d7bd 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/CervicalCancerServiceImpl.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/CervicalCancerServiceImpl.java @@ -310,11 +310,11 @@ public class CervicalCancerServiceImpl implements CervicalCancerService { if (param.getYqDaysStart() != null && param.getYqDaysEnd() != null) { Date start = DateUtil.addDay(currentDate,-param.getYqDaysEnd()); - Date end = DateUtil.addDay(currentDate,-param.getYqDaysStart()); + Date end = DateUtil.addDay(currentDate,-param.getYqDaysStart()+1); query.addCriteria(Criteria.where("nextDate").gte(start).lte(end)); } else if (param.getYqDaysStart() != null) { - Date end = DateUtil.addDay(currentDate,-param.getYqDaysStart()); + Date end = DateUtil.addDay(currentDate,-param.getYqDaysStart()+1); query.addCriteria(Criteria.where("nextDate").lte(end)); } else if (param.getYqDaysEnd() != null) -- 1.8.3.1