From e56a00f8fe581f7b4b157c6a05c821f48960dc5a Mon Sep 17 00:00:00 2001 From: liquanyu Date: Fri, 7 Aug 2020 10:20:05 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E6=83=A0=E5=8A=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../operate/web/facade/AntenatalExaminationFacade.java | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 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 910cb31..f0e3710 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 @@ -3517,9 +3517,11 @@ public class AntenatalExaminationFacade { antExChuQuery.setParentId(patients.getId()); } - } else if (StringUtils.isNotEmpty(queryRequest.getCardNo()) && StringUtils.isNotEmpty(queryRequest.getCoupon())) { - antExChuQuery.setParentId(patients.getId()); +// } else if (StringUtils.isNotEmpty(queryRequest.getCardNo()) && StringUtils.isNotEmpty(queryRequest.getCoupon())) { +// antExChuQuery.setParentId(patients.getId()); } else { + antExChuQuery.setCreatedTimeStart(patients.getLastMenses()); + antExChuQuery.setCreatedTimeEnd(DateUtil.addWeek(patients.getLastMenses(),42)); antExChuQuery.setPid(patients.getPid()); } @@ -3548,9 +3550,11 @@ public class AntenatalExaminationFacade { } else { antExQuery.setParentId(patients.getId()); } - } else if (StringUtils.isNotEmpty(queryRequest.getCardNo()) && StringUtils.isNotEmpty(queryRequest.getCoupon())) { - antExQuery.setParentId(patients.getId()); +// } else if (StringUtils.isNotEmpty(queryRequest.getCardNo()) && StringUtils.isNotEmpty(queryRequest.getCoupon())) { +// antExQuery.setParentId(patients.getId()); } else { + antExQuery.setCreatedTimeStart(patients.getLastMenses()); + antExQuery.setCreatedTimeEnd(DateUtil.addWeek(patients.getLastMenses(), 42)); antExQuery.setPid(patients.getPid()); } -- 1.8.3.1