From f83f12f13c5aabec472cc3d4497077ca6527b0fc Mon Sep 17 00:00:00 2001 From: jiangjiazhi Date: Wed, 11 Jan 2017 17:12:27 +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 | 96 +++++++++------------- 1 file changed, 41 insertions(+), 55 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 099badb..2e7f977 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 @@ -235,21 +235,13 @@ public class MatDeliverFacade { if (CollectionUtils.isEmpty(babyModels)) { handBaby(deliverAddRequest, babyList, maternalDeliverModel, list, babyIds, parentId, userName, patients1, hospitalId); } else { - List babies = new ArrayList<>(); - for (BabyModel babyModel : babyModels) { - MaternalDeliverModel.Baby baby1 = new MaternalDeliverModel.Baby(babyModel); - babies.add(baby1); - } - maternalDeliverModel.setBaby(babies); + maternalDeliverModel.setBaby(updateBaby(deliverAddRequest,list)); } } maternalDeliverModel.setHospitalId(hospitalId); //做分娩的时候需要删除产筛数据 - /* SieveQuery sieveQuery = new SieveQuery(); - sieveQuery.setParentId(deliverAddRequest.getParentId()); - sieveQuery.setYn(YnEnums.YES.getId()); - sieveQuery.setHospitalId(hospitalId);*/ + sieveService.deleteSieve(deliverAddRequest.getParentId(), hospitalId, null); maternalDeliverModel.setYn(YnEnums.YES.getId()); @@ -286,51 +278,8 @@ 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.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); - } - maternalDeliverModel.setBaby(babyList); + maternalDeliverModel.setBaby(updateBaby(deliverAddRequest,list)); } matDeliverService.updateOne(maternalDeliverModel, maternalDeliverModel.getId()); @@ -473,6 +422,43 @@ public class MatDeliverFacade { } } + /** + * 处理儿童变更 + * + * @param deliverAddRequest + * @param list + * @return + */ + private List updateBaby(MatDeliverAddRequest deliverAddRequest,List list ){ + 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(); + } + babyModel1.setDueType(fmfs); + babyModel1.setBabyHeight(baby.getBabyHeight()); + babyModel1.setBabyWeight(baby.getBabyWeight()); + babyService.findAndModify(query.convertToQuery(), babyModel1); + babyList.add(babyModel); + } + return babyList; + } + /** * 处理儿童 @@ -1599,7 +1585,7 @@ public class MatDeliverFacade { } } map.put("oRiskFactor",riskFactor); - map.put("riskLevel", FunvCommonUtil.getBaseicConfigByid(patients.getRiskLevelId(),basicConfigService)); + map.put("riskLevel", FunvCommonUtil.getBaseicConfigByid(patients.getRiskLevelId(), basicConfigService)); map.put("riskScore",patients.getRiskScore()); map.put("deliveryDate", data.getDueDate()); -- 1.8.3.1