From e1504baed2381fc4a9bb4bc3380e3d3da848cb15 Mon Sep 17 00:00:00 2001 From: jiangjiazhi Date: Fri, 13 Jan 2017 14:32:06 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=86=E5=A8=A9=E4=BD=9C=E5=BA=9F=E4=BA=A7?= =?UTF-8?q?=E6=A3=80=E5=8A=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../operate/web/facade/MatDeliverFacade.java | 24 ++++++++++++++++++++-- 1 file changed, 22 insertions(+), 2 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 7dc0e6d..1eaaffe 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 @@ -283,8 +283,7 @@ public class MatDeliverFacade { List list = deliverAddRequest.getBabies(); //修改小孩信息 if (CollectionUtils.isNotEmpty(list)) { - maternalDeliverModel.setBaby(updateBaby(deliverAddRequest,list,patients2.getLastMenses() - )); + maternalDeliverModel.setBaby(updateBaby(deliverAddRequest,list,patients2.getLastMenses())); } matDeliverService.updateOne(maternalDeliverModel, maternalDeliverModel.getId()); @@ -478,6 +477,27 @@ public class MatDeliverFacade { } babyModel1.setBabyHeight(baby.getBabyHeight()); babyModel1.setBabyWeight(baby.getBabyWeight()); + + babyModel1.setDeliverOrg(deliverAddRequest.getFmHospital()); + babyModel1.setBirth(DateUtil.parseYMDHM(baby.getDueTime())); + + babyModel1.setDueType(fmfs); + babyModel1.setVisitstatus(VisitStatusEnums.UNVISIT.getId()); + babyModel1.setAsphyxiaM(baby.getAsphyxiaM()); + babyModel1.setFetusCount(deliverAddRequest.getTireNumber() + ""); + if (null != baby.getBabyGender()) { + babyModel1.setSex(Integer.valueOf(baby.getBabyGender())); + } + + babyModel1.setApgarScore(JsonUtil.obj2JsonString(baby.getApgarScore())); + babyModel1.setBabyHealthy(baby.getBabyHealthy()); + babyModel1.setBabyWeight(com.lyms.platform.common.utils.StringUtils.cutBabyWeight(baby.getBabyWeight())); + babyModel1.setBabyHeight(baby.getBabyHeight()); + babyModel1.setMalformation(baby.getDeformity()); + babyModel1.setPregnancyOut(baby.getPregnancyOut()); + babyModel1.setContactM(baby.getContactM()); + babyModel1.setContactStartM(baby.getContactStartM()); + babyModel1.setEarlySuck(baby.getEarlySuck()); babyService.findAndModify(query.convertToQuery(), babyModel1); } babyList.add(babyModel); -- 1.8.3.1