diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java index 78550cd..79a23f7 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java @@ -81,21 +81,22 @@ public class MatDeliverFacade { } } for (MatDeliverAddRequest.Baby baby : list) { + + BabyModel babyModel = baby.convertToDataModel(); + babyModel.setParentId(parentId); + babyModel.setName(userName + (babyModel.getSex() == 1 ? "之子" : "之女")); + babyModel.setYn(YnEnums.NO.getId()); //判断妊娠结局是活产才添加数据 if ((RenShenJieJuEnums.O.getId() + "").equals(baby.getPregnancyOut())) { - BabyModel babyModel = baby.convertToDataModel(); - babyModel.setParentId(parentId); - babyModel.setName(userName + (babyModel.getSex() == 1 ? "之子" : "之女")); babyModel.setYn(YnEnums.YES.getId()); - PersonModel personModel = new PersonModel(); personModel.setType(2); personModel.setYn(YnEnums.YES.getId()); personModel.setBirth(DateUtil.parseYMD(deliverAddRequest.getDueDate())); personModel.setModified(new Date()); babyModel.setPid(personService.addPerson(personModel).getId()); - babyIds.add(babyService.addOneBaby(babyModel).getId()); } + babyIds.add(babyService.addOneBaby(babyModel).getId()); } } List list1 = autoMatchFacade.matchOrgId(userId);