From 33470b1a04396a1ee03d59f066da0c55d355cb80 Mon Sep 17 00:00:00 2001
From: feng <18691763612@163.com>
Date: Wed, 7 Jan 2026 14:50:32 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A6=96=E9=A1=B5=E7=9D=A1?=
 =?UTF-8?q?=E7=9C=A0=E6=95=B0=E6=8D=AE=E6=9F=A5=E8=AF=A2=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/renkang/watch/mapper/WatchMapper.java   | 8 ++++++++
 .../com/renkang/watch/service/impl/WatchServiceImpl.java  | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/health-watch/health-watch-biz/src/main/java/com/renkang/watch/mapper/WatchMapper.java b/health-watch/health-watch-biz/src/main/java/com/renkang/watch/mapper/WatchMapper.java
index 7d77d6c..eaafc20 100644
--- a/health-watch/health-watch-biz/src/main/java/com/renkang/watch/mapper/WatchMapper.java
+++ b/health-watch/health-watch-biz/src/main/java/com/renkang/watch/mapper/WatchMapper.java
@@ -22,6 +22,14 @@ public interface WatchMapper {
     @Select("select length(nm.status) minutes,DATE_FORMAT(n.data_date,'%Y-%m-%d') dataDate  from watch_data_sleep_new_minute nm left join watch_data_sleep_new n on nm.sleep_id = n.id where n.id = ( select id from watch_data_sleep_new WHERE bind_user_id = #{id} order by data_date desc limit 1) and nm.STATUS not like '%55%' limit 1")
     WatchDataDTO getDataSleep(@Param("id") String id);
 
+    /**
+     * 查询最新的长睡睡眠时间和时长
+     * @param id 用户ID
+     * @return
+     */
+    @Select("SELECT long_duration_total minutes, data_date dataDate FROM watch_stat_user_info_day_sleep  WHERE user_id =  #{id} and long_duration_total > 0 ORDER BY data_date DESC LIMIT 1;")
+    WatchDataDTO getDataSleepNew(@Param("id") String id);
+
     @Select("SELECT AVG(TIMESTAMPDIFF(MINUTE, d.fall_asleep_time, d.wake_up_time)) AS aveMinute FROM watch_data_sleep_new_day d LEFT JOIN watch_data_sleep_new n ON d.sleep_id = n.id WHERE n.id IN (SELECT id FROM watch_data_sleep_new WHERE bind_user_id = #{id})")
     Double getAverageSleep(@Param("id") String id);
 
diff --git a/health-watch/health-watch-biz/src/main/java/com/renkang/watch/service/impl/WatchServiceImpl.java b/health-watch/health-watch-biz/src/main/java/com/renkang/watch/service/impl/WatchServiceImpl.java
index d5c2c3a..29b01ba 100644
--- a/health-watch/health-watch-biz/src/main/java/com/renkang/watch/service/impl/WatchServiceImpl.java
+++ b/health-watch/health-watch-biz/src/main/java/com/renkang/watch/service/impl/WatchServiceImpl.java
@@ -323,7 +323,7 @@ public class WatchServiceImpl implements IWatchService {
         }
         switch (itemVo.getWdType()) {
             case "sleep":
-                return watchMapper::getDataSleep;
+                return watchMapper::getDataSleepNew;
             case "steps":
                 return watchMapper::getDataSteps;
             case "heart_rate":