From 44a8efebc74438ff5ea9e5992414febefdf17eca Mon Sep 17 00:00:00 2001
From: jiangjiazhi <jiangjiazhi@lymsh.com>
Date: Fri, 23 Dec 2016 12:06:38 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=A7=E6=A3=80=E5=88=A0?=
 =?UTF-8?q?=E9=99=A41?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/lyms/platform/common/dao/operator/MongoCondition.java |  6 +++++-
 .../java/com/lyms/platform/common/dao/operator/MongoOper.java |  2 ++
 .../src/main/java/com/lyms/platform/query/PatientsQuery.java  | 11 +++++++++++
 .../lyms/platform/operate/web/facade/BookbuildingFacade.java  |  1 +
 4 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/platform-common/src/main/java/com/lyms/platform/common/dao/operator/MongoCondition.java b/platform-common/src/main/java/com/lyms/platform/common/dao/operator/MongoCondition.java
index e3e8050..dc8e2ae 100644
--- a/platform-common/src/main/java/com/lyms/platform/common/dao/operator/MongoCondition.java
+++ b/platform-common/src/main/java/com/lyms/platform/common/dao/operator/MongoCondition.java
@@ -173,7 +173,11 @@ public class MongoCondition {
     private void set(MongoOper oper, Object obj, Criteria criteria) {
         if (MongoOper.GT == oper) {
             criteria.gt(obj);
-        } else if (MongoOper.GTE == oper) {
+        }else
+        if (MongoOper.EXISTS == oper) {
+            criteria.exists(Boolean.valueOf(obj.toString()));
+        }
+        else if (MongoOper.GTE == oper) {
             criteria.gte(obj);
         } else if (MongoOper.IS == oper) {
             criteria.is(obj);
diff --git a/platform-common/src/main/java/com/lyms/platform/common/dao/operator/MongoOper.java b/platform-common/src/main/java/com/lyms/platform/common/dao/operator/MongoOper.java
index fcdbaac..ab610b4 100644
--- a/platform-common/src/main/java/com/lyms/platform/common/dao/operator/MongoOper.java
+++ b/platform-common/src/main/java/com/lyms/platform/common/dao/operator/MongoOper.java
@@ -21,5 +21,7 @@ public enum MongoOper {
 	//模糊
 	LIKE,
 	ALL,
+	//是否存在
+	EXISTS,
 	IN;
 }
\ No newline at end of file
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 b109dbb..42e1124 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
@@ -110,6 +110,8 @@ public class PatientsQuery extends BaseQuery implements IConvertToNativeQuery {
 
     //0 隐藏  1 显示
     private String enable="1";
+
+    private Boolean extEnable;
     //区域来源
     private String source;
 
@@ -129,7 +131,13 @@ public class PatientsQuery extends BaseQuery implements IConvertToNativeQuery {
         this.enable = enable;
     }
 
+    public boolean isExtEnable() {
+        return extEnable;
+    }
 
+    public void setExtEnable(boolean extEnable) {
+        this.extEnable = extEnable;
+    }
 
     public String getProvinceRegisterId() {
         return provinceRegisterId;
@@ -856,6 +864,9 @@ public class PatientsQuery extends BaseQuery implements IConvertToNativeQuery {
             MongoCondition condition2 = MongoCondition.newInstance("buildType", buildTypeList, MongoOper.IN);
             condition = condition.orCondition(new MongoCondition[]{condition1, condition2});
         }
+        if(extEnable){
+            condition.and("enable",extEnable,MongoOper.EXISTS);
+        }
 
         if (buildTypeEq != null) {
             condition = condition.and("buildType", buildTypeEq, MongoOper.IS);
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java
index 8c4ddeb..261914c 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/BookbuildingFacade.java
@@ -493,6 +493,7 @@ public class BookbuildingFacade {
         patientsQuery.setBuildType(1);
         //查询主档案
         patientsQuery.setExtEnable(false);
+
         //如果身份证号码不为空就以身份证号码查询
         if (!StringUtils.isEmpty(bookbuildingQueryRequest.getCardNo())) {
             patientsQuery.setCardNo(bookbuildingQueryRequest.getCardNo());
-- 
1.8.3.1