From 1a6642fc60079e186fd00ae4aff5588a85b4958f Mon Sep 17 00:00:00 2001 From: jiangjiazhi Date: Mon, 26 Dec 2016 10:07:30 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=A7=E6=A3=80=E5=88=A0?= =?UTF-8?q?=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../lyms/platform/operate/web/facade/MatDeliverFacade.java | 12 ++++++++++++ 1 file changed, 12 insertions(+) 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 6e67d23..e710b6f 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 @@ -286,12 +286,24 @@ public class MatDeliverFacade { if (CollectionUtils.isNotEmpty(list)) { for (MatDeliverAddRequest.Baby baby : list) { MaternalDeliverModel.Baby babyModel = baby.convertToDataModel(); + //判断妊娠结局是活产才添加数据 + BabyModel babyModel1=new BabyModel(); + MatDeliverQuery query=new MatDeliverQuery(); + query.setParentId(deliverAddRequest.getParentId()); + babyModel1.setParentId(deliverAddRequest.getParentId()); + if ((RenShenJieJuEnums.O.getId() + "").equals(baby.getPregnancyOut())) { + babyModel1.setYn(YnEnums.YES.getId()); + }else{ + babyModel1.setYn(YnEnums.NO.getId()); + } + babyService.findAndModify(query.convertToQuery(), babyModel1); babyList.add(babyModel); } maternalDeliverModel.setBaby(babyList); } matDeliverService.updateOne(maternalDeliverModel, maternalDeliverModel.getId()); + if (null != deliverAddRequest.getDueDate()) { Date fmDate = DateUtil.parseYMD(deliverAddRequest.getDueDate()); PatientsQuery patientsQuery = new PatientsQuery(); -- 1.8.3.1