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

大屏处理冲突

Browse Source
This commit is contained in:
wanghao
2025-08-08 10:41:01 +08:00
parent eeeaf9166b
commit 49dd2287ad
3 changed files with 16 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/largeScreen/controller/LargeScreenNewController.java
+1
View File
@@ -1,6 +1,7 @@
package com.renkang.emergency.largeScreen.controller; package com.renkang.emergency.largeScreen.controller;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.renkang.anyan.model.vo.MedicalAbnormalStatisticsVO;
import com.renkang.anyan.model.vo.HealthRoomBaseVO; import com.renkang.anyan.model.vo.HealthRoomBaseVO;
import com.renkang.anyan.model.vo.MedicalAbnormalVO; import com.renkang.anyan.model.vo.MedicalAbnormalVO;
import com.renkang.anyan.model.vo.MedicalPeopleNumStatisticsVO; import com.renkang.anyan.model.vo.MedicalPeopleNumStatisticsVO;
health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/largeScreen/entity/vo/MedicalAbnormalStatisticsVO.java
+10 -10
View File
@@ -8,13 +8,13 @@ import org.springframework.format.annotation.DateTimeFormat;
import java.util.Date; import java.util.Date;
@Data //@Data
public class MedicalAbnormalStatisticsVO { //public class MedicalAbnormalStatisticsVO {
private Integer totalCount; // private Integer totalCount;
// 心血管异常人数 // // 心血管异常人数
private Integer cardiovaAbCount; // private Integer cardiovaAbCount;
// 脑血管异常人数 // // 脑血管异常人数
private Integer cerebrovAbCount; // private Integer cerebrovAbCount;
// 冠脉ct异常人数 // // 冠脉ct异常人数
private Integer cctaAbCount; // private Integer cctaAbCount;
} //}
health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/largeScreen/service/impl/LargeScreenServiceImpl.java
+5 -3
View File
@@ -10,6 +10,9 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.renkang.anyan.client.AnYanClient; import com.renkang.anyan.client.AnYanClient;
import com.renkang.anyan.model.vo.HealthSignStatVO;
import com.renkang.anyan.model.vo.MedicalAbnormalStatisticsVO;
import com.renkang.anyan.model.vo.MedicalPeopleNumStatisticsVO;
import com.renkang.anyan.config.AnYanProperties; import com.renkang.anyan.config.AnYanProperties;
import com.renkang.anyan.model.vo.*; import com.renkang.anyan.model.vo.*;
import com.renkang.anyan.model.vo.HealthRoomBaseVO; import com.renkang.anyan.model.vo.HealthRoomBaseVO;
@@ -468,9 +471,8 @@ public class LargeScreenServiceImpl extends ServiceImpl<LargeScreenMapper, Large
redisClientUtil.set(MEDICAL,MEDICAL_PEOPLE_NUM_STATISTICS,medicalPeopleNumStatisticsVOS); redisClientUtil.set(MEDICAL,MEDICAL_PEOPLE_NUM_STATISTICS,medicalPeopleNumStatisticsVOS);
// 体检异常数据查询 // 体检异常数据查询
List<MedicalAbnormalStatisticsVO> medicalAbnormalStatisticsList = new ArrayList<>(); MedicalAbnormalStatisticsVO medicalAbnormalStatisticsVO = anYanClient.medicalAbnormalStatistics(DateUtil.thisYear());
redisClientUtil.set(MEDICAL,MEDICAL_ABNORMAL_STATISTICS,medicalAbnormalStatisticsList); redisClientUtil.set(MEDICAL,MEDICAL_ABNORMAL_STATISTICS,medicalAbnormalStatisticsVO);
// 健康打卡今日数据查询 // 健康打卡今日数据查询
HealthSignStatVO healthSignToday = anYanClient.healthCheckStatistics(DateUtil.beginOfDay(today), DateUtil.endOfDay(today)); HealthSignStatVO healthSignToday = anYanClient.healthCheckStatistics(DateUtil.beginOfDay(today), DateUtil.endOfDay(today));