diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java index 35085c5..4ee86a4 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java @@ -912,7 +912,11 @@ public class BabyBookbuildingFacade { { for(BabyModel build: builds) { - if (build != null && StringUtils.isNotEmpty(build.getHospitalId()) && build.getHospitalId().equals(param.getHospitalId())) + if (build != null || StringUtils.isEmpty(build.getHospitalId())) + { + continue; + } + if (build.getHospitalId().equals(param.getHospitalId())) { isCurrentHosp = true; buildInfo = build; @@ -922,7 +926,7 @@ public class BabyBookbuildingFacade { Map buildRecords = new HashMap<>(); buildRecords.put("id", build.getId()); buildRecords.put("buildDate", DateUtil.getyyyy_MM_dd(build.getBuildDate())); - + buildRecords.put("hospitalId",build.getHospitalId()); //查询建档医院 Organization org = organizationService.getOrganization(Integer.valueOf(build.getHospitalId())); if (org != null) {