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 70418fb..69aebc8 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 @@ -828,7 +828,7 @@ public class AntenatalExaminationFacade { } else if (null != date) { antExQuery.setEnd(date); } - List list = antenatalExaminationService.queryAntenatalExamination(antExQuery.convertToQuery().addOrder(Sort.Direction.DESC, "checkDate")); + List list = antenatalExaminationService.queryAntenatalExamination(antExQuery.convertToQuery().addOrder(Sort.Direction.DESC, "checkDate").addOrder(Sort.Direction.DESC,"created")); HighScoreResult highScoreResult = new HighScoreResult(); boolean next = true; if (CollectionUtils.isNotEmpty(list)) { @@ -1467,12 +1467,12 @@ public class AntenatalExaminationFacade { //初诊记录 AntExChuQuery antExChuQuery = new AntExChuQuery(); antExChuQuery.setYn(YnEnums.YES.getId()); - antExChuQuery.setStart(patients.getBookbuildingDate()); - if (null == patients.getFmDate()) { - antExChuQuery.setEnd(new Date(DateUtil.addWeek(patients.getLastMenses(), 42).getTime() + 86398000)); - } else { - antExChuQuery.setEnd(new Date(patients.getFmDate().getTime() + 86398000)); - } + // antExChuQuery.setStart(patients.getBookbuildingDate()); + // if (null == patients.getFmDate()) { + // antExChuQuery.setEnd(new Date(DateUtil.addWeek(patients.getLastMenses(), 42).getTime() + 86398000)); + // } else { + // antExChuQuery.setEnd(new Date(patients.getFmDate().getTime() + 86398000)); + // } if (patients2 != null) { antExChuQuery.setParentIds(Arrays.asList(patientId, patients2.getId())); } else { @@ -1491,12 +1491,12 @@ public class AntenatalExaminationFacade { //复诊记录 AntExQuery antExQuery = new AntExQuery(); antExQuery.setYn(YnEnums.YES.getId()); - antExQuery.setStart(patients.getBookbuildingDate()); - if (null == patients.getFmDate()) { - antExQuery.setEnd(new Date(DateUtil.addWeek(patients.getLastMenses(), 42).getTime() + 86398000)); - } else { - antExQuery.setEnd(new Date(patients.getFmDate().getTime() + 86398000)); - } + // antExQuery.setStart(patients.getBookbuildingDate()); + // if (null == patients.getFmDate()) { + // antExQuery.setEnd(new Date(DateUtil.addWeek(patients.getLastMenses(), 42).getTime() + 86398000)); + // } else { + // antExQuery.setEnd(new Date(patients.getFmDate().getTime() + 86398000)); + // } if (patients2 != null) { antExQuery.setParentIds(Arrays.asList(patientId, patients2.getId())); } else {