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 fc8c4c2..c36f30a 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 @@ -436,8 +436,8 @@ public class AntenatalExaminationFacade { //初诊记录 AntExChuQuery antExChuQuery = new AntExChuQuery(); antExChuQuery.setYn(YnEnums.YES.getId()); -// antExChuQuery.setStart(patients.getBookbuildingDate()); -// antExChuQuery.setEnd(new Date(date.getTime() + 86398000)); + antExChuQuery.setStart(patients.getBookbuildingDate()); + antExChuQuery.setEnd(new Date(date.getTime() + 86398000)); antExChuQuery.setParentId(patients.getId()); List antExChuModels = antenatalExaminationService.queryAntExChu(antExChuQuery); if (CollectionUtils.isNotEmpty(antExChuModels)) { @@ -453,8 +453,8 @@ public class AntenatalExaminationFacade { AntExQuery antExQuery = new AntExQuery(); antExQuery.setYn(YnEnums.YES.getId()); antExQuery.setParentId(patients.getId()); -// antExQuery.setStart(patients.getBookbuildingDate()); -// antExQuery.setEnd(new Date(date.getTime() + 86398000)); + antExQuery.setStart(patients.getBookbuildingDate()); + antExQuery.setEnd(new Date(date.getTime() + 86398000)); List list1 = antenatalExaminationService.queryAntenatalExamination(antExQuery.convertToQuery()); if (CollectionUtils.isNotEmpty(list1)) { for (AntenatalExaminationModel an : list1) { @@ -470,7 +470,7 @@ public class AntenatalExaminationFacade { postReviewQuery.setStart(date); //下次建档记录前都是产后复查,如果没有下个产程的数据就直接显示 // postReviewQuery.setEnd(list.size() - 1 > i ? list.get(i).getCreated() :null/* new Date()*/); - postReviewQuery.setEnd(list.get(i).getCreated()); + postReviewQuery.setEnd(list.get(i).getBookbuildingDate()); } } postReviewQuery.setParentId(patients.getId());