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 5565bca..bf496f5 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 @@ -1622,13 +1622,14 @@ public class BabyBookbuildingFacade { babyQuery.setCardNo(request.getBcardNo()); babyQuery.setName(request.getName()); babyQuery.setMphone(request.getMphone()); - if (request.getMonthAgeStart() != null && request.getMonthAgeEnd() != null) { - - Date currentDate = DateUtil.formatDate(new Date()); + Date currentDate = DateUtil.formatDate(new Date()); + if (request.getMonthAgeStart() != null) { Date start = DateUtil.addMonth(currentDate, -request.getMonthAgeStart()); + babyQuery.setBirthEnd(start); + } + if(request.getMonthAgeEnd() != null){ Date end = DateUtil.addDay(DateUtil.addMonth(currentDate, -request.getMonthAgeEnd() - 1), 1); babyQuery.setBirthStart(end); - babyQuery.setBirthEnd(start); } // if (StringUtils.isNotEmpty(request.getDiagnose()))