Commit 8eb13dee05c3c394928af57880b7edd76dd73006
1 parent
47fd4816a5
Exists in
master
and in
8 other branches
修改新电子病历
Showing 1 changed file with 4 additions and 3 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java
View file @
8eb13de
| ... | ... | @@ -549,17 +549,18 @@ |
| 549 | 549 | public BaseListResponse queryApplyOrder(ApplyOrderQueryRequest applyOrderQueryRequest, Integer userId) { |
| 550 | 550 | ReferralApplyOrderQuery referralApplyOrderQuery = new ReferralApplyOrderQuery(); |
| 551 | 551 | referralApplyOrderQuery.setName(applyOrderQueryRequest.getName()); |
| 552 | + Date currentDate = DateUtil.formatDate(new Date()); | |
| 552 | 553 | //根据年龄 |
| 553 | 554 | if (null != applyOrderQueryRequest.getEndAge()) { |
| 554 | - Date date = DateUtil.addYear(new Date(), -applyOrderQueryRequest.getEndAge()); | |
| 555 | + Date date = DateUtil.addYear(currentDate, -applyOrderQueryRequest.getEndAge()); | |
| 555 | 556 | referralApplyOrderQuery.setBirthStart(date); |
| 556 | 557 | } |
| 558 | + | |
| 557 | 559 | if (null != applyOrderQueryRequest.getStartAge()) { |
| 558 | - Date date = DateUtil.addYear(new Date(), -applyOrderQueryRequest.getStartAge()); | |
| 560 | + Date date = DateUtil.addYear(currentDate, -applyOrderQueryRequest.getStartAge()); | |
| 559 | 561 | referralApplyOrderQuery.setBirthEnd(date); |
| 560 | 562 | } |
| 561 | 563 | //根据孕周 |
| 562 | - Date currentDate = DateUtil.formatDate(new Date()); | |
| 563 | 564 | if (null != applyOrderQueryRequest.getEndDueWeek() && NumberUtils.isNumber(applyOrderQueryRequest.getEndDueWeek())) { |
| 564 | 565 | Date end= DateUtil.addDay(DateUtil.addWeek(currentDate, NumberUtils.toInt(applyOrderQueryRequest.getEndDueWeek())), 6); |
| 565 | 566 | referralApplyOrderQuery.setDueDateEnd(end); |