From 59ade8db2b7b79e991a9076cfe14b0d0b4a049fe Mon Sep 17 00:00:00 2001 From: wanghao Date: Wed, 20 Aug 2025 13:33:06 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=A4=A7=E5=B1=8F=E4=BD=93?= =?UTF-8?q?=E6=A3=80=E5=BC=82=E5=B8=B8=E7=BB=9F=E8=AE=A1bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/LargeScreenServiceImpl.java | 155 +++++++++--------- 1 file changed, 79 insertions(+), 76 deletions(-) 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 253290b..2ae81bc 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 @@ -76,8 +76,8 @@ public class LargeScreenServiceImpl extends ServiceImpl maps = new ArrayList<>(); if (StrUtil.isEmpty(type) || type.equals("1")) { List list = resourceService.list(new LambdaQueryWrapper() - .eq(StrUtil.isNotEmpty(type),Resource::getType, type) - .eq(StrUtil.isEmpty(type),Resource::getType, "1")); + .eq(StrUtil.isNotEmpty(type), Resource::getType, type) + .eq(StrUtil.isEmpty(type), Resource::getType, "1")); maps.addAll(list.stream().map(LargeScreenMap::new).collect(Collectors.toList())); } if (StrUtil.isEmpty(type) || type.equals("2")) { @@ -86,18 +86,18 @@ public class LargeScreenServiceImpl extends ServiceImpl list = resourceService.list(new LambdaQueryWrapper() - .eq(StrUtil.isNotEmpty(type),Resource::getType, type) - .eq(StrUtil.isEmpty(type),Resource::getType, "5")); + .eq(StrUtil.isNotEmpty(type), Resource::getType, type) + .eq(StrUtil.isEmpty(type), Resource::getType, "5")); maps.addAll(list.stream().map(LargeScreenMap::new).collect(Collectors.toList())); } return maps; } @Override - public List healthRoomBase(HealthRoomBaseDTO dto){ + public List healthRoomBase(HealthRoomBaseDTO dto) { List list = new ArrayList<>(); List resources = resourceService.list(new LambdaQueryWrapper().eq(Resource::getType, 3) - .between(ObjUtil.isNotEmpty(dto.getCheckInDateBegin()),Resource::getCreateTime,dto.getCheckInDateBegin(),dto.getCheckInDateEnd())); + .between(ObjUtil.isNotEmpty(dto.getCheckInDateBegin()), Resource::getCreateTime, dto.getCheckInDateBegin(), dto.getCheckInDateEnd())); for (Resource resource : resources) { HealthRoomBaseVO baseVO = new HealthRoomBaseVO(); baseVO.setId(resource.getId()); @@ -112,15 +112,15 @@ public class LargeScreenServiceImpl extends ServiceImpl healthRoomDetail(HealthRoomDTO dto){ + public IPage healthRoomDetail(HealthRoomDTO dto) { IPage detailsIPage; try { detailsIPage = anYanClient.healthPlaceHomDetailList(dto); if (ObjUtil.isEmpty(detailsIPage.getRecords())) { return new Page<>(); } - }catch (Exception e){ - log.error("调用安眼API失败",e); + } catch (Exception e) { + log.error("调用安眼API失败", e); throw new RuntimeException("调用安眼API失败"); } IPage page = new Page<>(); @@ -131,100 +131,100 @@ public class LargeScreenServiceImpl extends ServiceImpl medicalAbnormal (MedicalAbnormalDTO dto){ + public IPage medicalAbnormal(MedicalAbnormalDTO dto) { IPage page; try { page = anYanClient.medicalAbnormalList(dto); if (ObjUtil.isEmpty(page.getRecords())) { return new Page<>(); } - }catch (Exception e){ - log.error("调用安眼API失败",e); + } catch (Exception e) { + log.error("调用安眼API失败", e); throw new RuntimeException("调用安眼API失败"); } return page; } @Override - public IPage healthWeightLoss (HealthSignListParam dto){ + 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); + } catch (Exception e) { + log.error("调用安眼API失败", e); throw new RuntimeException("调用安眼API失败"); } return page; } @Override - public IPage healthBloodSugar (HealthSignListParam dto){ + 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); + } catch (Exception e) { + log.error("调用安眼API失败", e); throw new RuntimeException("调用安眼API失败"); } return page; } @Override - public IPage healthBloodPressure (HealthSignListParam dto){ + 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); + } catch (Exception e) { + log.error("调用安眼API失败", e); throw new RuntimeException("调用安眼API失败"); } return page; } @Override - public List hospital(){ + public List hospital() { List list = new ArrayList<>(); List resources = resourceService.list(new LambdaQueryWrapper().eq(Resource::getType, 1)); - if(CollUtil.isEmpty(resources)) { + if (CollUtil.isEmpty(resources)) { return list; } return resources.stream().map(HospitalVO::new).collect(Collectors.toList()); } @Override - public List medicalPeopleNumStatistics (MedicalPeopleNumStatisticsDTO dto){ + public List medicalPeopleNumStatistics(MedicalPeopleNumStatisticsDTO dto) { List list = redisClientUtil.getList(MEDICAL, - MEDICAL_PEOPLE_NUM_STATISTICS+":"+dto.getMedicalYear()+":"+dto.getCenterId(),MedicalPeopleNumStatisticsVO.class); + MEDICAL_PEOPLE_NUM_STATISTICS + ":" + dto.getMedicalYear() + ":" + dto.getCenterId(), MedicalPeopleNumStatisticsVO.class); // 获取假数据 List medicalDataList = screenDataService.medicalDataDetail(dto.getCenterId()); - if (CollUtil.isEmpty(list)){ + if (CollUtil.isEmpty(list)) { list = new ArrayList<>(); for (MedicalDataVO medicalData : medicalDataList) { - if ("1".equals(medicalData.getStatus())){ + if ("1".equals(medicalData.getStatus())) { MedicalPeopleNumStatisticsVO vo = new MedicalPeopleNumStatisticsVO(); vo.setHospitalName(medicalData.getName()); vo.setCheckedCount(Integer.valueOf(medicalData.getCount())); list.add(vo); } } - }else { + } else { for (MedicalPeopleNumStatisticsVO statistics : list) { MedicalDataVO medicalData = medicalDataList.stream().filter(item -> item.getName().equals(statistics.getHospitalName())).findFirst().orElse(null); - if (null != medicalData){ - if ("1".equals(medicalData.getStatus())){ - if (medicalData.getCount().contains("+")){ - statistics.setCheckedCount(statistics.getCheckedCount()+Integer.parseInt(medicalData.getCount().replace("+", "").trim())); - }else { + if (null != medicalData) { + if ("1".equals(medicalData.getStatus())) { + if (medicalData.getCount().contains("+")) { + statistics.setCheckedCount(statistics.getCheckedCount() + Integer.parseInt(medicalData.getCount().replace("+", "").trim())); + } else { statistics.setCheckedCount(Integer.parseInt(medicalData.getCount().replace("+", "").trim())); } } @@ -235,54 +235,57 @@ public class LargeScreenServiceImpl extends ServiceImpl().eq(EmergencyCenter::getDefaultCenter, true), false); - if (ObjUtil.isEmpty(defaultCenter)){ + if (ObjUtil.isEmpty(defaultCenter)) { return; } Date today = new Date(); - if (anYanProperties.isEnable()){ + if (anYanProperties.isEnable()) { // 体检人数统计查询 List medicalPeopleNumStatisticsVOS = anYanClient.examinationStatistics(DateUtil.thisYear()); - redisClientUtil.set(MEDICAL,MEDICAL_PEOPLE_NUM_STATISTICS+":"+DateUtil.thisYear()+":"+defaultCenter.getId(),medicalPeopleNumStatisticsVOS); + 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); + redisClientUtil.set(MEDICAL, MEDICAL_ABNORMAL_STATISTICS + ":" + DateUtil.thisYear() + ":" + defaultCenter.getId(), medicalAbnormalStatisticsVO); // 健康打卡今日数据查询 HealthSignStatVO healthSignToday = anYanClient.healthCheckStatistics(DateUtil.beginOfDay(today), DateUtil.endOfDay(today)); @@ -426,13 +429,13 @@ public class LargeScreenServiceImpl extends ServiceImpl medicalPeopleNumStatisticsVOS = new ArrayList<>(); Random random = new Random(); for (int i = 0; i < 10; i++) { @@ -443,14 +446,14 @@ public class LargeScreenServiceImpl extends ServiceImpl hospitalListVOList = anYanClient.hospitalList(); - if(ObjectUtil.isEmpty(hospitalListVOList)){ + if (ObjectUtil.isEmpty(hospitalListVOList)) { LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - wrapper.eq(Resource::getType,"1"); - wrapper.in(Resource::getId,hospitalListVOList.stream().map(HospitalListVO::getId).collect(Collectors.toList())); + wrapper.eq(Resource::getType, "1"); + wrapper.in(Resource::getId, hospitalListVOList.stream().map(HospitalListVO::getId).collect(Collectors.toList())); List hospitalList = resourceService.list(wrapper); List saveOrUpdateBatchList = new ArrayList<>(); - for(HospitalListVO hospital : hospitalListVOList){ + for (HospitalListVO hospital : hospitalListVOList) { Resource resource = hospitalList.stream().filter(re -> hospital.getId().equals(re.getId())).findFirst().orElse(new Resource()); resource.setAddress(hospital.getAddress()); resource.setMemo(hospital.getAlias()); //医院别名使用备注字段 @@ -498,13 +501,13 @@ public class LargeScreenServiceImpl extends ServiceImpl healthRoomVOList = anYanClient.healthPlaceHomList(); - if(ObjectUtil.isEmpty(healthRoomVOList)){ + if (ObjectUtil.isEmpty(healthRoomVOList)) { List saveOrUpdateBatchList = new ArrayList<>(); LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - wrapper.eq(Resource::getType,"2"); - wrapper.in(Resource::getId,healthRoomVOList.stream().map(HealthRoomBaseVO::getId).collect(Collectors.toList())); + wrapper.eq(Resource::getType, "2"); + wrapper.in(Resource::getId, healthRoomVOList.stream().map(HealthRoomBaseVO::getId).collect(Collectors.toList())); List roomList = resourceService.list(wrapper); - for(HealthRoomBaseVO room : healthRoomVOList){ + for (HealthRoomBaseVO room : healthRoomVOList) { Resource resource = roomList.stream().filter(re -> room.getId().equals(re.getId())).findFirst().orElse(new Resource()); resource.setAddress(room.getAddress()); resource.setCreateTime(DateUtil.parseDate(room.getBuildDate()));