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 bf496f5..d1e939c 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
@@ -1623,14 +1623,7 @@ public class BabyBookbuildingFacade {
         babyQuery.setName(request.getName());
         babyQuery.setMphone(request.getMphone());
         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);
-        }
+
 
 //        if (StringUtils.isNotEmpty(request.getDiagnose()))
 //        {
@@ -1663,12 +1656,86 @@ public class BabyBookbuildingFacade {
             }
         }
 
-        if (StringUtils.isNotEmpty(request.getBirth())) {
+        if(StringUtils.isNotEmpty(request.getBirth()) && request.getMonthAgeStart() != null && request.getMonthAgeEnd() != null)
+        {
+
+            Date start = DateUtil.addMonth(currentDate, -request.getMonthAgeStart());
+            String birthStr = request.getBirth();
+            String[] dates = birthStr.split(" - ");
+
+            if (DateUtil.parseYMD(dates[1]).getTime() < start.getTime())
+            {
+                babyQuery.setBirthEnd(DateUtil.parseYMD(dates[1]));
+
+            }
+            else
+            {
+                babyQuery.setBirthEnd(start);
+            }
+
+            Date end = DateUtil.addDay(DateUtil.addMonth(currentDate, -request.getMonthAgeEnd() - 1), 1);
+
+            if (DateUtil.parseYMD(dates[0]).getTime() < end.getTime())
+            {
+                babyQuery.setBirthStart(end);
+            }
+            else
+            {
+                babyQuery.setBirthStart(DateUtil.parseYMD(dates[0]));
+            }
+        }
+        else if (StringUtils.isNotEmpty(request.getBirth()) && request.getMonthAgeStart() != null )
+        {
+
+            Date start = DateUtil.addMonth(currentDate, -request.getMonthAgeStart());
+            String birthStr = request.getBirth();
+            String[] dates = birthStr.split(" - ");
+
+            if (DateUtil.parseYMD(dates[1]).getTime() < start.getTime())
+            {
+                babyQuery.setBirthEnd(DateUtil.parseYMD(dates[1]));
+            }
+            else
+            {
+                babyQuery.setBirthEnd(start);
+            }
+
+            babyQuery.setBirthStart(DateUtil.parseYMD(dates[0]));
+
+        }
+        else if (StringUtils.isNotEmpty(request.getBirth()))
+        {
             String birthStr = request.getBirth();
             String[] dates = birthStr.split(" - ");
             babyQuery.setBirthStart(DateUtil.parseYMD(dates[0]));
             babyQuery.setBirthEnd(DateUtil.parseYMD(dates[1]));
         }
+        else if (request.getMonthAgeStart() != null)
+        {
+            Date start = DateUtil.addMonth(currentDate, -request.getMonthAgeStart());
+            babyQuery.setBirthEnd(start);
+        }
+        else if (request.getMonthAgeEnd() != null)
+        {
+            Date end = DateUtil.addDay(DateUtil.addMonth(currentDate, -request.getMonthAgeEnd() - 1), 1);
+            babyQuery.setBirthStart(end);
+        }
+
+//        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);
+//        }
+
+//        if (StringUtils.isNotEmpty(request.getBirth())) {
+//            String birthStr = request.getBirth();
+//            String[] dates = birthStr.split(" - ");
+//            babyQuery.setBirthStart(DateUtil.parseYMD(dates[0]));
+//            babyQuery.setBirthEnd(DateUtil.parseYMD(dates[1]));
+//        }
 
 
         if (request.getServiceType() != null && request.getServiceType() != 100) {