Merge branch 'develop' of https://gitea.rk-health.com/renkang/xj-platform into develop
This commit is contained in:
+1
@@ -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;
|
||||
|
||||
+10
-10
@@ -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;
|
||||
//}
|
||||
|
||||
+5
-3
@@ -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<LargeScreenMapper, Large
|
||||
redisClientUtil.set(MEDICAL,MEDICAL_PEOPLE_NUM_STATISTICS,medicalPeopleNumStatisticsVOS);
|
||||
|
||||
// 体检异常数据查询
|
||||
List<MedicalAbnormalStatisticsVO> 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));
|
||||
|
||||
Reference in New Issue
Block a user