From 9686399c8034d4f573e57366dda7c7185de8de50 Mon Sep 17 00:00:00 2001
From: feng <18691763612@163.com>
Date: Wed, 17 Dec 2025 17:49:36 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=9B=91=E6=B5=8B=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E6=97=B6=E9=97=B4=E7=BB=9F=E8=AE=A1=E7=BB=B4=E5=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../watch/service/impl/WatchDataServiceImpl.java       | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

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 52c4527..7667378 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
@@ -1390,18 +1390,20 @@ public class WatchDataServiceImpl extends ServiceImpl<WatchDataMapper, WatchData
 
     private Date dateByType(String type,boolean isEnd){
         Date date;
+        Date now = new Date();
+        // PS : 之前的业务中是按自然周 ,自然月,自然年统计查询 ,20251217新疆项目改为近一周,近一月,近一年
         switch (type){
             case "week":
-                date = isEnd? DateUtil.endOfWeek(new Date()).offset(DateField.MILLISECOND,-999) : DateUtil.beginOfWeek(new Date());
+                date = isEnd? now : DateUtil.beginOfDay(DateUtil.offsetWeek(now,-1));
                 break;
             case "month":
-                date = isEnd? DateUtil.endOfMonth(new Date()).offset(DateField.MILLISECOND,-999) : DateUtil.beginOfMonth(new Date());
+                date = isEnd? now : DateUtil.beginOfDay(DateUtil.offsetMonth(now,-1));
                 break;
             case "year":
-                date = isEnd? DateUtil.endOfYear(new Date()).offset(DateField.MILLISECOND,-999) : DateUtil.beginOfYear(new Date());
+                date = isEnd? now : DateUtil.beginOfDay(DateUtil.offset(now,DateField.YEAR,-1));
                 break;
             default:
-                date = isEnd? DateUtil.endOfDay(new Date()).offset(DateField.MILLISECOND,-999) : DateUtil.beginOfDay(new Date());
+                date = isEnd? now : DateUtil.beginOfDay(new Date());
                 break;
         }
         return date;