Commit 77a9845e3726890837f021868af7fa69934b4a4f
1 parent
b40f3ca355
Exists in
master
and in
6 other branches
update
Showing 1 changed file with 5 additions and 4 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java
View file @
77a9845
| ... | ... | @@ -2167,12 +2167,13 @@ |
| 2167 | 2167 | isCurrentHosp = true; |
| 2168 | 2168 | buildInfo = build; |
| 2169 | 2169 | } |
| 2170 | - Map <String, String> buildRecords = new HashMap <>(); | |
| 2171 | - if (build.getYn() == YnEnums.YES.getId()) { | |
| 2172 | - buildRecords.clear(); | |
| 2170 | + | |
| 2171 | + if (build != null && build.getYn() == YnEnums.YES.getId()) { | |
| 2173 | 2172 | result.setIsBuild(true); |
| 2174 | 2173 | } |
| 2175 | 2174 | |
| 2175 | + | |
| 2176 | + Map <String, String> buildRecords = new HashMap <>(); | |
| 2176 | 2177 | buildRecords.put("id", build.getId()); |
| 2177 | 2178 | buildRecords.put("buildDate", DateUtil.getyyyy_MM_dd(build.getBuildDate())); |
| 2178 | 2179 | buildRecords.put("hospitalId", build.getHospitalId()); |
| ... | ... | @@ -2780,7 +2781,7 @@ |
| 2780 | 2781 | if (CollectionUtils.isNotEmpty(futures)) { |
| 2781 | 2782 | for (Future f : futures) { |
| 2782 | 2783 | try { |
| 2783 | - list.addAll((List <BabyManageListResult>) f.get()); | |
| 2784 | + list.addAll((List <BabyManageListResult>) f. get()); | |
| 2784 | 2785 | } catch (Exception e) { |
| 2785 | 2786 | ExceptionUtils.catchException(e, "baby list error."); |
| 2786 | 2787 | } |