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 d614535..10a0f6e 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 @@ -2167,12 +2167,13 @@ public class BabyBookbuildingFacade { isCurrentHosp = true; buildInfo = build; } - Map buildRecords = new HashMap <>(); - if (build.getYn() == YnEnums.YES.getId()) { - buildRecords.clear(); + + if (build != null && build.getYn() == YnEnums.YES.getId()) { result.setIsBuild(true); } + + Map buildRecords = new HashMap <>(); buildRecords.put("id", build.getId()); buildRecords.put("buildDate", DateUtil.getyyyy_MM_dd(build.getBuildDate())); buildRecords.put("hospitalId", build.getHospitalId()); @@ -2780,7 +2781,7 @@ public class BabyBookbuildingFacade { if (CollectionUtils.isNotEmpty(futures)) { for (Future f : futures) { try { - list.addAll((List ) f.get()); + list.addAll((List ) f. get()); } catch (Exception e) { ExceptionUtils.catchException(e, "baby list error."); }