diff --git a/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/largeScreen/controller/LargeScreenNewController.java b/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/largeScreen/controller/LargeScreenNewController.java index a40f906..563f840 100644 --- a/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/largeScreen/controller/LargeScreenNewController.java +++ b/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/largeScreen/controller/LargeScreenNewController.java @@ -1,6 +1,7 @@ package com.renkang.emergency.largeScreen.controller; 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.MedicalAbnormalVO; import com.renkang.anyan.model.vo.MedicalPeopleNumStatisticsVO; diff --git a/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/largeScreen/entity/vo/MedicalAbnormalStatisticsVO.java b/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/largeScreen/entity/vo/MedicalAbnormalStatisticsVO.java index 93c0ff5..629e88c 100644 --- a/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/largeScreen/entity/vo/MedicalAbnormalStatisticsVO.java +++ b/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/largeScreen/entity/vo/MedicalAbnormalStatisticsVO.java @@ -8,13 +8,13 @@ import org.springframework.format.annotation.DateTimeFormat; import java.util.Date; -@Data -public class MedicalAbnormalStatisticsVO { - private Integer totalCount; - // 心血管异常人数 - private Integer cardiovaAbCount; - // 脑血管异常人数 - private Integer cerebrovAbCount; - // 冠脉ct异常人数 - private Integer cctaAbCount; -} +//@Data +//public class MedicalAbnormalStatisticsVO { +// private Integer totalCount; +// // 心血管异常人数 +// private Integer cardiovaAbCount; +// // 脑血管异常人数 +// private Integer cerebrovAbCount; +// // 冠脉ct异常人数 +// private Integer cctaAbCount; +//} diff --git a/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/largeScreen/service/impl/LargeScreenServiceImpl.java b/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/largeScreen/service/impl/LargeScreenServiceImpl.java index 132d05b..c1cde1b 100644 --- a/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/largeScreen/service/impl/LargeScreenServiceImpl.java +++ b/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/largeScreen/service/impl/LargeScreenServiceImpl.java @@ -10,6 +10,9 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; 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.model.vo.HealthRoomBaseVO; import com.renkang.anyan.model.vo.MedicalAbnormalStatisticsVO; @@ -470,9 +473,8 @@ public class LargeScreenServiceImpl extends ServiceImpl medicalAbnormalStatisticsList = new ArrayList<>(); - redisClientUtil.set(MEDICAL,MEDICAL_ABNORMAL_STATISTICS,medicalAbnormalStatisticsList); - + MedicalAbnormalStatisticsVO medicalAbnormalStatisticsVO = anYanClient.medicalAbnormalStatistics(DateUtil.thisYear()); + redisClientUtil.set(MEDICAL,MEDICAL_ABNORMAL_STATISTICS,medicalAbnormalStatisticsVO); // 健康打卡今日数据查询 HealthSignStatVO healthSignToday = anYanClient.healthCheckStatistics(DateUtil.beginOfDay(today), DateUtil.endOfDay(today));