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 1fc11eb..0ca7d29 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 @@ -1565,14 +1565,6 @@ public class BabyBookbuildingFacade { if (CollectionUtils.isNotEmpty(personModels)) { for (PersonModel babayPerson : personModels) { BabyInfoResult result = new BabyInfoResult(); - result.setPid(babayPerson.getId()); - result.setCardNo(babayPerson.getCardNo());//母亲的身份证号码 - result.setName(babayPerson.getName()); - if (babayPerson.getBirth() != null) { - result.setMonthAge(DateUtil.getBabyMonthAge(babayPerson.getBirth(), new Date())); - } else { - result.setMonthAge(""); - } //通过pid查询儿童的建档记录 BabyModelQuery babyQuery = new BabyModelQuery(); @@ -1591,6 +1583,17 @@ public class BabyBookbuildingFacade { List> list = new ArrayList<>(); if (CollectionUtils.isNotEmpty(builds)) { + + + result.setPid(babayPerson.getId()); + result.setCardNo(babayPerson.getCardNo());//母亲的身份证号码 + result.setName(babayPerson.getName()); + if (babayPerson.getBirth() != null) { + result.setMonthAge(DateUtil.getBabyMonthAge(babayPerson.getBirth(), new Date())); + } else { + result.setMonthAge(""); + } + for (BabyModel build : builds) { if (build == null || StringUtils.isEmpty(build.getHospitalId())) { continue;