From ab6e1dc40151216a7918c3382d0c921ffa10dc81 Mon Sep 17 00:00:00 2001
From: liquanyu <liquanyu@lymsh.com>
Date: Tue, 3 Jul 2018 14:42:35 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=86=E5=A8=A9=E7=AE=A1=E7=90=86=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/lyms/platform/query/PatientsQuery.java    | 18 ++++++++++++++++++
 .../platform/operate/web/facade/PatientFacade.java     | 10 ++++++++++
 2 files changed, 28 insertions(+)

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 2565bcc..e3430eb 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
@@ -149,6 +149,9 @@ public class PatientsQuery extends BaseQuery implements IConvertToNativeQuery {
     //区域来源
     private String source;
 
+    //区域来源
+    private Boolean extSource;
+
     private String desc;
     //查询号
     private String queryNo;
@@ -163,6 +166,14 @@ public class PatientsQuery extends BaseQuery implements IConvertToNativeQuery {
     private Integer buildDaysStart;
     private Integer buildDaysEnd;
 
+    public Boolean isExtSource() {
+        return extSource;
+    }
+
+    public void setExtSource(Boolean extSource) {
+        this.extSource = extSource;
+    }
+
     public boolean isFace() {
         return isFace;
     }
@@ -1182,6 +1193,13 @@ public class PatientsQuery extends BaseQuery implements IConvertToNativeQuery {
             condition = condition.and("face", true, MongoOper.EXISTS);
         }
 
+
+        if (extSource != null) {
+            condition = condition.and("source", extSource, MongoOper.EXISTS);
+        }
+
+
+
         if (isScreenResult) {
             condition = condition.and("screenResult", true, MongoOper.EXISTS);
         }
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 b114fa0..90b982c 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
@@ -469,6 +469,16 @@ public class PatientFacade {
                     fmHospitalList.retainAll(orgId);
                 }
             }
+            else
+            {
+                //没有选择分娩医院 并且未产妇查询的时候 就只查询主档案
+                if (type == 3)
+                {
+                    patientsQuery.setExtSource(false);
+                }
+            }
+
+
             if (com.lyms.platform.common.utils.StringUtils.isNotEmpty(riskPatientsQueryRequest.getFmHospital())) {
                 patientsQuery.setFmHospital(riskPatientsQueryRequest.getFmHospital());
             } else {
-- 
1.8.3.1