From bea2c34d11f673983ef15126bb16146ea6e14d65 Mon Sep 17 00:00:00 2001
From: liquanyu <liquanyu@lymsh.com>
Date: Fri, 22 Sep 2017 10:42:43 +0800
Subject: [PATCH] update code

---
 .../main/java/com/lyms/platform/query/PatientsQuery.java    | 13 +++++++++++++
 .../com/lyms/platform/operate/web/facade/PatientFacade.java |  2 +-
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/platform-dal/src/main/java/com/lyms/platform/query/PatientsQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/PatientsQuery.java
index 2f5ca40..d9beb4f 100644
--- a/platform-dal/src/main/java/com/lyms/platform/query/PatientsQuery.java
+++ b/platform-dal/src/main/java/com/lyms/platform/query/PatientsQuery.java
@@ -474,6 +474,7 @@ public class PatientsQuery extends BaseQuery implements IConvertToNativeQuery {
     private String fmHospital;
     // 这个是分娩医院+建档医院的综合查询
     private List<String> fmHospitalQueryList;
+    private List<String> fmHospitalList;
     // 分娩年龄
     private Integer fmAgeStart;
     private Integer fmAgeEnd;
@@ -490,6 +491,14 @@ public class PatientsQuery extends BaseQuery implements IConvertToNativeQuery {
     private Integer postViewTimesStart;
     private Integer postViewTimesEnd;
 
+    public List<String> getFmHospitalList() {
+        return fmHospitalList;
+    }
+
+    public void setFmHospitalList(List<String> fmHospitalList) {
+        this.fmHospitalList = fmHospitalList;
+    }
+
     public Integer getPostViewTimesStart() {
         return postViewTimesStart;
     }
@@ -1208,6 +1217,10 @@ public class PatientsQuery extends BaseQuery implements IConvertToNativeQuery {
             }
         }
 
+        if (CollectionUtils.isNotEmpty(fmHospitalList)) {
+            condition = condition.and("fmHospital", fmHospitalList, MongoOper.IN);
+        }
+
         if (lastCheckEmployeeId != null) {
             condition = condition.and("lastCheckEmployeeId", lastCheckEmployeeId, MongoOper.IS);
         }
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java
index 74e6c77..bc0579e 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java
@@ -428,7 +428,7 @@ public class PatientFacade {
 
             if (com.lyms.platform.common.utils.StringUtils.isNotEmpty(riskPatientsQueryRequest.getCprovinceId()))
             {
-                patientsQuery.setFmHospitalQueryList(hospitalList);
+                patientsQuery.setFmHospitalList(hospitalList);
             }
 
         } else {
-- 
1.8.3.1