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()); }