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 98a1842..1f75983 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 @@ -1050,7 +1050,6 @@ public class AntenatalExaminationFacade { listData.add(new AntData(patients, null != organization ? organization.getName() : "")); } - if (null == dueDate && null != patients.getFmDate()) { dueDate = patients.getFmDate(); } @@ -1113,35 +1112,60 @@ public class AntenatalExaminationFacade { listData.add(new AntData((MaternalDeliverModel) obj, patientses.get(0).getLastMenses(), null != organization ? organization.getName() : "")); } } - - PostReviewQuery postReviewQuery = new PostReviewQuery(); - if (list.size() - 1 > i) { - postReviewQuery.setStart(dueDate); - if (CollectionUtils.isNotEmpty(listDate)) { - //下次建档记录前都是产后复查,如果没有下个产程的数据就直接显示 - if (listDate.size() > 1 && i > 1) { - postReviewQuery.setEnd(listDate.get(i - 1).getDate()); + //终止妊娠的情况 + if(null!=patients.getDueStatus()&&1==patients.getDueStatus()){ + StopPregQuery stopPregQuery=new StopPregQuery(); + stopPregQuery.setYn(YnEnums.YES.getId()); + stopPregQuery.setPid(pid); + if (list.size() - 1 > i) { + stopPregQuery.setStopDateStart(dueDate); + if (CollectionUtils.isNotEmpty(listDate)) { + //下次建档记录前都是产后复查,如果没有下个产程的数据就直接显示 + if (listDate.size() > 1 && i > 1) { + stopPregQuery.setStopDateEnd(listDate.get(i - 1).getDate()); + } } } - } - postReviewQuery.setYn(YnEnums.YES.getId()); - postReviewQuery.setPid(pid); + List models =stopPregnancyService.queryStopPreg(stopPregQuery); + if(CollectionUtils.isNotEmpty(models)){ + for(StopPregModel stop:models){ + if (null != stop.getHospitalId()) { + organization = organizationService.getOrganization(Integer.valueOf(stop.getHospitalId())); + } + listData.add(new AntData(stop, patients.getLastMenses() , null != organization ? organization.getName() : "")); + } + } + }else{ + PostReviewQuery postReviewQuery = new PostReviewQuery(); + if (list.size() - 1 > i) { + postReviewQuery.setStart(dueDate); + if (CollectionUtils.isNotEmpty(listDate)) { + //下次建档记录前都是产后复查,如果没有下个产程的数据就直接显示 + if (listDate.size() > 1 && i > 1) { + postReviewQuery.setEnd(listDate.get(i - 1).getDate()); + } + } + } + postReviewQuery.setYn(YnEnums.YES.getId()); + postReviewQuery.setPid(pid); - //产后复查记录 - List reviewModels = postReviewService.findWithList(postReviewQuery); - if (CollectionUtils.isNotEmpty(reviewModels)) { - if (CollectionUtils.isNotEmpty(listData)) { - for (PostReviewModel postReviewModel : reviewModels) { - if (postReviewModel.getYn() == YnEnums.YES.getId()) { - if (null != postReviewModel.getHospitalId()) { - organization = organizationService.getOrganization(Integer.valueOf(postReviewModel.getHospitalId())); - } + //产后复查记录 + List reviewModels = postReviewService.findWithList(postReviewQuery); + if (CollectionUtils.isNotEmpty(reviewModels)) { + if (CollectionUtils.isNotEmpty(listData)) { + for (PostReviewModel postReviewModel : reviewModels) { + if (postReviewModel.getYn() == YnEnums.YES.getId()) { + if (null != postReviewModel.getHospitalId()) { + organization = organizationService.getOrganization(Integer.valueOf(postReviewModel.getHospitalId())); + } - listData.add(new AntData(postReviewModel, null != organization ? organization.getName() : "", dueDate)); + listData.add(new AntData(postReviewModel, null != organization ? organization.getName() : "", dueDate)); + } } } } } + iterator.remove(); if (CollectionUtils.isNotEmpty(listData)) { sort(listData);