From 2ad1f055bc4e34573b2bb9136a54a82d91e2975a Mon Sep 17 00:00:00 2001
From: liquanyu <liquanyu@lymsh.com>
Date: Mon, 26 Nov 2018 16:56:35 +0800
Subject: [PATCH] =?UTF-8?q?=E7=AD=9B=E6=9F=A5=E7=BB=9F=E8=AE=A1=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/lyms/platform/query/SieveQuery.java   | 15 ++++++++++++++
 .../platform/operate/web/facade/SieveFacade.java   | 23 +++++++++++++++++-----
 2 files changed, 33 insertions(+), 5 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 64c3cd0..567a8d5 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
@@ -88,6 +88,16 @@ public class SieveQuery extends BaseQuery implements IConvertToNativeQuery {
     private String applyHospitalId;
     private List<String> parentIds;
 
+    private List<Integer> statuses;
+
+    public List<Integer> getStatuses() {
+        return statuses;
+    }
+
+    public void setStatuses(List<Integer> statuses) {
+        this.statuses = statuses;
+    }
+
     public Date getCreatedStart() {
         return createdStart;
     }
@@ -331,6 +341,11 @@ public class SieveQuery extends BaseQuery implements IConvertToNativeQuery {
         if (null != status) {
             condition = condition.and("status", status, MongoOper.IS);
         }
+
+        if (null != statuses && statuses.size() > 0) {
+            condition = condition.and("status", statuses, MongoOper.IN);
+        }
+
         if (null != renShenResult) {
             condition = condition.and("renShenResult", renShenResult, MongoOper.IS);
         }
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 4276d93..e96a1d3 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
@@ -1225,7 +1225,10 @@ public class SieveFacade {
                     SieveQuery sieveQuery = new SieveQuery();
                     sieveQuery.setHospitalIds(hids);
                     sieveQuery.setYn(YnEnums.YES.getId());
-                    sieveQuery.setStatus(3);
+                    List<Integer> statues = new ArrayList<>();
+                    statues.add(3);
+                    statues.add(4);
+                    sieveQuery.setStatuses(statues);
                     if (dates != null) {
                         sieveQuery.setResultTimeStart(DateUtil.parseYMD(dates[0]));
                         if (dates.length == 2) {
@@ -1305,7 +1308,12 @@ public class SieveFacade {
                     SieveQuery sieveQuery1 = new SieveQuery();
                     sieveQuery1.setHospitalIds(hids);
                     sieveQuery1.setYn(YnEnums.YES.getId());
-                    sieveQuery1.setStatus(3);
+
+                    List<Integer> statues = new ArrayList<>();
+                    statues.add(3);
+                    statues.add(4);
+                    sieveQuery1.setStatuses(statues);
+
                     if (dates != null) {
                         sieveQuery1.setResultTimeStart(DateUtil.parseYMD(dates[0]));
                         if (dates.length == 2) {
@@ -1325,7 +1333,6 @@ public class SieveFacade {
                             diagnosisQuery1.setResultDateEnd(DateUtil.parseYMDHMS(dates[1]));
                         }
                     }
-                    System.out.println("diagnosisQuery1==="+diagnosisQuery1.convertToQuery().convertToMongoQuery());
                     int diagnosisCountAll = diagnosisService.queryDiagnosisCount(diagnosisQuery1);
                     items.add(String.valueOf(diagnosisCountAll));
                 }
@@ -1454,7 +1461,10 @@ public class SieveFacade {
                 }
                 ySieveCount = sieveService.queryListCount(ySieveQuery);
 
-                ySieveQuery.setStatus(3);
+                List<Integer> statues = new ArrayList<>();
+                statues.add(3);
+                statues.add(4);
+                ySieveQuery.setStatuses(statues);
                 sSieveCount = sieveService.queryListCount(ySieveQuery);
 
 
@@ -1764,7 +1774,10 @@ public class SieveFacade {
                 SieveQuery sieveQuery1 = new SieveQuery();
                 sieveQuery1.setHospitalId(hid);
                 sieveQuery1.setYn(YnEnums.YES.getId());
-                sieveQuery1.setStatus(3);
+                List<Integer> statues = new ArrayList<>();
+                statues.add(3);
+                statues.add(4);
+                sieveQuery1.setStatuses(statues);
                 if (dates != null) {
                     sieveQuery1.setResultTimeStart(DateUtil.parseYMD(dates[0]));
                     if (dates.length == 2) {
-- 
1.8.3.1