From 9175b6a05c7f9f449a8500ecd4d153eb0b0e4c8e Mon Sep 17 00:00:00 2001
From: litao <litao@lymsh.com>
Date: Mon, 10 Jul 2017 14:32:53 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E4=BA=A7=E6=A3=80=E6=AC=A1?=
 =?UTF-8?q?=E6=95=B0=E5=88=86=E5=B8=83=E7=BB=9F=E8=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../operate/web/service/impl/ReportServiceImpl.java         | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

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) {
-- 
1.8.3.1