diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java index d1e939c..283488d 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BabyBookbuildingFacade.java @@ -1710,6 +1710,14 @@ public class BabyBookbuildingFacade { babyQuery.setBirthStart(DateUtil.parseYMD(dates[0])); babyQuery.setBirthEnd(DateUtil.parseYMD(dates[1])); } + else if (request.getMonthAgeStart() != null && request.getMonthAgeEnd() != null) + { + Date start = DateUtil.addMonth(currentDate, -request.getMonthAgeStart()); + babyQuery.setBirthEnd(start); + + Date end = DateUtil.addDay(DateUtil.addMonth(currentDate, -request.getMonthAgeEnd() - 1), 1); + babyQuery.setBirthStart(end); + } else if (request.getMonthAgeStart() != null) { Date start = DateUtil.addMonth(currentDate, -request.getMonthAgeStart());