From 7e64302c19057c0d1738405ea4df1032bcb7d3d7 Mon Sep 17 00:00:00 2001 From: jiangjiazhi Date: Wed, 27 Jul 2016 17:25:30 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=98=AF=E5=90=A6=E9=80=9A?= =?UTF-8?q?=E7=9F=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../lyms/platform/operate/web/facade/MatDeliverFacade.java | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) 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); -- 1.8.3.1