From bffd4fa7df63ef4ff307b809196814f58106824d Mon Sep 17 00:00:00 2001
From: feng <18691763612@163.com>
Date: Wed, 17 Dec 2025 14:14:26 +0800
Subject: [PATCH] fix

---
 .../watch/service/impl/WatchDataServiceImpl.java | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 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 0d42e27..50ce8e1 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
@@ -1462,7 +1462,7 @@ public class WatchDataServiceImpl extends ServiceImpl<WatchDataMapper, WatchData
         baseWrapper.selectAs(WatchStatUserInfoDaySdc::getId,XjScreenAbnormalVO::getId);
         baseWrapper.selectAs(WatchStatUserInfoDaySdc::getUserId,XjScreenAbnormalVO::getUserId);
         baseWrapper.selectAs(WatchStatUserInfoDaySdc::getStepValue,XjScreenAbnormalVO::getDataValue);
-        baseWrapper.selectAs(WatchStatUserInfoDaySdc::getDataDate,XjScreenAbnormalVO::getDateTime);
+        baseWrapper.selectAs(WatchStatUserInfoDaySdc::getLastUploadTime,XjScreenAbnormalVO::getDateTime);
         baseWrapper.likeRight(StrUtil.isNotEmpty(orgCode),WatchStatUserInfoDaySdc::getOrgCode,orgCode);
         baseWrapper.ge(ObjectUtil.isNotEmpty(startTime),WatchStatUserInfoDaySdc::getDataDate,startTime);
         baseWrapper.le(ObjectUtil.isNotEmpty(endTime),WatchStatUserInfoDaySdc::getDataDate,endTime);
@@ -1489,6 +1489,7 @@ public class WatchDataServiceImpl extends ServiceImpl<WatchDataMapper, WatchData
                 break;
             default:break;
         }
+        baseWrapper.orderByDesc(WatchStatUserInfoDaySdc::getLastUploadTime);
         return watchStatUserInfoDaySdcMapper.selectJoinPage(result,XjScreenAbnormalVO.class, baseWrapper);
     }
 
@@ -1497,7 +1498,7 @@ public class WatchDataServiceImpl extends ServiceImpl<WatchDataMapper, WatchData
         baseWrapper.selectAs(WatchDataTemperature::getId,XjScreenAbnormalVO::getId);
         baseWrapper.selectAs(WatchDataTemperature::getBindUserId,XjScreenAbnormalVO::getUserId);
         baseWrapper.selectAs(WatchDataTemperature::getDataValue,XjScreenAbnormalVO::getDataValue);
-        baseWrapper.selectAs(WatchDataTemperature::getDataDate,XjScreenAbnormalVO::getDateTime);
+        baseWrapper.selectAs(WatchDataTemperature::getTimeStamp,XjScreenAbnormalVO::getDateTime);
         baseWrapper.ge(ObjectUtil.isNotNull(startTime),WatchDataTemperature::getDataDate,startTime);
         baseWrapper.le(ObjectUtil.isNotNull(endTime),WatchDataTemperature::getDataDate,endTime);
         baseWrapper.in(ObjectUtil.isNotNull(userIds),WatchDataTemperature::getBindUserId,userIds);
@@ -1525,6 +1526,7 @@ public class WatchDataServiceImpl extends ServiceImpl<WatchDataMapper, WatchData
                 break;
             default:break;
         }
+        baseWrapper.orderByDesc(WatchDataTemperature::getTimeStamp);
         result = temperatureMapper.selectJoinPage(result,XjScreenAbnormalVO.class,baseWrapper);
         return result;
     }
@@ -1534,7 +1536,7 @@ public class WatchDataServiceImpl extends ServiceImpl<WatchDataMapper, WatchData
         baseWrapper.selectAs(WatchDataStress::getId,XjScreenAbnormalVO::getId);
         baseWrapper.selectAs(WatchDataStress::getBindUserId,XjScreenAbnormalVO::getUserId);
         baseWrapper.selectAs(WatchDataStress::getDataValue,XjScreenAbnormalVO::getDataValue);
-        baseWrapper.selectAs(WatchDataStress::getDataDate,XjScreenAbnormalVO::getDateTime);
+        baseWrapper.selectAs(WatchDataStress::getStartTimeStamp,XjScreenAbnormalVO::getDateTime);
         baseWrapper.ge(ObjectUtil.isNotNull(startTime),WatchDataStress::getDataDate,startTime);
         baseWrapper.le(ObjectUtil.isNotNull(endTime),WatchDataStress::getDataDate,endTime);
         baseWrapper.in(ObjectUtil.isNotNull(userIds),WatchDataStress::getBindUserId,userIds);
