Commit add4fe5e673e362d668e43293006b84bc6c38394
1 parent
fcd6739ccb
Exists in
master
and in
1 other branch
儿童管理
Showing 1 changed file with 6 additions and 2 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java
View file @
add4fe5
| ... | ... | @@ -912,8 +912,12 @@ |
| 912 | 912 | { |
| 913 | 913 | for(BabyModel build: builds) |
| 914 | 914 | { |
| 915 | - if (build != null && StringUtils.isNotEmpty(build.getHospitalId()) && build.getHospitalId().equals(param.getHospitalId())) | |
| 915 | + if (build != null || StringUtils.isEmpty(build.getHospitalId())) | |
| 916 | 916 | { |
| 917 | + continue; | |
| 918 | + } | |
| 919 | + if (build.getHospitalId().equals(param.getHospitalId())) | |
| 920 | + { | |
| 917 | 921 | isCurrentHosp = true; |
| 918 | 922 | buildInfo = build; |
| 919 | 923 | } |
| ... | ... | @@ -922,7 +926,7 @@ |
| 922 | 926 | Map<String, String> buildRecords = new HashMap<>(); |
| 923 | 927 | buildRecords.put("id", build.getId()); |
| 924 | 928 | buildRecords.put("buildDate", DateUtil.getyyyy_MM_dd(build.getBuildDate())); |
| 925 | - | |
| 929 | + buildRecords.put("hospitalId",build.getHospitalId()); | |
| 926 | 930 | //查询建档医院 |
| 927 | 931 | Organization org = organizationService.getOrganization(Integer.valueOf(build.getHospitalId())); |
| 928 | 932 | if (org != null) { |