From ec897c0567744d0bd769a759420e3dc9f9c3976a Mon Sep 17 00:00:00 2001 From: wanghao Date: Wed, 9 Jul 2025 13:47:44 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=96=B0=E7=96=86=E5=A4=A7?= =?UTF-8?q?=E5=B1=8F=E5=8F=8A=E5=B0=8F=E5=8A=A9=E6=89=8B=E4=B8=93=E5=AE=B6?= =?UTF-8?q?=E5=92=A8=E8=AF=A2=E9=87=8Fbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/xml/ConSessionMapper.xml | 3 ++- .../service/impl/ConHelperServiceImpl.java | 9 +++++--- .../largeScreen/entity/dto/HealthRoomDTO.java | 7 ++++++ .../entity/vo/HealthBloodSugarVO.java | 6 +++++ .../largeScreen/entity/vo/HealthRoomVO.java | 2 ++ .../service/impl/LargeScreenServiceImpl.java | 3 ++- .../bean/request/AbnormalEventFilter.java | 3 +++ .../WatchMonitorDataController.java | 17 ++++++++++++++ .../service/IWatchMonitorDataService.java | 2 ++ .../impl/WatchMonitorDataServiceImpl.java | 22 +++++++++++++++++++ 10 files changed, 69 insertions(+), 5 deletions(-) diff --git a/health-consultation/health-consultation-biz/src/main/java/com/renkang/consultation/mapper/xml/ConSessionMapper.xml b/health-consultation/health-consultation-biz/src/main/java/com/renkang/consultation/mapper/xml/ConSessionMapper.xml index 7bcfa50..72d3797 100644 --- a/health-consultation/health-consultation-biz/src/main/java/com/renkang/consultation/mapper/xml/ConSessionMapper.xml +++ b/health-consultation/health-consultation-biz/src/main/java/com/renkang/consultation/mapper/xml/ConSessionMapper.xml @@ -537,7 +537,8 @@ WHERE del_flag = 0 AND status = 1 AND tf_reply = 1 - AND from_account IN + AND session_type = 1 + AND to_account IN #{id} diff --git a/health-consultation/health-consultation-biz/src/main/java/com/renkang/consultation/service/impl/ConHelperServiceImpl.java b/health-consultation/health-consultation-biz/src/main/java/com/renkang/consultation/service/impl/ConHelperServiceImpl.java index 0200855..ae1642a 100644 --- a/health-consultation/health-consultation-biz/src/main/java/com/renkang/consultation/service/impl/ConHelperServiceImpl.java +++ b/health-consultation/health-consultation-biz/src/main/java/com/renkang/consultation/service/impl/ConHelperServiceImpl.java @@ -369,10 +369,13 @@ public class ConHelperServiceImpl extends ServiceImpl collect = conSessions.stream().filter(i -> i.getToAccount().equals(it.getId())).filter(Objects::nonNull).distinct().collect(Collectors.toList()); - if (CollectionUtils.isNotEmpty(collect)) { - conHelperDoctorVO.setTimes(String.valueOf(collect.size())); + int times = 0; + for (ConSession conSession : conSessions) { + if (conSession.getToAccount().equals(it.getId())) { + times++; + } } + conHelperDoctorVO.setTimes(String.valueOf(times)); } conHelperDoctorVOList.add(conHelperDoctorVO); }); diff --git a/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/largeScreen/entity/dto/HealthRoomDTO.java b/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/largeScreen/entity/dto/HealthRoomDTO.java index 50e11bf..5ed3a67 100644 --- a/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/largeScreen/entity/dto/HealthRoomDTO.java +++ b/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/largeScreen/entity/dto/HealthRoomDTO.java @@ -4,6 +4,7 @@ import cn.hutool.core.date.DateUtil; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; +import org.jeecg.common.aspect.annotation.Dict; import org.springframework.format.annotation.DateTimeFormat; import javax.validation.constraints.NotNull; @@ -21,7 +22,13 @@ public class HealthRoomDTO { * 检查类型 11:BMI/21:收缩压/22:舒张压/31:血糖/41:低密度脂蛋白/42:总胆固醇/43:甘油三酯/51:尿酸/61:同型半胱氨酸 等等，缺失的可以继续加 */ @Schema(title = "检查类型 11:BMI/21:收缩压/22:舒张压/31:血糖/41:低密度脂蛋白/42:总胆固醇/43:甘油三酯/51:尿酸/61:同型半胱氨酸 等等，缺失的可以继续加") + @Dict(dicCode = "xj_check_type") private String checkType; + /** + * 单位名称 + */ + @Schema(title = "单位名称") + private String departName; /** * 员工姓名 */ diff --git a/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/largeScreen/entity/vo/HealthBloodSugarVO.java b/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/largeScreen/entity/vo/HealthBloodSugarVO.java index ca3d310..1be172d 100644 --- a/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/largeScreen/entity/vo/HealthBloodSugarVO.java +++ b/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/largeScreen/entity/vo/HealthBloodSugarVO.java @@ -41,6 +41,12 @@ public class HealthBloodSugarVO { */ @Schema(title = "血糖是否异常 1:是/0:否") private String bmiFlag; + /** + * 腰围（CM） + */ + @Schema(title = "腰围（CM）") + private String waist; + /** * 填报时间 */ diff --git a/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/largeScreen/entity/vo/HealthRoomVO.java b/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/largeScreen/entity/vo/HealthRoomVO.java index 47ef062..d56c6ed 100644 --- a/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/largeScreen/entity/vo/HealthRoomVO.java +++ b/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/largeScreen/entity/vo/HealthRoomVO.java @@ -2,6 +2,7 @@ package com.renkang.emergency.largeScreen.entity.vo; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; +import org.jeecg.common.aspect.annotation.Dict; @Data public class HealthRoomVO { @@ -24,6 +25,7 @@ public class HealthRoomVO { * 检查类型 11:BMI/21:收缩压/22:舒张压/31:血糖/41:低密度脂蛋白/42:总胆固醇/43:甘油三酯/51:尿酸/61:同型半胱氨酸 等等，缺失的可以继续加 */ @Schema(title = "检查类型 11:BMI/21:收缩压/22:舒张压/31:血糖/41:低密度脂蛋白/42:总胆固醇/43:甘油三酯/51:尿酸/61:同型半胱氨酸 等等，缺失的可以继续加") + @Dict(dicCode = "xj_check_type") private String checkType; /** * 去年体检值 前一年的体检值（初始值） 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 3e8f3e1..45b96c7 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 @@ -124,7 +124,7 @@ public class LargeScreenServiceImpl extends ServiceImpl> largeScreenListCustom(AbnormalEventFilter filter, + @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, + @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) { + IPage pageList = watchMonitorDataService.largeScreenListCustom(pageNo, pageSize, filter); + return Result.OK(pageList); + } + /** * 蚁熊新血管监测大屏 预警人员数据 查询条件同同类中 /listCustom 接口,不同之处是返回的信息按人员去重,取每人最新一次有定位的告警数据 * @param filter diff --git a/health-watch/health-watch-biz/src/main/java/com/renkang/watch/service/IWatchMonitorDataService.java b/health-watch/health-watch-biz/src/main/java/com/renkang/watch/service/IWatchMonitorDataService.java index aa96316..0f91538 100644 --- a/health-watch/health-watch-biz/src/main/java/com/renkang/watch/service/IWatchMonitorDataService.java +++ b/health-watch/health-watch-biz/src/main/java/com/renkang/watch/service/IWatchMonitorDataService.java @@ -23,6 +23,8 @@ public interface IWatchMonitorDataService extends IService { IPage pageCustom(int pageNo, int pageSize, AbnormalEventFilter filter); + IPage largeScreenListCustom(int pageNo, int pageSize, AbnormalEventFilter filter); + /** * 健康终端报警列表 * @return diff --git a/health-watch/health-watch-biz/src/main/java/com/renkang/watch/service/impl/WatchMonitorDataServiceImpl.java b/health-watch/health-watch-biz/src/main/java/com/renkang/watch/service/impl/WatchMonitorDataServiceImpl.java index d4a3828..38e655b 100644 --- a/health-watch/health-watch-biz/src/main/java/com/renkang/watch/service/impl/WatchMonitorDataServiceImpl.java +++ b/health-watch/health-watch-biz/src/main/java/com/renkang/watch/service/impl/WatchMonitorDataServiceImpl.java @@ -585,6 +585,28 @@ public class WatchMonitorDataServiceImpl extends ServiceImpl largeScreenListCustom(int pageNo, int pageSize, AbnormalEventFilter filter) { + // 大屏辐射单位 + if (ObjUtil.isEmpty(filter.getOrgCodes())){ + return new Page<>(); + } + List orgCodeList = Arrays.stream(filter.getOrgCodes().split(",")) + .map(String::trim) + .collect(Collectors.toList()); + if (CollUtil.isEmpty(orgCodeList)) { + return new Page<>(); + } + // 条件 + LambdaQueryWrapper queryWrapper = getQueryWrapper(filter, orgCodeList); + // 数据 + Page page = page(new Page<>(pageNo, pageSize), queryWrapper); + IPage resultPage = new Page<>(); + GlobalUtils.copyPageDataToTarget(page, resultPage); + resultPage.setRecords(handleData(page.getRecords())); + return resultPage; + } + private String getOrgCode(String secondDepartCode, String departCode) { if (StrUtil.isBlank(secondDepartCode) && StrUtil.isBlank(departCode)) { return null;