From 7ffcacabced34207b62c828838d4739d3e3e4bfd Mon Sep 17 00:00:00 2001 From: landong2015 Date: Mon, 12 Dec 2016 17:14:53 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8F=B6=E9=85=B8=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E6=9F=A5=E8=AF=A2bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../lyms/platform/operate/web/facade/FolicAcidFacade.java | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/FolicAcidFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/FolicAcidFacade.java index c0c2d91..65b0b82 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/FolicAcidFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/FolicAcidFacade.java @@ -207,7 +207,7 @@ public class FolicAcidFacade { List> list = new ArrayList<>(); - List organizationList = new ArrayList<>(); + List organizationList = null; FolicAcidQuery folicAcidQuery = new FolicAcidQuery(); folicAcidQuery.setYn(YnEnums.YES.getId()); @@ -240,17 +240,25 @@ public class FolicAcidFacade { organizationQuery.setProvinceId(queryRequest.getProvinceId()); organizationQuery.setCityId(queryRequest.getCityId()); organizationQuery.setAreaId(queryRequest.getAreaId()); + + organizationList = new ArrayList<>(); organizationList = organizationService.queryHospitals(organizationQuery); } - List hospitalIds = new ArrayList<>(); + List hospitalIds = null; if (CollectionUtils.isNotEmpty(organizationList)){ + hospitalIds = new ArrayList<>(); for (Organization hospital : organizationList){ hospitalIds.add(String.valueOf(hospital.getId())); } - if (CollectionUtils.isNotEmpty(hospitalIds)){ + } + + if (organizationList!=null){ + if (hospitalIds != null){ folicAcidQuery.setHospitalList(hospitalIds); + }else { + folicAcidQuery.setHospitalId("-1"); } } -- 1.8.3.1