Commit b13c93f071cf2c47a6837339634d24fd5f4e2fc8
1 parent
fb4c2d050c
Exists in
master
and in
1 other branch
修改新电子病历
Showing 1 changed file with 9 additions and 2 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java
View file @
b13c93f
| ... | ... | @@ -428,7 +428,7 @@ |
| 428 | 428 | referralApplyOrderQuery.setTransferredStart(DateUtil.parseYMD(str[0])); |
| 429 | 429 | } |
| 430 | 430 | if(str.length==2){ |
| 431 | - referralApplyOrderQuery.setTransferredEnd(new Date(DateUtil.parseYMD(str[1]).getTime()+86398000)); | |
| 431 | + referralApplyOrderQuery.setTransferredEnd(new Date(DateUtil.parseYMD(str[1]).getTime() + 86398000)); | |
| 432 | 432 | } |
| 433 | 433 | } |
| 434 | 434 | |
| 435 | 435 | |
| ... | ... | @@ -438,8 +438,15 @@ |
| 438 | 438 | referralApplyOrderQuery.setBirthStart(DateUtil.parseYMD(str[0])); |
| 439 | 439 | } |
| 440 | 440 | if(str.length==2){ |
| 441 | - referralApplyOrderQuery.setBirthEnd(new Date(DateUtil.parseYMD(str[1]).getTime()+86398000)); | |
| 441 | + referralApplyOrderQuery.setBirthEnd(new Date(DateUtil.parseYMD(str[1]).getTime() + 86398000)); | |
| 442 | 442 | } |
| 443 | + } | |
| 444 | + | |
| 445 | + if(StringUtils.isNotEmpty(applyOrderQueryRequest.getYlStart())){ | |
| 446 | + referralApplyOrderQuery.setBirthEnd(DateUtil.addMonth(new Date(), -NumberUtils.toInt(applyOrderQueryRequest.getYlStart()))); | |
| 447 | + } | |
| 448 | + if(StringUtils.isNotEmpty(applyOrderQueryRequest.getYlEnd())) { | |
| 449 | + referralApplyOrderQuery.setBirthStart(DateUtil.addMonth(new Date(), -NumberUtils.toInt(applyOrderQueryRequest.getYlEnd()))); | |
| 443 | 450 | } |
| 444 | 451 | |
| 445 | 452 | List<ReferralApplyOrderModel> orderModels = applyOrderService.queryReferralApplyOrderWithQuery(referralApplyOrderQuery); |