From f8139eaceb3f292366e42e41eae760f547c38f71 Mon Sep 17 00:00:00 2001 From: liquanyu Date: Thu, 20 Sep 2018 15:18:35 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=86=E5=A8=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../operate/web/facade/MatDeliverFacade.java | 43 +++++++++++++++++----- 1 file changed, 33 insertions(+), 10 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 78f8c61..a86d88a 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 @@ -967,6 +967,19 @@ public class MatDeliverFacade { DateUtil.getYmd(DateUtil.parseYMD(deliverAddRequest.getDueDate())); babyModel.setPhoneId(phoneId + babyModel.getName()); } + + + PersonModel personModel = new PersonModel(); + personModel.setType(2); + + personModel.setBirth(DateUtil.parseYMD(baby.getDueTime())); + personModel.setModified(new Date()); + personModel.setPhone(babyModel.getMphone()); + personModel.setCardNo(babyModel.getMcertNo()); + personModel.setName(babyModel.getName()); + personModel.setCreated(new Date()); + babyModel.setPid(personService.addPerson(personModel).getId()); + //判断妊娠结局是活产才添加数据 if ((RenShenJieJuEnums.O.getId() + "").equals(baby.getPregnancyOut())) { //babyModel.setYn(YnEnums.YES.getId()); @@ -976,20 +989,30 @@ public class MatDeliverFacade { babyModel.setYn(YnEnums.NO.getId()); babyModel.setDataStatus(1); - PersonModel personModel = new PersonModel(); - personModel.setType(2); - personModel.setYn(YnEnums.YES.getId()); - personModel.setBirth(DateUtil.parseYMD(baby.getDueTime())); - personModel.setModified(new Date()); - personModel.setPhone(babyModel.getMphone()); - personModel.setCardNo(babyModel.getMcertNo()); - personModel.setName(babyModel.getName()); - personModel.setCreated(new Date()); - babyModel.setPid(personService.addPerson(personModel).getId()); +// PersonModel personModel = new PersonModel(); +// personModel.setType(2); +// personModel.setYn(YnEnums.YES.getId()); +// personModel.setBirth(DateUtil.parseYMD(baby.getDueTime())); +// personModel.setModified(new Date()); +// personModel.setPhone(babyModel.getMphone()); +// personModel.setCardNo(babyModel.getMcertNo()); +// personModel.setName(babyModel.getName()); +// personModel.setCreated(new Date()); +// babyModel.setPid(personService.addPerson(personModel).getId()); //add lqy start 2017-03-01 babyModel.setBlNo(baby.getBlNo()); babyModel.setBabyDiagnosis(baby.getBabyDiagnosis()); + personModel.setYn(YnEnums.YES.getId()); + } + else + { + personModel.setYn(YnEnums.NO.getId()); } + + + + + babyIds.add(babyService.addOneBaby(babyModel).getId()); baby1.setId(babyModel.getId()); -- 1.8.3.1