Commit c842abf59d0087333f9dcbf95584d231bfab9213
1 parent
9405500f31
Exists in
master
and in
6 other branches
update
Showing 1 changed file with 3 additions and 2 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java
View file @
c842abf
... | ... | @@ -2287,7 +2287,7 @@ |
2287 | 2287 | |
2288 | 2288 | result.setPid(model.getPid()); |
2289 | 2289 | result.setCardNo(model.getMcertNo());//母亲的身份证号码 |
2290 | - result.setName(babyHis.get("name") == null ? "" : babyHis.get("name").toString()); | |
2290 | + | |
2291 | 2291 | if (model.getBirth() != null) { |
2292 | 2292 | result.setMonthAge(DateUtil.getBabyMonthAge(model.getBirth(), new Date())); |
2293 | 2293 | } else { |
2294 | 2294 | |
... | ... | @@ -2309,11 +2309,12 @@ |
2309 | 2309 | if (build.getHospitalId().equals(param.getHospitalId())) { |
2310 | 2310 | isCurrentHosp = true; |
2311 | 2311 | buildInfo = build; |
2312 | - buildInfo.setName(babyHis.get("name") == null ? "" : babyHis.get("name").toString()); | |
2312 | + | |
2313 | 2313 | } |
2314 | 2314 | |
2315 | 2315 | if (build != null && build.getYn() == YnEnums.YES.getId()) { |
2316 | 2316 | result.setIsBuild(true); |
2317 | + result.setName(babyHis.get("name") == null ? "" : babyHis.get("name").toString()); | |
2317 | 2318 | } |
2318 | 2319 | |
2319 | 2320 |