renkang/xj-platform
7
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

心率异常数据去掉时间的默认值

Browse Source
This commit is contained in:
feng
2025-12-17 13:36:07 +08:00
parent da9169f774
commit 86862ea0a7
2 changed files with 6 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
health-watch/health-watch-api/src/main/java/com/renkang/watch/dto/XjScreenAbnormalParam.java
+4 -8
View File
@@ -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;
}
}
health-watch/health-watch-biz/src/main/java/com/renkang/watch/service/impl/WatchDataServiceImpl.java
+2 -2
View File
@@ -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){