From 427ad52f9fdd699226b67facb7817a4a86b1bc44 Mon Sep 17 00:00:00 2001 From: hujiaqi Date: Thu, 5 Jan 2017 17:56:40 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E7=94=9F=E5=84=BFbug=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../operate/web/facade/MatDeliverFacade.java | 30 +++++++++++++++++++++- 1 file changed, 29 insertions(+), 1 deletion(-) 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 f209e1f..fb4df1a 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 @@ -284,19 +284,47 @@ public class MatDeliverFacade { //获取到小孩信息 List list = deliverAddRequest.getBabies(); //修改小孩信息 + // 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); + // } 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()); + query.setId(deliverAddRequest.getId()); babyModel1.setParentId(deliverAddRequest.getParentId()); if ((RenShenJieJuEnums.O.getId() + "").equals(baby.getPregnancyOut())) { babyModel1.setYn(YnEnums.YES.getId()); }else{ babyModel1.setYn(YnEnums.NO.getId()); } + babyModel1.setBirth(DateUtil.parseYMD(baby.getDueTime())); + babyModel1.setSex(Integer.valueOf(baby.getBabyGender())); + Map map = deliverAddRequest.getDeliveryMode(); + String fmfs = null; + if (!map.isEmpty()) { + fmfs = map.get("fmfs").toString(); + } + babyModel1.setDueType(fmfs); + babyModel1.setBabyHeight(baby.getBabyHeight()); + babyModel1.setBabyWeight(baby.getBabyWeight()); babyService.findAndModify(query.convertToQuery(), babyModel1); babyList.add(babyModel); } -- 1.8.3.1