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 0287a85..df3fb38 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 @@ -1163,7 +1163,13 @@ public class AntenatalExaminationFacade { } antExQuery.setId(null); list = antenatalExaminationService.queryAntenatalExamination(antExQuery.convertToQuery()); - + if(CollectionUtils.isNotEmpty(list)){ + for(int i=0;i list = antenatalExaminationService.queryAntExChu(antExQuery); + + //TODO 需要根据时间去查询是否是本院最后一条记录 + if (CollectionUtils.isNotEmpty(list)) { + antExQuery.setStart(new Date(list.get(0).getCheckTime().getTime() + 40000)); + } + + antExQuery.setId(null); + + list = antenatalExaminationService.queryAntExChu(antExQuery); + + if(CollectionUtils.isNotEmpty(list)){ + for(int i=0;i