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 b71e29f..348a3c7 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 @@ -2,6 +2,7 @@ package com.lyms.platform.operate.web.facade; import com.lyms.platform.biz.service.*; import com.lyms.platform.common.constants.ErrorCodeConstants; +import com.lyms.platform.common.constants.TimeConstants; import com.lyms.platform.common.enums.*; import com.lyms.platform.common.result.BaseObjectResponse; import com.lyms.platform.common.result.BaseResponse; @@ -265,7 +266,8 @@ public class MatDeliverFacade { Patients pa=patientsService.findOnePatientById(deliverAddRequest.getParentId()); patientCheckTicketQuery.setStatus(1); patientCheckTicketQuery.setCreatedStart(pa.getLastMenses()); - patientCheckTicketQuery.setCreatedEnd(pa.getFmDate()); + //分娩时间加一天 因为产检劵创建时间是具体到分,分娩时间只到日期 + patientCheckTicketQuery.setCreatedEnd(new Date(pa.getFmDate().getTime()+ 86398000)); patientCheckTicketQuery.setPid(pa.getPid()); PatientCheckTicket patientCheckTicket=new PatientCheckTicket(); patientCheckTicket.setStatus(3); @@ -324,28 +326,33 @@ 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.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.setParentId(deliverAddRequest.getParentId()); + query.setId(babyModel.getId()); + + 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); } - babyModel1.setDueType(fmfs); - babyModel1.setBabyHeight(baby.getBabyHeight()); - babyModel1.setBabyWeight(baby.getBabyWeight()); - babyService.findAndModify(query.convertToQuery(), babyModel1); - babyList.add(babyModel); } maternalDeliverModel.setBaby(babyList); }