diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java index 3227fca..08ed1d4 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java @@ -2128,11 +2128,18 @@ public class AntenatalExaminationFacade { stopPregQuery.setPid(patients.getPid()); stopPregQuery.setYn(YnEnums.YES.getId()); + + //查询终止妊娠 List list2 = stopPregnancyService.queryStopPreg(stopPregQuery); - + //已经分娩的产程 + Patients fmPatient = findOnePatient(queryRequest.getCardNo(), queryRequest.getVcCardNo(), null, currentGroupHospital, 3, false, null, og.getbStatus() == 1); List sortList = new ArrayList<>(); + if(fmPatient!=null){ + fmPatient.setBookbuildingDate(fmPatient.getFmDate()); + sortList.add(new SortIn(fmPatient)); + } if (CollectionUtils.isNotEmpty(list1)) { for (MaternalDeliverModel model : list1) { sortList.add(new SortIn(model));