@@ -1566,6 +1568,7 @@ public class WatchDataServiceImpl extends ServiceImpl<WatchDataMapper, WatchData
                 break;
                 default:break;
         }
+        baseWrapper.orderByDesc(WatchDataStress::getStartTimeStamp);
         result = stressMapper.selectJoinPage(result,XjScreenAbnormalVO.class,baseWrapper);
         return result;
     }
@@ -1575,7 +1578,7 @@ public class WatchDataServiceImpl extends ServiceImpl<WatchDataMapper, WatchData
         baseWrapper.selectAs(WatchDataSpo2::getId,XjScreenAbnormalVO::getId);
         baseWrapper.selectAs(WatchDataSpo2::getBindUserId,XjScreenAbnormalVO::getUserId);
         baseWrapper.selectAs(WatchDataSpo2::getDataValue,XjScreenAbnormalVO::getDataValue);
-        baseWrapper.selectAs(WatchDataSpo2::getDataDate,XjScreenAbnormalVO::getDateTime);
+        baseWrapper.selectAs(WatchDataSpo2::getTimeStamp,XjScreenAbnormalVO::getDateTime);
         baseWrapper.ge(ObjectUtil.isNotNull(startTime),WatchDataSpo2::getDataDate,startTime);
         baseWrapper.le(ObjectUtil.isNotNull(endTime),WatchDataSpo2::getDataDate,endTime);
         baseWrapper.in(ObjectUtil.isNotNull(userIds),WatchDataSpo2::getBindUserId,userIds);
@@ -1592,6 +1595,7 @@ public class WatchDataServiceImpl extends ServiceImpl<WatchDataMapper, WatchData
         //search (0-异常,1-正常) ,>=90认为是正常
         baseWrapper.lt(search == 0,WatchDataHeartRate::getDataValue,90);
         baseWrapper.ge(search == 1,WatchDataHeartRate::getDataValue,90);
+        baseWrapper.orderByDesc(WatchDataSpo2::getTimeStamp);
         result = spo2Mapper.selectJoinPage(result,XjScreenAbnormalVO.class,baseWrapper);
         return  result;
     }
@@ -1601,7 +1605,7 @@ public class WatchDataServiceImpl extends ServiceImpl<WatchDataMapper, WatchData
         baseWrapper.selectAs(WatchDataHeartRate::getId,XjScreenAbnormalVO::getId);
         baseWrapper.selectAs(WatchDataHeartRate::getBindUserId,XjScreenAbnormalVO::getUserId);
         baseWrapper.selectAs(WatchDataHeartRate::getDataValue,XjScreenAbnormalVO::getDataValue);
-        baseWrapper.selectAs(WatchDataHeartRate::getDataDate,XjScreenAbnormalVO::getDateTime);
+        baseWrapper.selectAs(WatchDataHeartRate::getTimeStamp,XjScreenAbnormalVO::getDateTime);
         baseWrapper.ge(ObjectUtil.isNotNull(startTime),WatchDataHeartRate::getDataDate,startTime);
         baseWrapper.le(ObjectUtil.isNotNull(endTime),WatchDataHeartRate::getDataDate,endTime);
         baseWrapper.in(ObjectUtil.isNotNull(userIds),WatchDataHeartRate::getBindUserId,userIds);
@@ -1624,6 +1628,7 @@ public class WatchDataServiceImpl extends ServiceImpl<WatchDataMapper, WatchData
             baseWrapper.ge(WatchDataHeartRate::getDataValue,60);
             baseWrapper.le(WatchDataHeartRate::getDataValue,100);
         }
+        baseWrapper.orderByDesc(WatchDataHeartRate::getTimeStamp);
         result = heartRateMapper.selectJoinPage(result,XjScreenAbnormalVO.class,baseWrapper);
         return  result;
     }
@@ -1640,6 +1645,7 @@ public class WatchDataServiceImpl extends ServiceImpl<WatchDataMapper, WatchData
                     vo.setWorkNo(employeeInfo.getWorkNo());
                     vo.setRealName(employeeInfo.getRealName());
                     vo.setSex(employeeInfo.getSex());
+                    vo.setPhone(employeeInfo.getPhone());
                     vo.setSecondDeptCode(employeeInfo.getSecondDeptCode());
                     vo.setSecondDeptName(employeeInfo.getSecondDeptName());
                     vo.setThirdDeptCode(employeeInfo.getThirdDeptCode());