Commit 0494ff93ee1f78fe15299e28b550864f7fa66946

Authored by jiangjiazhi
1 parent 6a6fb8007e

修改新电子病历

Showing 1 changed file with 5 additions and 4 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java View file @ 0494ff9
... ... @@ -443,15 +443,16 @@
443 443 }
444 444  
445 445 if (StringUtils.isNotEmpty(applyOrderQueryRequest.getYlStart())) {
446   - /* Date currentDate = DateUtil.formatDate(new Date());
447   - Date start = DateUtil.addMonth(currentDate, -request.getMonthAgeStart());
  446 + Date currentDate = DateUtil.formatDate(new Date());
  447 + /* Date start = DateUtil.addMonth(currentDate, -request.getMonthAgeStart());
448 448 Date end = DateUtil.addMonth(currentDate, -request.getMonthAgeEnd()-1);*/
449   - Date date= DateUtil.addMonth(new Date(), -NumberUtils.toInt(applyOrderQueryRequest.getYlStart()) - 1);
  449 + Date date= DateUtil.addMonth(currentDate, -NumberUtils.toInt(applyOrderQueryRequest.getYlStart()) - 1);
450 450 date=DateUtil.addDay(date,-1);
451 451 referralApplyOrderQuery.setBirthEnd(date);
452 452 }
453 453 if (StringUtils.isNotEmpty(applyOrderQueryRequest.getYlEnd())) {
454   - referralApplyOrderQuery.setBirthStart(DateUtil.addMonth(new Date(), -NumberUtils.toInt(applyOrderQueryRequest.getYlEnd())));
  454 + Date currentDate = DateUtil.formatDate(new Date());
  455 + referralApplyOrderQuery.setBirthStart(DateUtil.addMonth(currentDate, -NumberUtils.toInt(applyOrderQueryRequest.getYlEnd())));
455 456 }
456 457  
457 458 List<ReferralApplyOrderModel> orderModels = applyOrderService.queryReferralApplyOrderWithQuery(referralApplyOrderQuery);