From a207903fb8d84fea1c7a069cea563cb2e4cbaaed Mon Sep 17 00:00:00 2001 From: shiyang <316555390@qq.com> Date: Fri, 3 Dec 2021 14:54:56 +0800 Subject: [PATCH] update --- .../web/service/impl/BabyEyeCheckServiceImpl.java | 79 ++++++++-------------- 1 file changed, 29 insertions(+), 50 deletions(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BabyEyeCheckServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BabyEyeCheckServiceImpl.java index bf03250..208975c 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BabyEyeCheckServiceImpl.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/BabyEyeCheckServiceImpl.java @@ -1406,9 +1406,9 @@ public class BabyEyeCheckServiceImpl extends BaseServiceImpl implements BabyEyeC temp.put("healthCheckTypeWhole", null!=babyEyeCheck.getHealthCheckTypeWhole()?babyEyeCheck.getHealthCheckTypeWhole():0); temp.put("kindergarten", null!=babyEyeCheck.getKindergarten()?babyEyeCheck.getKindergarten():0); temp.put("basicOrganization", null!=babyEyeCheck.getBasicOrganization()?babyEyeCheck.getBasicOrganization():0); - //居住地 - temp.put("hospitalName", babyEyeCheck.getHospitalName()); //检查医院 + temp.put("hospitalName", babyEyeCheck.getCheckHospital()); + //居住地 temp.put("completeAddress",babyEyeCheck.getCompleteAddress()); CollectionUtils.removeNullValue(temp); restMap.add(temp); @@ -2427,36 +2427,31 @@ public class BabyEyeCheckServiceImpl extends BaseServiceImpl implements BabyEyeC if(null!=basicOrganization){ criteria.and("basicOrganization").is(basicOrganization); } - //检查医院 - if(StringUtils.isNotEmpty(ckHospitalId)){ - criteria.and("hospitalId").is(ckHospitalId); - } //区域医院筛选条件得到机构ID集合 List hospitalIdList = new ArrayList <>(); if (StringUtils.isNotEmpty(hospitalProvinceId)){ OrganizationQuery organizationQuery = new OrganizationQuery(); - organizationQuery.setProvinceId(hospitalProvinceId); - List organizationListP = organizationService.queryOrganization(organizationQuery); - for (Organization organization : organizationListP) { - hospitalIdList.add(String.valueOf(organization.getId())); - } - if (StringUtils.isNotEmpty(hospitalCityId)) { + if (StringUtils.isNotEmpty(ckHospitalId)) { + hospitalIdList.add(ckHospitalId); + }else if(StringUtils.isNotEmpty(hospitalAreaId)){ + organizationQuery.setAreaId(hospitalAreaId); + List organizationListA = organizationService.queryOrganization(organizationQuery); + for (Organization organization : organizationListA) { + hospitalIdList.add(String.valueOf(organization.getId())); + } + }else if(StringUtils.isNotEmpty(hospitalCityId)){ organizationQuery.setCityId(hospitalCityId); List organizationListC = organizationService.queryOrganization(organizationQuery); for (Organization organization : organizationListC) { hospitalIdList.add(String.valueOf(organization.getId())); } - } - if (StringUtils.isNotEmpty(hospitalAreaId)) { - organizationQuery.setAreaId(hospitalAreaId); - List organizationListA = organizationService.queryOrganization(organizationQuery); - for (Organization organization : organizationListA) { + }else if(StringUtils.isNotEmpty(hospitalProvinceId)){ + organizationQuery.setProvinceId(hospitalProvinceId); + List organizationListP = organizationService.queryOrganization(organizationQuery); + for (Organization organization : organizationListP) { hospitalIdList.add(String.valueOf(organization.getId())); } } - if (StringUtils.isNotEmpty(ckHospitalId)) { - hospitalIdList.add(ckHospitalId); - } List permissions = new ArrayList <>(); DataPermissionsModelQuery dataPermissionsModelQuery = new DataPermissionsModelQuery(); @@ -2575,10 +2570,6 @@ public class BabyEyeCheckServiceImpl extends BaseServiceImpl implements BabyEyeC babyModels.getAreaId(), babyModels.getStreetId(), babyModels.getAddress(), basicConfigService); //居住地 babyEyeCheck.setCompleteAddress(address); - //检查医院 - if(StringUtils.isNotEmpty(babyEyeCheck.getHospitalId())){ - babyEyeCheck.setHospitalName(organizationService.getOrganization(Integer.valueOf(babyEyeCheck.getHospitalId())).getName()); - } } } List> maps = setDatas(babyEyeChecks); @@ -2593,10 +2584,6 @@ public class BabyEyeCheckServiceImpl extends BaseServiceImpl implements BabyEyeC babyModels.getAreaId(), babyModels.getStreetId(), babyModels.getAddress(), basicConfigService); //居住地 babyEyeCheck.setCompleteAddress(address); - //检查医院 - if(StringUtils.isNotEmpty(babyEyeCheck.getHospitalId())){ - babyEyeCheck.setHospitalName(organizationService.getOrganization(Integer.valueOf(babyEyeCheck.getHospitalId())).getName()); - } } } pageResult.setGrid(setDatas(babyEyeChecks)); @@ -2619,28 +2606,27 @@ public class BabyEyeCheckServiceImpl extends BaseServiceImpl implements BabyEyeC List hospitalIdList = new ArrayList <>(); if (StringUtils.isNotEmpty(hospitalProvinceId)){ OrganizationQuery organizationQuery = new OrganizationQuery(); - organizationQuery.setProvinceId(hospitalProvinceId); - List organizationListP = organizationService.queryOrganization(organizationQuery); - for (Organization organization : organizationListP) { - hospitalIdList.add(String.valueOf(organization.getId())); - } - if (StringUtils.isNotEmpty(hospitalCityId)) { + if (StringUtils.isNotEmpty(ckHospitalId)) { + hospitalIdList.add(ckHospitalId); + }else if(StringUtils.isNotEmpty(hospitalAreaId)){ + organizationQuery.setAreaId(hospitalAreaId); + List organizationListA = organizationService.queryOrganization(organizationQuery); + for (Organization organization : organizationListA) { + hospitalIdList.add(String.valueOf(organization.getId())); + } + }else if(StringUtils.isNotEmpty(hospitalCityId)){ organizationQuery.setCityId(hospitalCityId); List organizationListC = organizationService.queryOrganization(organizationQuery); for (Organization organization : organizationListC) { hospitalIdList.add(String.valueOf(organization.getId())); } - } - if (StringUtils.isNotEmpty(hospitalAreaId)) { - organizationQuery.setAreaId(hospitalAreaId); - List organizationListA = organizationService.queryOrganization(organizationQuery); - for (Organization organization : organizationListA) { + }else if(StringUtils.isNotEmpty(hospitalProvinceId)){ + organizationQuery.setProvinceId(hospitalProvinceId); + List organizationListP = organizationService.queryOrganization(organizationQuery); + for (Organization organization : organizationListP) { hospitalIdList.add(String.valueOf(organization.getId())); } } - if (StringUtils.isNotEmpty(ckHospitalId)) { - hospitalIdList.add(ckHospitalId); - } List permissions = new ArrayList <>(); DataPermissionsModelQuery dataPermissionsModelQuery = new DataPermissionsModelQuery(); @@ -2826,14 +2812,7 @@ public class BabyEyeCheckServiceImpl extends BaseServiceImpl implements BabyEyeC babyModel.getAreaId(), babyModel.getStreetId(), babyModel.getAddress(), basicConfigService); mapResult.put("completeAddress",address); //检查医院 - String hospitalName=null; - if(StringUtils.isNotEmpty(babyModel.getId())){ - List babyEyeChecks=mongoTemplate.find(Query.query(new Criteria("babyId").is(babyModel.getId())).with(new Sort(Sort.Direction.DESC, "checkTime")), BabyEyeCheck.class); - if(CollectionUtils.isNotEmpty(babyEyeChecks)){ - hospitalName=organizationService.getOrganization(Integer.valueOf(babyEyeChecks.get(0).getHospitalId())).getName(); - } - - } + String hospitalName=organizationService.getOrganization(Integer.valueOf(babyModel.getHospitalId())).getName(); mapResult.put("hospitalName",hospitalName); StringBuilder positiveBaby = getYxxmBaby(babyModel);//阳性项目 mapResult.put("positive", positiveBaby.toString());//阳性项目 -- 1.8.3.1