diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/ReportServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/ReportServiceImpl.java
index 8c53def..601e996 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/ReportServiceImpl.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/ReportServiceImpl.java
@@ -1165,8 +1165,10 @@ public class ReportServiceImpl extends BaseServiceImpl implements IReportService
             criteria.and("bookbuildingDate").gte(startDate).lt(DateUtil.addDay(endDate, 1));
         }
         if(startWeek != null && endWeek != null) { /** 末次月经 到 现在相隔的周数  */
-            criteria.and("lastMenses").lte(DateUtil.getWeekDay(startWeek))
-                    .gte(DateUtil.getWeekDay(-startWeek));
+            criteria.and("lastMenses").lte(DateUtil.getWeekDay(startWeek)).gte(DateUtil.getWeekDay(-endWeek));
+        }
+        if(childBirth != null) {
+            criteria.and("type").is(childBirth);
         }
         List<Patients> patients = mongoUtil.findField(Patients.class, criteria,"id", "bookbuildingDate", "fmDate", "pid");
         List<String> patientIds = CollectionUtils.getId(patients, "id", String.class);
@@ -1333,16 +1335,13 @@ public class ReportServiceImpl extends BaseServiceImpl implements IReportService
                 }
             }
         }
-        System.out.println(antExChuModels.size());
-        System.out.println(antExModels.size());
-        System.out.println(datas.size());
-        for (Map<String, Object> data : datas) {
+       /* for (Map<String, Object> data : datas) {
             Set<Map.Entry<String, Object>> entries = data.entrySet();
             for (Map.Entry<String, Object> entry : entries) {
                 System.out.print(entry.getKey() + " = " + (entry.getValue() instanceof Date ? ((Date) entry.getValue()).toLocaleString(): entry.getValue()) + "\t");
             }
             System.out.println();
-        }
+        }*/
     }
 
     private List<Series> createPatientSeries(List<Map<String, Object>> datas) {