From 23c53a782c7164abfa16e6e02d4c6358c7c8fde2 Mon Sep 17 00:00:00 2001 From: wanghao Date: Wed, 13 Aug 2025 10:34:55 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A4=A7=E5=B1=8F=E6=94=B9=E5=8A=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/renkang/anyan/client/AnYanClient.java | 2 +- .../anyan/client/AnYanClientExecutor.java | 2 +- .../com/renkang/anyan/enums/AnYanApiEnum.java | 4 +- .../anyan/model/dto/MedicalAbnormalDTO.java | 8 + .../model/vo/MedicalAbnormalStatisticsVO.java | 6 +- .../controller/LargeScreenNewController.java | 16 +- .../largeScreen/entity/dto/HealthRoomDTO.java | 124 +++--- .../entity/dto/MedicalAbnormalDTO.java | 98 ++-- .../dto/MedicalAbnormalStatisticsDTO.java | 4 + .../largeScreen/entity/vo/HealthRoomVO.java | 16 + .../largeScreen/entity/vo/HospitalVO.java | 17 + .../service/ILargeScreenDataService.java | 2 - .../service/ILargeScreenService.java | 12 +- .../impl/LargeScreenDataServiceImpl.java | 45 +- .../service/impl/LargeScreenServiceImpl.java | 417 +++++++----------- .../impl/TblAmbulanceGpsServiceImpl.java | 11 - 16 files changed, 336 insertions(+), 448 deletions(-) diff --git a/functional-modules/xj-anyan-api/src/main/java/com/renkang/anyan/client/AnYanClient.java b/functional-modules/xj-anyan-api/src/main/java/com/renkang/anyan/client/AnYanClient.java index 3c26d85..d81519d 100644 --- a/functional-modules/xj-anyan-api/src/main/java/com/renkang/anyan/client/AnYanClient.java +++ b/functional-modules/xj-anyan-api/src/main/java/com/renkang/anyan/client/AnYanClient.java @@ -80,7 +80,7 @@ public interface AnYanClient { * @param healthRoomDTO * @return */ - IPage bloodSugarClockSList(HealthRoomDTO healthRoomDTO); + IPage healthPlaceHomDetailList(HealthRoomDTO healthRoomDTO); /** * 当年体检异常人数统计 diff --git a/functional-modules/xj-anyan-api/src/main/java/com/renkang/anyan/client/AnYanClientExecutor.java b/functional-modules/xj-anyan-api/src/main/java/com/renkang/anyan/client/AnYanClientExecutor.java index 2468970..568e756 100644 --- a/functional-modules/xj-anyan-api/src/main/java/com/renkang/anyan/client/AnYanClientExecutor.java +++ b/functional-modules/xj-anyan-api/src/main/java/com/renkang/anyan/client/AnYanClientExecutor.java @@ -143,7 +143,7 @@ public class AnYanClientExecutor implements AnYanClient { } @Override - public IPage bloodSugarClockSList(HealthRoomDTO healthRoomDTO) { + public IPage healthPlaceHomDetailList(HealthRoomDTO healthRoomDTO) { Result result = RestTemplateUtil.postExchange(AnYanApiEnum.HEALTH_PLACE_ROOM_INFO_LIST, buildTokenHeader(), healthRoomDTO); return new PageResultToBeanUtil().transform(result,HealthPlaceHomDetailsVO.class); } diff --git a/functional-modules/xj-anyan-api/src/main/java/com/renkang/anyan/enums/AnYanApiEnum.java b/functional-modules/xj-anyan-api/src/main/java/com/renkang/anyan/enums/AnYanApiEnum.java index 80c2021..00c881a 100644 --- a/functional-modules/xj-anyan-api/src/main/java/com/renkang/anyan/enums/AnYanApiEnum.java +++ b/functional-modules/xj-anyan-api/src/main/java/com/renkang/anyan/enums/AnYanApiEnum.java @@ -43,12 +43,12 @@ public enum AnYanApiEnum { /** *7.体检异常数据统计查询（暂定） */ - MEDICAL_ABNORMAL_STATISTICS("","", HttpMethod.POST), + MEDICAL_ABNORMAL_STATISTICS("/aygc-znhpt-sys/0/aystatistics/checkstatistics","", HttpMethod.POST), /** *8.体检异常数据清单（暂定） */ - MEDICAL_ABNORMAL_LIST("","", HttpMethod.POST), + MEDICAL_ABNORMAL_LIST("/aygc-znhpt-sys/0/aystatistics/checkList","", HttpMethod.POST), /** *9.油田医院数据查询 diff --git a/functional-modules/xj-anyan-api/src/main/java/com/renkang/anyan/model/dto/MedicalAbnormalDTO.java b/functional-modules/xj-anyan-api/src/main/java/com/renkang/anyan/model/dto/MedicalAbnormalDTO.java index 4174815..ad7bec3 100644 --- a/functional-modules/xj-anyan-api/src/main/java/com/renkang/anyan/model/dto/MedicalAbnormalDTO.java +++ b/functional-modules/xj-anyan-api/src/main/java/com/renkang/anyan/model/dto/MedicalAbnormalDTO.java @@ -19,6 +19,14 @@ public class MedicalAbnormalDTO { * 员工姓名 */ private String name; + /** + * 体检年份 + */ + private String medicalYear; + /** + * 体检医院 + */ + private String hospitalName; /** * 检查日期起期 参数为空时，默认为今年第一天，如：2025-01-01 */ diff --git a/functional-modules/xj-anyan-api/src/main/java/com/renkang/anyan/model/vo/MedicalAbnormalStatisticsVO.java b/functional-modules/xj-anyan-api/src/main/java/com/renkang/anyan/model/vo/MedicalAbnormalStatisticsVO.java index 5256f7d..b88ef98 100644 --- a/functional-modules/xj-anyan-api/src/main/java/com/renkang/anyan/model/vo/MedicalAbnormalStatisticsVO.java +++ b/functional-modules/xj-anyan-api/src/main/java/com/renkang/anyan/model/vo/MedicalAbnormalStatisticsVO.java @@ -5,10 +5,10 @@ import lombok.Data; @Data public class MedicalAbnormalStatisticsVO { private Integer totalCount; - // 心血管异常人数 + // 冠脉CTA异常人数 private Integer cardiovaAbCount; - // 脑血管异常人数 + // 头颅CTA异常人数 private Integer cerebrovAbCount; - // 冠脉ct异常人数 + // 冠脉ct异常人数 (未返回) private Integer cctaAbCount; } 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 563f840..6e21483 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,11 +1,13 @@ 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.dto.HealthRoomDTO; +import com.renkang.anyan.model.dto.HealthSignListParam; +import com.renkang.anyan.model.dto.MedicalAbnormalDTO; +import com.renkang.anyan.model.vo.*; import com.renkang.anyan.model.vo.HealthRoomBaseVO; -import com.renkang.anyan.model.vo.MedicalAbnormalVO; -import com.renkang.anyan.model.vo.MedicalPeopleNumStatisticsVO; import com.renkang.anyan.model.vo.MedicalAbnormalStatisticsVO; +import com.renkang.anyan.model.vo.MedicalAbnormalVO; import com.renkang.emergency.entity.dto.*; import com.renkang.emergency.entity.vo.DataDetailVO; import com.renkang.emergency.entity.vo.MedicalDataVO; @@ -114,19 +116,19 @@ public class LargeScreenNewController { @PostMapping("/healthWeightLoss") @Operation(summary = "健康打卡减重详情列表", description = "健康打卡减重详情列表") - public Result> healthWeightLoss(@RequestBody HealthWeightLossDTO dto){ + public Result> healthWeightLoss(@RequestBody HealthSignListParam dto){ return Result.ok(largeScreenService.healthWeightLoss(dto)); } @PostMapping("/healthBloodSugar") @Operation(summary = "健康打卡血糖详情列表", description = "健康打卡血糖详情列表") - public Result> healthBloodSugar(@RequestBody HealthBloodSugarDTO dto){ + public Result> healthBloodSugar(@RequestBody HealthSignListParam dto){ return Result.ok(largeScreenService.healthBloodSugar(dto)); } @PostMapping("/healthBloodPressure") @Operation(summary = "健康打卡血压详情列表", description = "健康打卡血压详情列表") - public Result> healthBloodPressure(@RequestBody HealthBloodPressureDTO dto){ + public Result> healthBloodPressure(@RequestBody HealthSignListParam dto){ return Result.ok(largeScreenService.healthBloodPressure(dto)); } @@ -157,7 +159,7 @@ public class LargeScreenNewController { @GetMapping("runTest") @Operation(summary = "初始化假数据", description = "初始化假数据") public void runTest(){ - largeScreenDataService.runTest(); + largeScreenService.runJob(); } /** 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 5ed3a67..0728925 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 @@ -10,65 +10,65 @@ import org.springframework.format.annotation.DateTimeFormat; import javax.validation.constraints.NotNull; import java.util.Date; -@Data -public class HealthRoomDTO { - /** - * 健康小屋ID - */ - @Schema(title = "健康小屋ID") - @NotNull - private String healthRoomId; - /** - * 检查类型 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; - /** - * 员工姓名 - */ - @Schema(title = "员工姓名") - private String name; - /** - * 检查日期起期 参数为空时，默认为今年第一天，如：2025-01-01 - */ - @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") - @DateTimeFormat(pattern = "yyyy-MM-dd") - @Schema(title = "检查日期起期 参数为空时，默认为今年第一天，如：2025-01-01") - private Date checkInDateBegin; - /** - * 检查日期止期 参数为空时，默认为今天 - */ - @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") - @DateTimeFormat(pattern = "yyyy-MM-dd") - @Schema(title = "检查日期止期 参数为空时，默认为今天") - private Date checkInDateEnd; - /** - * 是否成功控降 是否成功空降，1:是/0.否 - */ - @Schema(title = "是否成功控降 是否成功空降，1:是/0.否") - private String successFlag; - /** - * 页码 从1开始 - */ - @Schema(title = "页码 从1开始") - private Integer pageNo; - /** - * 每页数量 - */ - @Schema(title = "每页数量") - private Integer pageSize; - - public HealthRoomDTO() { - Date date = new Date(); - this.checkInDateBegin = DateUtil.beginOfYear(date); - this.checkInDateEnd = DateUtil.endOfDay(date); - this.pageNo = 1; - this.pageSize = 10; - } -} +//@Data +//public class HealthRoomDTO { +// /** +// * 健康小屋ID +// */ +// @Schema(title = "健康小屋ID") +// @NotNull +// private String healthRoomId; +// /** +// * 检查类型 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; +// /** +// * 员工姓名 +// */ +// @Schema(title = "员工姓名") +// private String name; +// /** +// * 检查日期起期 参数为空时，默认为今年第一天，如：2025-01-01 +// */ +// @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") +// @DateTimeFormat(pattern = "yyyy-MM-dd") +// @Schema(title = "检查日期起期 参数为空时，默认为今年第一天，如：2025-01-01") +// private Date checkInDateBegin; +// /** +// * 检查日期止期 参数为空时，默认为今天 +// */ +// @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") +// @DateTimeFormat(pattern = "yyyy-MM-dd") +// @Schema(title = "检查日期止期 参数为空时，默认为今天") +// private Date checkInDateEnd; +// /** +// * 是否成功控降 是否成功空降，1:是/0.否 +// */ +// @Schema(title = "是否成功控降 是否成功空降，1:是/0.否") +// private String successFlag; +// /** +// * 页码 从1开始 +// */ +// @Schema(title = "页码 从1开始") +// private Integer pageNo; +// /** +// * 每页数量 +// */ +// @Schema(title = "每页数量") +// private Integer pageSize; +// +// public HealthRoomDTO() { +// Date date = new Date(); +// this.checkInDateBegin = DateUtil.beginOfYear(date); +// this.checkInDateEnd = DateUtil.endOfDay(date); +// this.pageNo = 1; +// this.pageSize = 10; +// } +//} diff --git a/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/largeScreen/entity/dto/MedicalAbnormalDTO.java b/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/largeScreen/entity/dto/MedicalAbnormalDTO.java index 92096eb..ccc6315 100644 --- a/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/largeScreen/entity/dto/MedicalAbnormalDTO.java +++ b/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/largeScreen/entity/dto/MedicalAbnormalDTO.java @@ -9,52 +9,52 @@ import org.springframework.format.annotation.DateTimeFormat; import javax.validation.constraints.NotNull; import java.util.Date; -@Data -public class MedicalAbnormalDTO { - /** - * 单位名称 - */ - private String departName; - /** - * 员工姓名 - */ - private String name; - /** - * 检查日期起期 参数为空时，默认为今年第一天，如：2025-01-01 - */ - @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") - @DateTimeFormat(pattern = "yyyy-MM-dd") - @Schema(title = "检查日期起期 参数为空时，默认为今年第一天，如：2025-01-01") - private Date checkInDateBegin; - /** - * 检查日期止期 参数为空时，默认为今天 - */ - @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") - @DateTimeFormat(pattern = "yyyy-MM-dd") - @Schema(title = "检查日期止期 参数为空时，默认为今天") - private Date checkInDateEnd; - /** - * 查询类型 1:心血管异常/2:脑血管异常/3:冠脉CT异常 - */ - @Schema(title = "查询类型 1:心血管异常/2:脑血管异常/3:冠脉CT异常") - @NotNull - private String queryType; - /** - * 页码 从1开始 - */ - @Schema(title = "页码 从1开始") - private Integer pageNo; - /** - * 每页数量 - */ - @Schema(title = "每页数量") - private Integer pageSize; - - public MedicalAbnormalDTO() { - Date date = new Date(); - this.checkInDateBegin = DateUtil.beginOfYear(date); - this.checkInDateEnd = DateUtil.endOfDay(date); - this.pageNo = 1; - this.pageSize = 10; - } -} +//@Data +//public class MedicalAbnormalDTO { +// /** +// * 单位名称 +// */ +// private String departName; +// /** +// * 员工姓名 +// */ +// private String name; +// /** +// * 检查日期起期 参数为空时，默认为今年第一天，如：2025-01-01 +// */ +// @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") +// @DateTimeFormat(pattern = "yyyy-MM-dd") +// @Schema(title = "检查日期起期 参数为空时，默认为今年第一天，如：2025-01-01") +// private Date checkInDateBegin; +// /** +// * 检查日期止期 参数为空时，默认为今天 +// */ +// @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") +// @DateTimeFormat(pattern = "yyyy-MM-dd") +// @Schema(title = "检查日期止期 参数为空时，默认为今天") +// private Date checkInDateEnd; +// /** +// * 查询类型 1:心血管异常/2:脑血管异常/3:冠脉CT异常 +// */ +// @Schema(title = "查询类型 1:心血管异常/2:脑血管异常/3:冠脉CT异常") +// @NotNull +// private String queryType; +// /** +// * 页码 从1开始 +// */ +// @Schema(title = "页码 从1开始") +// private Integer pageNo; +// /** +// * 每页数量 +// */ +// @Schema(title = "每页数量") +// private Integer pageSize; +// +// public MedicalAbnormalDTO() { +// Date date = new Date(); +// this.checkInDateBegin = DateUtil.beginOfYear(date); +// this.checkInDateEnd = DateUtil.endOfDay(date); +// this.pageNo = 1; +// this.pageSize = 10; +// } +//} diff --git a/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/largeScreen/entity/dto/MedicalAbnormalStatisticsDTO.java b/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/largeScreen/entity/dto/MedicalAbnormalStatisticsDTO.java index e19cc5a..925c874 100644 --- a/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/largeScreen/entity/dto/MedicalAbnormalStatisticsDTO.java +++ b/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/largeScreen/entity/dto/MedicalAbnormalStatisticsDTO.java @@ -11,6 +11,10 @@ import java.util.Date; @Data public class MedicalAbnormalStatisticsDTO { private String centerId; + /** + * 体检年份 + */ + private String medicalYear; /** * 检查日期起期 参数为空时，默认为今年第一天 */ 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 d56c6ed..333f636 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 @@ -1,5 +1,6 @@ package com.renkang.emergency.largeScreen.entity.vo; +import com.renkang.anyan.model.vo.HealthPlaceHomDetailsVO; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import org.jeecg.common.aspect.annotation.Dict; @@ -52,4 +53,19 @@ public class HealthRoomVO { */ @Schema(title = "是否成功空降，1:是/0.否") private String successFlag; + + + public HealthRoomVO() {} + + public HealthRoomVO(HealthPlaceHomDetailsVO detailsVO){ + departName = detailsVO.getDepartName(); + name = detailsVO.getName(); + checkInDate = detailsVO.getCheckInDate(); + checkType = detailsVO.getCheckType(); + lastVal = detailsVO.getLastVal(); + goalVal = detailsVO.getGoalVal(); + currentVal = detailsVO.getCurrentVal(); + compareVal = detailsVO.getCompareVal(); + successFlag = detailsVO.getSuccessFlag(); + } } diff --git a/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/largeScreen/entity/vo/HospitalVO.java b/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/largeScreen/entity/vo/HospitalVO.java index 6aeec40..2341393 100644 --- a/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/largeScreen/entity/vo/HospitalVO.java +++ b/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/largeScreen/entity/vo/HospitalVO.java @@ -1,6 +1,7 @@ package com.renkang.emergency.largeScreen.entity.vo; import com.fasterxml.jackson.annotation.JsonFormat; +import com.renkang.emergency.entity.Resource; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import org.springframework.format.annotation.DateTimeFormat; @@ -9,6 +10,10 @@ import java.util.Date; @Data public class HospitalVO { + /** + * id + */ + private String id; /** * 医院名字 */ @@ -41,4 +46,16 @@ public class HospitalVO { @DateTimeFormat(pattern = "yyyy-MM-dd") @Schema(title = "签约时间") private Date contractDate; + + public HospitalVO() {} + + public HospitalVO(Resource resource){ + id = resource.getId(); + hospitalName = resource.getName(); + alias = resource.getName(); + address = resource.getAddress(); + lon = resource.getLongitude().toString(); + lat = resource.getLatitude().toString(); + contractDate = resource.getCreateTime(); + } } diff --git a/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/largeScreen/service/ILargeScreenDataService.java b/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/largeScreen/service/ILargeScreenDataService.java index 08c6b82..42212b3 100644 --- a/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/largeScreen/service/ILargeScreenDataService.java +++ b/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/largeScreen/service/ILargeScreenDataService.java @@ -16,8 +16,6 @@ import java.util.List; */ public interface ILargeScreenDataService extends IService { - void runTest(); - Boolean editValue(LargeScreenDataValueDTO dto); Boolean editData(DataDetailVO dto); diff --git a/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/largeScreen/service/ILargeScreenService.java b/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/largeScreen/service/ILargeScreenService.java index dea9213..3d9295c 100644 --- a/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/largeScreen/service/ILargeScreenService.java +++ b/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/largeScreen/service/ILargeScreenService.java @@ -2,10 +2,12 @@ package com.renkang.emergency.largeScreen.service; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.IService; +import com.renkang.anyan.model.dto.HealthRoomDTO; +import com.renkang.anyan.model.dto.HealthSignListParam; +import com.renkang.anyan.model.dto.MedicalAbnormalDTO; +import com.renkang.anyan.model.vo.*; import com.renkang.anyan.model.vo.HealthRoomBaseVO; import com.renkang.anyan.model.vo.MedicalAbnormalVO; -import com.renkang.anyan.model.vo.MedicalPeopleNumStatisticsVO; -import com.renkang.anyan.model.vo.MedicalAbnormalStatisticsVO; import com.renkang.emergency.largeScreen.entity.dto.*; import com.renkang.emergency.largeScreen.entity.vo.*; @@ -27,11 +29,11 @@ public interface ILargeScreenService extends IService { IPage medicalAbnormal(MedicalAbnormalDTO dto); - IPage healthWeightLoss(HealthWeightLossDTO dto); + IPage healthWeightLoss(HealthSignListParam dto); - IPage healthBloodSugar(HealthBloodSugarDTO dto); + IPage healthBloodSugar(HealthSignListParam dto); - IPage healthBloodPressure(HealthBloodPressureDTO dto); + IPage healthBloodPressure(HealthSignListParam dto); List medicalPeopleNumStatistics(MedicalPeopleNumStatisticsDTO dto); diff --git a/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/largeScreen/service/impl/LargeScreenDataServiceImpl.java b/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/largeScreen/service/impl/LargeScreenDataServiceImpl.java index cdedaa3..cda0b54 100644 --- a/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/largeScreen/service/impl/LargeScreenDataServiceImpl.java +++ b/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/largeScreen/service/impl/LargeScreenDataServiceImpl.java @@ -11,7 +11,9 @@ import com.renkang.emergency.entity.dto.LargeScreenDataValueDTO; import com.renkang.emergency.entity.vo.DataDetailVO; import com.renkang.emergency.entity.vo.MedicalDataVO; import com.renkang.emergency.largeScreen.mapper.LargeScreenDataMapper; +import com.renkang.emergency.largeScreen.mapper.LargeScreenMapper; import com.renkang.emergency.largeScreen.service.ILargeScreenDataService; +import com.renkang.emergency.largeScreen.service.ILargeScreenService; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -31,49 +33,6 @@ import java.util.stream.Collectors; @RequiredArgsConstructor public class LargeScreenDataServiceImpl extends ServiceImpl implements ILargeScreenDataService { - @Transactional(rollbackFor = Exception.class) - public void runTest() { - if (CollUtil.isNotEmpty(list())) { - return; - } - List list = new ArrayList<>(); - // 服务详情 - LargeScreenData service1 = new LargeScreenData(); - service1.setType("gross"); - list.add(service1); - LargeScreenData service2 = new LargeScreenData(); - service2.setType("alerdyreceive"); - list.add(service2); - LargeScreenData service3 = new LargeScreenData(); - service3.setType("jqqz"); - list.add(service3); - LargeScreenData service4 = new LargeScreenData(); - service4.setType("dbjy"); - list.add(service4); - LargeScreenData service5 = new LargeScreenData(); - service5.setType("totaldeal"); - list.add(service5); - LargeScreenData service6 = new LargeScreenData(); - service6.setType("totalacceptance"); - list.add(service6); - - // 主诉分类 - - - // 体检人数 - LargeScreenData medical1 = new LargeScreenData(); - medical1.setType("medical"); - medical1.setName("克拉玛依医院"); - list.add(medical1); - - // 健康打卡人数 - - - // 体检数据 - - saveBatch(list); - } - public Boolean editValue(LargeScreenDataValueDTO dto) { if (StrUtil.isEmpty(dto.getCenterId())) { return false; 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 c1cde1b..8787498 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 @@ -1,5 +1,6 @@ package com.renkang.emergency.largeScreen.service.impl; +import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjUtil; @@ -10,6 +11,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.dto.HealthRoomDTO; +import com.renkang.anyan.model.dto.HealthSignListParam; +import com.renkang.anyan.model.dto.MedicalAbnormalDTO; import com.renkang.anyan.model.vo.HealthSignStatVO; import com.renkang.anyan.model.vo.MedicalAbnormalStatisticsVO; import com.renkang.anyan.model.vo.MedicalPeopleNumStatisticsVO; @@ -21,6 +25,7 @@ import com.renkang.anyan.model.vo.*; import com.renkang.emergency.bean.response.XjHealthSignFakerData; import com.renkang.emergency.bean.response.XjMedicalCountFakerData; import com.renkang.emergency.bean.response.XjMedicalDataFakerData; +import com.renkang.emergency.entity.EmergencyCenter; import com.renkang.emergency.entity.EmergencyHealthRoom; import com.renkang.emergency.entity.Resource; import com.renkang.emergency.entity.vo.DataDetailVO; @@ -30,6 +35,7 @@ import com.renkang.emergency.largeScreen.entity.vo.*; import com.renkang.emergency.largeScreen.mapper.LargeScreenMapper; import com.renkang.emergency.largeScreen.service.ILargeScreenDataService; import com.renkang.emergency.largeScreen.service.ILargeScreenService; +import com.renkang.emergency.service.IEmergencyCenterService; import com.renkang.emergency.service.IEmergencyHealthRoomService; import com.renkang.emergency.service.IResourceService; import lombok.RequiredArgsConstructor; @@ -42,6 +48,7 @@ import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import java.math.BigDecimal; import java.util.*; import java.util.function.Consumer; import java.util.function.Supplier; @@ -60,38 +67,14 @@ public class LargeScreenServiceImpl extends ServiceImpl map(String type) { List maps = new ArrayList<>(); @@ -117,172 +100,114 @@ public class LargeScreenServiceImpl extends ServiceImpl healthRoomBase(HealthRoomBaseDTO dto){ List list = new ArrayList<>(); - for (int i = 0; i < 10; i++) { + List resources = resourceService.list(new LambdaQueryWrapper().eq(Resource::getType, 3) + .between(ObjUtil.isNotEmpty(dto.getCheckInDateBegin()),Resource::getCreateTime,dto.getCheckInDateBegin(),dto.getCheckInDateEnd())); + for (Resource resource : resources) { HealthRoomBaseVO baseVO = new HealthRoomBaseVO(); - baseVO.setId(UUID.randomUUID().toString()); - String[] data = generateRandomLocation(); - baseVO.setAddress(data[0]); - baseVO.setLon(data[1]); - baseVO.setLat(data[2]); - baseVO.setDepartName("新疆大厂的单位"); - baseVO.setBuildDate(DateUtil.formatDate(new Date())); + baseVO.setId(resource.getId()); + baseVO.setAddress(resource.getAddress()); + baseVO.setLon(String.valueOf(resource.getLongitude())); + baseVO.setLat(String.valueOf(resource.getLatitude())); + baseVO.setDepartName(resource.getName()); + baseVO.setBuildDate(String.valueOf(resource.getCreateTime())); list.add(baseVO); } - List healthRoomVOS = anYanClient.healthPlaceHomList(); - // 查询第三方接口返回 此接口返回对象跟原有可能不太一样 要注意 return list; } @Override public IPage healthRoomDetail(HealthRoomDTO dto){ - IPage page = new Page<>(dto.getPageNo(), dto.getPageSize()); - page.setTotal(20); - List list = new ArrayList<>(); - Map CHECK_TYPES = new HashMap<>(); - CHECK_TYPES.put("11", "BMI"); - CHECK_TYPES.put("21", "收缩压"); - CHECK_TYPES.put("22", "舒张压"); - CHECK_TYPES.put("31", "血糖"); - CHECK_TYPES.put("41", "低密度脂蛋白"); - CHECK_TYPES.put("42", "总胆固醇"); - CHECK_TYPES.put("43", "甘油三酯"); - CHECK_TYPES.put("51", "尿酸"); - CHECK_TYPES.put("61", "同型半胱氨酸"); - List keys = new ArrayList<>(CHECK_TYPES.keySet()); - for (int i = 0; i < 10; i++) { - HealthRoomVO roomVO = new HealthRoomVO(); - roomVO.setName("小屋"); - roomVO.setDepartName("新疆大厂"); - roomVO.setCheckInDate(DateUtil.today()); - - Random random = new Random(); - String randomKey = keys.get(random.nextInt(keys.size())); - roomVO.setCheckType(randomKey); - roomVO.setLastVal("111"); - roomVO.setGoalVal("100"); - roomVO.setCurrentVal("105"); - roomVO.setCompareVal("5"); - roomVO.setSuccessFlag("0"); - list.add(roomVO); + IPage detailsIPage; + try { + detailsIPage = anYanClient.healthPlaceHomDetailList(dto); + if (ObjUtil.isEmpty(detailsIPage.getRecords())) { + return new Page<>(); + } + }catch (Exception e){ + log.error("调用安眼API失败",e); + throw new RuntimeException("调用安眼API失败"); } - page.setRecords(list); - // 查询第三方接口返回 + IPage page = new Page<>(); + BeanUtil.copyProperties(detailsIPage, page); + List records = detailsIPage.getRecords(); + page.setRecords(records.stream().map(HealthRoomVO::new).collect(Collectors.toList())); return page; } @Override public IPage medicalAbnormal (MedicalAbnormalDTO dto){ - IPage page = new Page<>(dto.getPageNo(), dto.getPageSize()); - page.setTotal(20); - List list = new ArrayList<>(); - for (int i = 0; i < 20; i++) { - MedicalAbnormalVO abnormalVO = new MedicalAbnormalVO(); - abnormalVO.setCheckInDate(DateUtil.today()); - abnormalVO.setHospitalName("新疆医院"); - abnormalVO.setDepartName("新疆大厂"); - Random random = new Random(); - abnormalVO.setSex(random.nextInt(2) + 1); - abnormalVO.setAge(random.nextInt(65 - 18 + 1) + 18); - abnormalVO.setName(generateRandomName()); - list.add(abnormalVO); + IPage page; + try { + page = anYanClient.medicalAbnormalList(dto); + if (ObjUtil.isEmpty(page.getRecords())) { + return new Page<>(); + } + }catch (Exception e){ + log.error("调用安眼API失败",e); + throw new RuntimeException("调用安眼API失败"); } - page.setRecords(list); - // 查询第三方接口返回 return page; } @Override - public IPage healthWeightLoss (HealthWeightLossDTO dto){ - IPage page = new Page<>(dto.getPageNo(), dto.getPageSize()); - page.setTotal(20); - List list = new ArrayList<>(); - for (int i = 0; i < 20; i++) { - HealthWeightLossVO weightLossVO = new HealthWeightLossVO(); - weightLossVO.setName(generateRandomName()); - weightLossVO.setWeight("80"); - weightLossVO.setDepartName("新疆大厂"); - weightLossVO.setBmi("26.8"); - weightLossVO.setWaist("80"); - weightLossVO.setHeight("180"); - weightLossVO.setBmiFlag("0"); - weightLossVO.setInputDate(new Date()); - Random random = new Random(); - weightLossVO.setSex(random.nextInt(2) + 1); - weightLossVO.setAge(random.nextInt(65 - 18 + 1) + 18); - list.add(weightLossVO); + public IPage healthWeightLoss (HealthSignListParam dto){ + IPage page; + try { + page = anYanClient.weightPressureList(dto); + if (ObjUtil.isEmpty(page.getRecords())) { + return new Page<>(); + } + }catch (Exception e){ + log.error("调用安眼API失败",e); + throw new RuntimeException("调用安眼API失败"); } - page.setRecords(list); - // 查询第三方接口返回 return page; } @Override - public IPage healthBloodSugar (HealthBloodSugarDTO dto){ - IPage page = new Page<>(dto.getPageNo(), dto.getPageSize()); - page.setTotal(20); - List list = new ArrayList<>(); - for (int i = 0; i < 20; i++) { - HealthBloodSugarVO bloodSugarVO = new HealthBloodSugarVO(); - bloodSugarVO.setName(generateRandomName()); - bloodSugarVO.setDepartName("新疆大厂"); - bloodSugarVO.setBmiFlag("0"); - bloodSugarVO.setInputDate(new Date()); - bloodSugarVO.setBsVal("100"); - bloodSugarVO.setWaist("88"); - Random random = new Random(); - bloodSugarVO.setSex(random.nextInt(2) + 1); - bloodSugarVO.setAge(random.nextInt(65 - 18 + 1) + 18); - list.add(bloodSugarVO); + public IPage healthBloodSugar (HealthSignListParam dto){ + IPage page; + try { + page = anYanClient.bloodSugarClockSList(dto); + if (ObjUtil.isEmpty(page.getRecords())) { + return new Page<>(); + } + }catch (Exception e){ + log.error("调用安眼API失败",e); + throw new RuntimeException("调用安眼API失败"); } - page.setRecords(list); - // 查询第三方接口返回 return page; } @Override - public IPage healthBloodPressure (HealthBloodPressureDTO dto){ - IPage page = new Page<>(dto.getPageNo(), dto.getPageSize()); - page.setTotal(20); - List list = new ArrayList<>(); - for (int i = 0; i < 20; i++) { - HealthBloodPressureVO bloodPressureVO = new HealthBloodPressureVO(); - bloodPressureVO.setName(generateRandomName()); - bloodPressureVO.setDepartName("新疆大厂"); - bloodPressureVO.setInputDate(new Date()); - bloodPressureVO.setDbp("25"); - bloodPressureVO.setDbpFlag("0"); - bloodPressureVO.setSbp("15"); - bloodPressureVO.setSbpFlag("0"); - Random random = new Random(); - bloodPressureVO.setSex(random.nextInt(2) + 1); - bloodPressureVO.setAge(random.nextInt(65 - 18 + 1) + 18); - list.add(bloodPressureVO); + public IPage healthBloodPressure (HealthSignListParam dto){ + IPage page; + try { + page = anYanClient.bloodPressureList(dto); + if (ObjUtil.isEmpty(page.getRecords())) { + return new Page<>(); + } + }catch (Exception e){ + log.error("调用安眼API失败",e); + throw new RuntimeException("调用安眼API失败"); } - page.setRecords(list); - // 查询第三方接口返回 return page; } @Override public List hospital(){ List list = new ArrayList<>(); - for (int i = 0; i < 20; i++) { - HospitalVO hospitalVO = new HospitalVO(); - hospitalVO.setHospitalName("新疆医院"); - String[] data = generateRandomLocation(); - hospitalVO.setAddress(data[0]); - hospitalVO.setAlias("新"+i); - hospitalVO.setContractDate(new Date()); - hospitalVO.setLon(data[1]); - hospitalVO.setLat(data[2]); - list.add(hospitalVO); + List resources = resourceService.list(new LambdaQueryWrapper().eq(Resource::getType, 1)); + if(CollUtil.isEmpty(resources)) { + return list; } - return list; + return resources.stream().map(HospitalVO::new).collect(Collectors.toList()); } @Override public List medicalPeopleNumStatistics (MedicalPeopleNumStatisticsDTO dto){ - List list = redisClientUtil.getList(MEDICAL,MEDICAL_PEOPLE_NUM_STATISTICS,MedicalPeopleNumStatisticsVO.class); + List list = redisClientUtil.getList(MEDICAL, + MEDICAL_PEOPLE_NUM_STATISTICS+":"+dto.getMedicalYear()+":"+dto.getCenterId(),MedicalPeopleNumStatisticsVO.class); // 获取假数据 List medicalDataList = screenDataService.medicalDataDetail(dto.getCenterId()); @@ -315,23 +240,24 @@ public class LargeScreenServiceImpl extends ServiceImpl setter, String status, String value) { if ("1".equals(status) && value != null) { - setter.accept(Integer.valueOf(value)); + setter.accept(Integer.valueOf(value.replace("+", "").trim())); } } @@ -467,37 +394,83 @@ public class LargeScreenServiceImpl extends ServiceImpl().eq(EmergencyCenter::getDefaultCenter, true), false); + if (ObjUtil.isEmpty(defaultCenter)){ + return; + } Date today = new Date(); - // 体检人数统计查询 - List medicalPeopleNumStatisticsVOS = anYanClient.examinationStatistics(DateUtil.thisYear()); - redisClientUtil.set(MEDICAL,MEDICAL_PEOPLE_NUM_STATISTICS,medicalPeopleNumStatisticsVOS); + if (anYanProperties.isEnable()){ + // 体检人数统计查询 + List medicalPeopleNumStatisticsVOS = anYanClient.examinationStatistics(DateUtil.thisYear()); + redisClientUtil.set(MEDICAL,MEDICAL_PEOPLE_NUM_STATISTICS+":"+DateUtil.thisYear()+":"+defaultCenter.getId(),medicalPeopleNumStatisticsVOS); + + // 体检异常数据查询 + MedicalAbnormalStatisticsVO medicalAbnormalStatisticsVO = anYanClient.medicalAbnormalStatistics(DateUtil.thisYear()); + redisClientUtil.set(MEDICAL,MEDICAL_ABNORMAL_STATISTICS+":"+DateUtil.thisYear()+":"+defaultCenter.getId(),medicalAbnormalStatisticsVO); + + // 健康打卡今日数据查询 + HealthSignStatVO healthSignToday = anYanClient.healthCheckStatistics(DateUtil.beginOfDay(today), DateUtil.endOfDay(today)); + // 健康打卡本月数据查询 + HealthSignStatVO healthSignMonth = anYanClient.healthCheckStatistics(DateUtil.beginOfMonth(today), DateUtil.endOfMonth(today)); + // 减重 血压 血糖 三种数据整合存 + HealthSignVO healthSign = new HealthSignVO(); + + healthSign.setWeightLossCountDay(Integer.valueOf(healthSignToday.getWeigtTotalCount())); + healthSign.setWeightLossAbnormalCountDay(Integer.valueOf(healthSignToday.getWeigtAbCount())); + healthSign.setBloodPressureCountDay(Integer.valueOf(healthSignToday.getBpTotalCount())); + healthSign.setBloodPressureAbnormalCountDay(Integer.valueOf(healthSignToday.getBpAbCount())); + healthSign.setBloodSugarCountDay(Integer.valueOf(healthSignToday.getBsTotalCount())); + healthSign.setBloodSugarAbnormalCountDay(Integer.valueOf(healthSignToday.getBsAbCount())); + + healthSign.setWeightLossCountMonth(Integer.valueOf(healthSignMonth.getWeigtTotalCount())); + healthSign.setWeightLossAbnormalCountMonth(Integer.valueOf(healthSignMonth.getWeigtAbCount())); + healthSign.setBloodPressureCountMonth(Integer.valueOf(healthSignMonth.getBpTotalCount())); + healthSign.setBloodPressureAbnormalCountMonth(Integer.valueOf(healthSignMonth.getBpAbCount())); + healthSign.setBloodSugarCountMonth(Integer.valueOf(healthSignMonth.getBpTotalCount())); + healthSign.setBloodSugarAbnormalCountMonth(Integer.valueOf(healthSignMonth.getBpAbCount())); + + redisClientUtil.set(MEDICAL,HEALTH_SIGN+defaultCenter.getId(),healthSign); + }else { + randomData(defaultCenter); + } + } + + private void randomData(EmergencyCenter defaultCenter){ + List medicalPeopleNumStatisticsVOS = new ArrayList<>(); + Random random = new Random(); + for (int i = 0; i < 10; i++) { + MedicalPeopleNumStatisticsVO vo = new MedicalPeopleNumStatisticsVO(); + vo.setHospitalName("新疆医院"); + vo.setAlias("新疆医院"); + int randomCount = random.nextInt(100) + 1; + vo.setCheckedCount(randomCount); + medicalPeopleNumStatisticsVOS.add(vo); + } + redisClientUtil.set(MEDICAL,MEDICAL_PEOPLE_NUM_STATISTICS+":"+DateUtil.thisYear()+":"+defaultCenter.getId(),medicalPeopleNumStatisticsVOS); // 体检异常数据查询 - MedicalAbnormalStatisticsVO medicalAbnormalStatisticsVO = anYanClient.medicalAbnormalStatistics(DateUtil.thisYear()); - redisClientUtil.set(MEDICAL,MEDICAL_ABNORMAL_STATISTICS,medicalAbnormalStatisticsVO); - - // 健康打卡今日数据查询 - HealthSignStatVO healthSignToday = anYanClient.healthCheckStatistics(DateUtil.beginOfDay(today), DateUtil.endOfDay(today)); - // 健康打卡本月数据查询 - HealthSignStatVO healthSignMonth = anYanClient.healthCheckStatistics(DateUtil.beginOfMonth(today), DateUtil.endOfMonth(today)); + MedicalAbnormalStatisticsVO medicalAbnormalStatisticsVO = new MedicalAbnormalStatisticsVO(); + medicalAbnormalStatisticsVO.setTotalCount(100); + medicalAbnormalStatisticsVO.setCardiovaAbCount(50); + medicalAbnormalStatisticsVO.setCerebrovAbCount(50); + redisClientUtil.set(MEDICAL,MEDICAL_ABNORMAL_STATISTICS+":"+DateUtil.thisYear()+":"+defaultCenter.getId(),medicalAbnormalStatisticsVO); // 减重 血压 血糖 三种数据整合存 HealthSignVO healthSign = new HealthSignVO(); + healthSign.setWeightLossCountDay(random.nextInt(100) + 1); + healthSign.setWeightLossAbnormalCountDay(random.nextInt(100) + 1); + healthSign.setBloodPressureCountDay(random.nextInt(100) + 1); + healthSign.setBloodPressureAbnormalCountDay(random.nextInt(100) + 1); + healthSign.setBloodSugarCountDay(random.nextInt(100) + 1); + healthSign.setBloodSugarAbnormalCountDay(random.nextInt(100) + 1); - healthSign.setWeightLossCountDay(Integer.valueOf(healthSignToday.getWeigtTotalCount())); - healthSign.setWeightLossAbnormalCountDay(Integer.valueOf(healthSignToday.getWeigtAbCount())); - healthSign.setBloodPressureCountDay(Integer.valueOf(healthSignToday.getBpTotalCount())); - healthSign.setBloodPressureAbnormalCountDay(Integer.valueOf(healthSignToday.getBpAbCount())); - healthSign.setBloodSugarCountDay(Integer.valueOf(healthSignToday.getBsTotalCount())); - healthSign.setBloodSugarAbnormalCountDay(Integer.valueOf(healthSignToday.getBsAbCount())); - - healthSign.setWeightLossCountMonth(Integer.valueOf(healthSignMonth.getWeigtTotalCount())); - healthSign.setWeightLossAbnormalCountMonth(Integer.valueOf(healthSignMonth.getWeigtAbCount())); - healthSign.setBloodPressureCountMonth(Integer.valueOf(healthSignMonth.getBpTotalCount())); - healthSign.setBloodPressureAbnormalCountMonth(Integer.valueOf(healthSignMonth.getBpAbCount())); - healthSign.setBloodSugarCountMonth(Integer.valueOf(healthSignMonth.getBpTotalCount())); - healthSign.setBloodSugarAbnormalCountMonth(Integer.valueOf(healthSignMonth.getBpAbCount())); - - redisClientUtil.set(MEDICAL,HEALTH_SIGN,healthSign); + healthSign.setWeightLossCountMonth(random.nextInt(100) + 1); + healthSign.setWeightLossAbnormalCountMonth(random.nextInt(100) + 1); + healthSign.setBloodPressureCountMonth(random.nextInt(100) + 1); + healthSign.setBloodPressureAbnormalCountMonth(random.nextInt(100) + 1); + healthSign.setBloodSugarCountMonth(random.nextInt(100) + 1); + healthSign.setBloodSugarAbnormalCountMonth(random.nextInt(100) + 1); + redisClientUtil.set(MEDICAL,HEALTH_SIGN+defaultCenter.getId(),healthSign); } @Override @@ -550,84 +523,4 @@ public class LargeScreenServiceImpl extends ServiceImpl XjMedicalCountFakerData(String centerId) { - try { - Object data = redisUtil.get(StrUtil.isNotEmpty(centerId) ? - FakerDataConstant.XJ_MEDICAL_COUNT + ":" + centerId : FakerDataConstant.XJ_MEDICAL_COUNT); - if (data == null) { - return Collections.emptyList(); - } - try { - List voList = new ArrayList<>(); - List returnDataList = (List) data; - for (XjMedicalCountFakerData fakerData : returnDataList) { - MedicalPeopleNumStatisticsVO vo = new MedicalPeopleNumStatisticsVO(); - vo.setHospitalName(fakerData.getName()); - vo.setCheckedCount(Integer.valueOf(fakerData.getCount())); - voList.add(vo); - } - return voList; - } catch (Exception e) { - log.error("新疆大屏体检人数统计数据转化异常", e); - return Collections.emptyList(); - } - } catch (Exception e) { - return null; - } - } - - private HealthSignVO XjHealthSignFakerDataNew(String centerId) { - try { - HealthSignVO vo = new HealthSignVO(); - XjHealthSignFakerData data = (XjHealthSignFakerData) redisUtil.get(StrUtil.isNotEmpty(centerId) - ? FakerDataConstant.XJ_HEALTH_SIGN_COUNT + ":" + centerId : FakerDataConstant.XJ_HEALTH_SIGN_COUNT); - BeanUtils.copyProperties(data,vo); - return vo; - } catch (Exception e) { - return null; - } - } - - private MedicalAbnormalStatisticsVO XjMedicalDataFakerDataNew(String centerId) { - try { - MedicalAbnormalStatisticsVO vo = new MedicalAbnormalStatisticsVO(); - XjMedicalDataFakerData data = (XjMedicalDataFakerData) redisUtil.get(StrUtil.isNotEmpty(centerId) - ? FakerDataConstant.XJ_MEDICAL_DATA + ":" + centerId : FakerDataConstant.XJ_MEDICAL_DATA); - BeanUtils.copyProperties(data,vo); - return vo; - } catch (Exception e) { - return null; - } - } } diff --git a/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/service/impl/TblAmbulanceGpsServiceImpl.java b/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/service/impl/TblAmbulanceGpsServiceImpl.java index b1a9fdc..49cb51b 100644 --- a/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/service/impl/TblAmbulanceGpsServiceImpl.java +++ b/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/service/impl/TblAmbulanceGpsServiceImpl.java @@ -2,30 +2,21 @@ package com.renkang.emergency.service.impl; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.github.yulichang.wrapper.MPJLambdaWrapper; import com.renkang.emergency.entity.*; import com.renkang.emergency.entity.dto.ResourcesAllDTO; -import com.renkang.emergency.largeScreen.entity.dto.HealthRoomDTO; import com.renkang.emergency.mapper.EmergencyHealthRoomMapper; import com.renkang.emergency.mapper.TblAmbulanceGpsMapper; import com.renkang.emergency.mapper.TblBaseHospitalMapper; -import com.renkang.emergency.service.IEmergencyCenterResourceService; -import com.renkang.emergency.service.IEmergencyHealthRoomService; import com.renkang.emergency.service.ITblAmbulanceGpsService; import lombok.extern.slf4j.Slf4j; -import org.jeecg.common.api.vo.Result; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import javax.annotation.Resource; -import java.text.DecimalFormat; import java.util.ArrayList; -import java.util.HashMap; import java.util.List; -import java.util.Map; -import java.util.stream.Collectors; /** * @author TianZi @@ -40,8 +31,6 @@ public class TblAmbulanceGpsServiceImpl extends ServiceImpl