From d4bb649f150c9f6ebc0747a6bbcf0c42313c9c18 Mon Sep 17 00:00:00 2001 From: yangfei Date: Tue, 29 May 2018 15:46:48 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BA=A7=E5=89=8D=E6=A3=80=E6=9F=A5=EF=BC=8C?= =?UTF-8?q?=E5=86=97=E4=BD=99=E9=AB=98=E5=8D=B1=E5=9B=A0=E6=95=B0=E5=88=B0?= =?UTF-8?q?patient?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/facade/AntenatalExaminationFacade.java | 26 +++++++++++----------- 1 file changed, 13 insertions(+), 13 deletions(-) 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 { -- 1.8.3.1