Commit e56a00f8fe581f7b4b157c6a05c821f48960dc5a
1 parent
c7bd641e02
Exists in
master
and in
6 other branches
优惠劵
Showing 1 changed file with 8 additions and 4 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntenatalExaminationFacade.java
View file @
e56a00f
| ... | ... | @@ -3517,9 +3517,11 @@ |
| 3517 | 3517 | antExChuQuery.setParentId(patients.getId()); |
| 3518 | 3518 | } |
| 3519 | 3519 | |
| 3520 | - } else if (StringUtils.isNotEmpty(queryRequest.getCardNo()) && StringUtils.isNotEmpty(queryRequest.getCoupon())) { | |
| 3521 | - antExChuQuery.setParentId(patients.getId()); | |
| 3520 | +// } else if (StringUtils.isNotEmpty(queryRequest.getCardNo()) && StringUtils.isNotEmpty(queryRequest.getCoupon())) { | |
| 3521 | +// antExChuQuery.setParentId(patients.getId()); | |
| 3522 | 3522 | } else { |
| 3523 | + antExChuQuery.setCreatedTimeStart(patients.getLastMenses()); | |
| 3524 | + antExChuQuery.setCreatedTimeEnd(DateUtil.addWeek(patients.getLastMenses(),42)); | |
| 3523 | 3525 | antExChuQuery.setPid(patients.getPid()); |
| 3524 | 3526 | } |
| 3525 | 3527 | |
| 3526 | 3528 | |
| ... | ... | @@ -3548,9 +3550,11 @@ |
| 3548 | 3550 | } else { |
| 3549 | 3551 | antExQuery.setParentId(patients.getId()); |
| 3550 | 3552 | } |
| 3551 | - } else if (StringUtils.isNotEmpty(queryRequest.getCardNo()) && StringUtils.isNotEmpty(queryRequest.getCoupon())) { | |
| 3552 | - antExQuery.setParentId(patients.getId()); | |
| 3553 | +// } else if (StringUtils.isNotEmpty(queryRequest.getCardNo()) && StringUtils.isNotEmpty(queryRequest.getCoupon())) { | |
| 3554 | +// antExQuery.setParentId(patients.getId()); | |
| 3553 | 3555 | } else { |
| 3556 | + antExQuery.setCreatedTimeStart(patients.getLastMenses()); | |
| 3557 | + antExQuery.setCreatedTimeEnd(DateUtil.addWeek(patients.getLastMenses(), 42)); | |
| 3554 | 3558 | antExQuery.setPid(patients.getPid()); |
| 3555 | 3559 | } |
| 3556 | 3560 |