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();