From ae28ce863d2609f813bbc98d35d75e14ebe70561 Mon Sep 17 00:00:00 2001 From: jiangjiazhi Date: Thu, 12 Jan 2017 10:48:54 +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 | 51 +++++++++++++--------- 1 file changed, 30 insertions(+), 21 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 f7e92b5..55620ab 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 @@ -437,27 +437,29 @@ public class MatDeliverFacade { List babyList = new ArrayList<>(); for (MatDeliverAddRequest.Baby baby : list) { MaternalDeliverModel.Baby babyModel = baby.convertToDataModel(); - //判断妊娠结局是活产才添加数据 - BabyModel babyModel1=new BabyModel(); - MatDeliverQuery query=new MatDeliverQuery(); - 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(); + if(com.lyms.platform.common.utils.StringUtils.isNotEmpty(babyModel.getId())){ + //判断妊娠结局是活产才添加数据 + BabyModel babyModel1=new BabyModel(); + BabyModelQuery query=new BabyModelQuery(); + query.setId(babyModel.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); } - babyModel1.setDueType(fmfs); - babyModel1.setBabyHeight(baby.getBabyHeight()); - babyModel1.setBabyWeight(baby.getBabyWeight()); - babyService.findAndModify(query.convertToQuery(), babyModel1); babyList.add(babyModel); } return babyList; @@ -679,7 +681,6 @@ public class MatDeliverFacade { } } - AntExQuery antExQuery = new AntExQuery(); antExQuery.setParentId(patients.getId()); antExQuery.setYn(YnEnums.YES.getId()); @@ -724,6 +725,14 @@ public class MatDeliverFacade { maternalDeliverModel.setYn(YnEnums.NO.getId()); maternalDeliverModel.setId(id); matDeliverService.updateOne(maternalDeliverModel, id); + //删除分娩记录的时候删除分娩的小孩信息 + BabyModelQuery babyModelQuery=new BabyModelQuery(); + babyModelQuery.setParentId(matModel.getParentId()); + babyModelQuery.setYn(YnEnums.YES.getId()); + + BabyModel babyModel=new BabyModel(); + babyModel.setYn(YnEnums.NO.getId()); + babyService.findAndModify(babyModelQuery.convertToQuery(),babyModel); return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功"); } return new BaseResponse().setErrorcode(ErrorCodeConstants.BUSINESS_ERROR).setErrormsg("不能删除该条数据"); -- 1.8.3.1