From ce34525a1d5fbf36c68e1c0eb1c8c9be0c77a482 Mon Sep 17 00:00:00 2001 From: tianyongbao Date: Sun, 22 Dec 2024 17:47:41 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E5=BD=95=E5=85=A5=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=EF=BC=8C=E6=B5=8B=E8=AF=95=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../health/domain/vo/HealthStaticPersonVo.java | 4 ++-- .../health/service/impl/StatisticAnalysisImpl.java | 14 +++++++++----- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/domain/vo/HealthStaticPersonVo.java b/ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/domain/vo/HealthStaticPersonVo.java index 1d0325a..e795184 100644 --- a/ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/domain/vo/HealthStaticPersonVo.java +++ b/ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/domain/vo/HealthStaticPersonVo.java @@ -27,11 +27,11 @@ public class HealthStaticPersonVo private String doctorCost; - private String marDayCount; + private int marDayCount; private String marCount; - private String feverDayCount; + private int feverDayCount; private String marTypeCount; diff --git a/ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/service/impl/StatisticAnalysisImpl.java b/ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/service/impl/StatisticAnalysisImpl.java index a256e09..5343fa1 100644 --- a/ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/service/impl/StatisticAnalysisImpl.java +++ b/ruoyi-modules/intc-health/src/main/java/com/ruoyi/health/service/impl/StatisticAnalysisImpl.java @@ -399,8 +399,7 @@ public class StatisticAnalysisImpl implements IStatisticAnalysisService { //医生总数 map.put("doctorTotalCount",statisticAnalysisMapper.selectDoctorCount(new HealthMarRecordDto())); - //用药天数 - map.put("marDayCount",statisticAnalysisMapper.selectMarDayCount(new HealthMarRecordDto())); + //用药次数 map.put("marCount",marRecordMapper.selectHealthMarRecordList(new HealthMarRecordDto()).size()); //用药类别 @@ -409,11 +408,16 @@ public class StatisticAnalysisImpl implements IStatisticAnalysisService { List temperatureRecordVoList=temperatureRecordMapper.selectHealthTemperatureRecordList(new HealthTemperatureRecordDto()); //测量体温次数 map.put("temperatureTotalCount",temperatureRecordVoList.size()); - //发烧天数 - map.put("feverDayCount",statisticAnalysisMapper.selectFeverDayCount(new HealthRecordDto())); //成员列表展示 - map.put("personList",statisticAnalysisMapper.selectStaticPersonList(new HealthRecordDto())); + List personList=statisticAnalysisMapper.selectStaticPersonList(new HealthRecordDto()); + + //用药天数 + map.put("marDayCount",personList.stream().mapToInt(HealthStaticPersonVo::getMarDayCount).sum()); + //发烧天数 + map.put("feverDayCount",personList.stream().mapToInt(HealthStaticPersonVo::getFeverDayCount).sum()); + + map.put("personList",personList); //低烧次数 int lowerTempCount=0; //中烧次数