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"); } }