From 822d2eb266e5fb5a81014e9b064d22101a3ad718 Mon Sep 17 00:00:00 2001
From: liquanyu <liquanyu@lymsh.com>
Date: Fri, 9 Nov 2018 10:48:41 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=A7=E7=AD=9B=E7=BB=9F=E8=AE=A1=E6=8A=A5?=
 =?UTF-8?q?=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/lyms/platform/query/SieveQuery.java   | 35 ++++++++++++++++++++++
 .../platform/operate/web/facade/SieveFacade.java   |  7 ++---
 2 files changed, 38 insertions(+), 4 deletions(-)

diff --git a/platform-dal/src/main/java/com/lyms/platform/query/SieveQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/SieveQuery.java
index 8de1ceb..64c3cd0 100644
--- a/platform-dal/src/main/java/com/lyms/platform/query/SieveQuery.java
+++ b/platform-dal/src/main/java/com/lyms/platform/query/SieveQuery.java
@@ -78,6 +78,9 @@ public class SieveQuery extends BaseQuery implements IConvertToNativeQuery {
     private Date applyTimeStart;
     private Date applyTimeEnd;
 
+    private Date createdStart;
+    private Date createdEnd;
+
     //产筛医院
     private String sieveHospitalId;
 
@@ -85,6 +88,22 @@ public class SieveQuery extends BaseQuery implements IConvertToNativeQuery {
     private String applyHospitalId;
     private List<String> parentIds;
 
+    public Date getCreatedStart() {
+        return createdStart;
+    }
+
+    public void setCreatedStart(Date createdStart) {
+        this.createdStart = createdStart;
+    }
+
+    public Date getCreatedEnd() {
+        return createdEnd;
+    }
+
+    public void setCreatedEnd(Date createdEnd) {
+        this.createdEnd = createdEnd;
+    }
+
     public List<String> getParentIds() {
         return parentIds;
     }
@@ -351,6 +370,22 @@ public class SieveQuery extends BaseQuery implements IConvertToNativeQuery {
             }
         }
 
+        if (null != createdStart) {
+            if (null != c1) {
+                c1 = c1.and("created").gte(createdStart);
+            } else {
+                c1 = Criteria.where("created").gte(createdStart);
+            }
+        }
+
+        if (null != createdEnd) {
+            if (c1 != null) {
+                c1 = c1.lte(createdEnd);
+            } else {
+                c1 = Criteria.where("created").lte(createdEnd);
+            }
+        }
+
         if (null != diagnosisTimeStart) {
             if (null != c1) {
                 c1 = c1.and("diagnosisTime").gte(diagnosisTimeStart);
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java
index cc87777..adc6f94 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SieveFacade.java
@@ -1242,14 +1242,13 @@ public class SieveFacade {
 
                 List<String> hids = getConditionHospitalIds(currentUserHospPermissions, orgs);
 
-
                 //应筛查人数
                 SieveQuery ySieveQuery = new SieveQuery();
                 ySieveQuery.setHospitalIds(hids);
                 if (dates != null) {
-                    ySieveQuery.setResultTimeStart(DateUtil.parseYMD(dates[0]));
+                    ySieveQuery.setCreatedStart(DateUtil.parseYMD(dates[0]));
                     if (dates.length == 2) {
-                        ySieveQuery.setResultTimeEnd(DateUtil.parseYMDHMS(dates[1] + " 23:59:59"));
+                        ySieveQuery.setCreatedEnd(DateUtil.parseYMDHMS(dates[1] + " 23:59:59"));
                     }
                 }
                 int ycount = sieveService.queryListCount(ySieveQuery);
@@ -1271,7 +1270,7 @@ public class SieveFacade {
 
                 //诊断总人数
                 DiagnosisQuery diagnosisQuery1 = new DiagnosisQuery();
-                diagnosisQuery1.setHospitalIds(currentUserHospPermissions);
+                diagnosisQuery1.setHospitalIds(hids);
                 if (dates != null) {
                     diagnosisQuery1.setResultDateStart(DateUtil.parseYMD(dates[0]));
                     if (dates.length == 2) {
-- 
1.8.3.1