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 60469f1..699acc0 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 @@ -549,17 +549,18 @@ public class ApplyOrderFacade { public BaseListResponse queryApplyOrder(ApplyOrderQueryRequest applyOrderQueryRequest, Integer userId) { ReferralApplyOrderQuery referralApplyOrderQuery = new ReferralApplyOrderQuery(); referralApplyOrderQuery.setName(applyOrderQueryRequest.getName()); + Date currentDate = DateUtil.formatDate(new Date()); //根据年龄 if (null != applyOrderQueryRequest.getEndAge()) { - Date date = DateUtil.addYear(new Date(), -applyOrderQueryRequest.getEndAge()); + Date date = DateUtil.addYear(currentDate, -applyOrderQueryRequest.getEndAge()); referralApplyOrderQuery.setBirthStart(date); } + if (null != applyOrderQueryRequest.getStartAge()) { - Date date = DateUtil.addYear(new Date(), -applyOrderQueryRequest.getStartAge()); + Date date = DateUtil.addYear(currentDate, -applyOrderQueryRequest.getStartAge()); referralApplyOrderQuery.setBirthEnd(date); } //根据孕周 - Date currentDate = DateUtil.formatDate(new Date()); if (null != applyOrderQueryRequest.getEndDueWeek() && NumberUtils.isNumber(applyOrderQueryRequest.getEndDueWeek())) { Date end= DateUtil.addDay(DateUtil.addWeek(currentDate, NumberUtils.toInt(applyOrderQueryRequest.getEndDueWeek())), 6); referralApplyOrderQuery.setDueDateEnd(end);