From 86862ea0a704fc335cc745e311c85ba10434f664 Mon Sep 17 00:00:00 2001
From: feng <18691763612@163.com>
Date: Wed, 17 Dec 2025 13:36:07 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BF=83=E7=8E=87=E5=BC=82=E5=B8=B8=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E5=8E=BB=E6=8E=89=E6=97=B6=E9=97=B4=E7=9A=84=E9=BB=98?=
 =?UTF-8?q?=E8=AE=A4=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/renkang/watch/dto/XjScreenAbnormalParam.java | 12 ++++--------
 .../watch/service/impl/WatchDataServiceImpl.java     |  4 ++--
 2 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/health-watch/health-watch-api/src/main/java/com/renkang/watch/dto/XjScreenAbnormalParam.java b/health-watch/health-watch-api/src/main/java/com/renkang/watch/dto/XjScreenAbnormalParam.java
index 111db70..4a64ace 100644
--- a/health-watch/health-watch-api/src/main/java/com/renkang/watch/dto/XjScreenAbnormalParam.java
+++ b/health-watch/health-watch-api/src/main/java/com/renkang/watch/dto/XjScreenAbnormalParam.java
@@ -42,20 +42,16 @@ public class XjScreenAbnormalParam {
     private Integer search = 0;
 
     public Date getEndTime() {
-        if (endTime == null) {
-            //没传时间默认查一周
-            endTime = DateUtil.endOfWeek(new Date());
+        if (endTime != null) {
+            endTime = DateUtil.endOfDay(endTime).offset(DateField.MILLISECOND,-999);
         }
-        endTime = DateUtil.beginOfDay(endTime);
         return endTime;
     }
 
     public Date getStartTime() {
-        if (startTime == null) {
-            //没传时间默认查一周
-            startTime = DateUtil.beginOfWeek(new Date());
+        if (startTime != null) {
+            startTime = DateUtil.beginOfDay(startTime);
         }
-        endTime = DateUtil.endOfDay(endTime).offset(DateField.MILLISECOND,-999);
         return startTime;
     }
 }
diff --git a/health-watch/health-watch-biz/src/main/java/com/renkang/watch/service/impl/WatchDataServiceImpl.java b/health-watch/health-watch-biz/src/main/java/com/renkang/watch/service/impl/WatchDataServiceImpl.java
index 65839e7..0d42e27 100644
--- a/health-watch/health-watch-biz/src/main/java/com/renkang/watch/service/impl/WatchDataServiceImpl.java
+++ b/health-watch/health-watch-biz/src/main/java/com/renkang/watch/service/impl/WatchDataServiceImpl.java
@@ -1464,8 +1464,8 @@ public class WatchDataServiceImpl extends ServiceImpl<WatchDataMapper, WatchData
         baseWrapper.selectAs(WatchStatUserInfoDaySdc::getStepValue,XjScreenAbnormalVO::getDataValue);
         baseWrapper.selectAs(WatchStatUserInfoDaySdc::getDataDate,XjScreenAbnormalVO::getDateTime);
         baseWrapper.likeRight(StrUtil.isNotEmpty(orgCode),WatchStatUserInfoDaySdc::getOrgCode,orgCode);
-        baseWrapper.ge(WatchStatUserInfoDaySdc::getDataDate,startTime);
-        baseWrapper.le(WatchStatUserInfoDaySdc::getDataDate,endTime);
+        baseWrapper.ge(ObjectUtil.isNotEmpty(startTime),WatchStatUserInfoDaySdc::getDataDate,startTime);
+        baseWrapper.le(ObjectUtil.isNotEmpty(endTime),WatchStatUserInfoDaySdc::getDataDate,endTime);
         baseWrapper.in(ObjectUtil.isNotNull(userIds),WatchStatUserInfoDaySdc::getUserId,userIds);
         //筛选条件 (0:小于5000,1:5000-10000,2:10000-15000,3:15000-20000,4大于20000)
         switch (search){