Commit c0c1c61b6ad0f901b6ca866b24cb2938e16be05b
1 parent
f9ea3fb9f4
Exists in
master
and in
8 other branches
修改新电子病历
Showing 1 changed file with 11 additions and 4 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java
View file @
c0c1c61
| ... | ... | @@ -471,13 +471,20 @@ |
| 471 | 471 | Date currentDate = DateUtil.formatDate(new Date()); |
| 472 | 472 | if (StringUtils.isNotEmpty(applyOrderQueryRequest.getYlStart())) { |
| 473 | 473 | /* Date start = DateUtil.addMonth(currentDate, -request.getMonthAgeStart()); |
| 474 | - Date end = DateUtil.addMonth(currentDate, -request.getMonthAgeEnd()-1);*/ | |
| 475 | - Date date= DateUtil.addMonth(currentDate, -NumberUtils.toInt(applyOrderQueryRequest.getYlStart()) - 1); | |
| 476 | - date=DateUtil.addDay(date,1); | |
| 474 | + Date end = DateUtil.addMonth(currentDate, -request.getMonthAgeEnd()-1); | |
| 475 | + | |
| 476 | + | |
| 477 | + Date currentDate = DateUtil.formatDate(new Date()); | |
| 478 | + Date start = DateUtil.addMonth(currentDate, -request.getMonthAgeStart()); | |
| 479 | + Date end = DateUtil.addDay(DateUtil.addMonth(currentDate, -request.getMonthAgeEnd() - 1),1); | |
| 480 | + babyQuery.setBirthStart(end); | |
| 481 | + babyQuery.setBirthEnd(start);*/ | |
| 482 | + Date date= DateUtil.addMonth(currentDate, -NumberUtils.toInt(applyOrderQueryRequest.getYlStart())); | |
| 483 | + | |
| 477 | 484 | referralApplyOrderQuery.setBirthEnd(date); |
| 478 | 485 | } |
| 479 | 486 | if (StringUtils.isNotEmpty(applyOrderQueryRequest.getYlEnd())) { |
| 480 | - referralApplyOrderQuery.setBirthStart(DateUtil.addMonth(currentDate, -NumberUtils.toInt(applyOrderQueryRequest.getYlEnd()))); | |
| 487 | + referralApplyOrderQuery.setBirthStart(DateUtil.addDay(DateUtil.addMonth(currentDate, -NumberUtils.toInt(applyOrderQueryRequest.getYlEnd())),1)); | |
| 481 | 488 | } |
| 482 | 489 | |
| 483 | 490 | List<ReferralApplyOrderModel> orderModels = applyOrderService.queryReferralApplyOrderWithQuery(referralApplyOrderQuery); |