diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java index 8167680..477f066 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java @@ -471,13 +471,20 @@ public class ApplyOrderFacade { Date currentDate = DateUtil.formatDate(new Date()); if (StringUtils.isNotEmpty(applyOrderQueryRequest.getYlStart())) { /* Date start = DateUtil.addMonth(currentDate, -request.getMonthAgeStart()); - Date end = DateUtil.addMonth(currentDate, -request.getMonthAgeEnd()-1);*/ - Date date= DateUtil.addMonth(currentDate, -NumberUtils.toInt(applyOrderQueryRequest.getYlStart()) - 1); - date=DateUtil.addDay(date,1); + Date end = DateUtil.addMonth(currentDate, -request.getMonthAgeEnd()-1); + + + Date currentDate = DateUtil.formatDate(new Date()); + Date start = DateUtil.addMonth(currentDate, -request.getMonthAgeStart()); + Date end = DateUtil.addDay(DateUtil.addMonth(currentDate, -request.getMonthAgeEnd() - 1),1); + babyQuery.setBirthStart(end); + babyQuery.setBirthEnd(start);*/ + Date date= DateUtil.addMonth(currentDate, -NumberUtils.toInt(applyOrderQueryRequest.getYlStart())); + referralApplyOrderQuery.setBirthEnd(date); } if (StringUtils.isNotEmpty(applyOrderQueryRequest.getYlEnd())) { - referralApplyOrderQuery.setBirthStart(DateUtil.addMonth(currentDate, -NumberUtils.toInt(applyOrderQueryRequest.getYlEnd()))); + referralApplyOrderQuery.setBirthStart(DateUtil.addDay(DateUtil.addMonth(currentDate, -NumberUtils.toInt(applyOrderQueryRequest.getYlEnd())),1)); } List orderModels = applyOrderService.queryReferralApplyOrderWithQuery(referralApplyOrderQuery);