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 15f4d5f..39e6b7b 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 @@ -2287,7 +2287,7 @@ public class BabyBookbuildingFacade { result.setPid(model.getPid()); result.setCardNo(model.getMcertNo());//母亲的身份证号码 - result.setName(babyHis.get("name") == null ? "" : babyHis.get("name").toString()); + if (model.getBirth() != null) { result.setMonthAge(DateUtil.getBabyMonthAge(model.getBirth(), new Date())); } else { @@ -2309,11 +2309,12 @@ public class BabyBookbuildingFacade { if (build.getHospitalId().equals(param.getHospitalId())) { isCurrentHosp = true; buildInfo = build; - buildInfo.setName(babyHis.get("name") == null ? "" : babyHis.get("name").toString()); + } if (build != null && build.getYn() == YnEnums.YES.getId()) { result.setIsBuild(true); + result.setName(babyHis.get("name") == null ? "" : babyHis.get("name").toString()); }