From 275f6b0ea7040d1fbaefea7d7a52c0b1c0af56c3 Mon Sep 17 00:00:00 2001
From: liquanyu <liquanyu@lymsh.com>
Date: Thu, 16 Jul 2020 09:57:50 +0800
Subject: [PATCH] update

---
 .../com/lyms/platform/query/PatientsQuery.java     | 35 ++++++++++++++--------
 1 file changed, 22 insertions(+), 13 deletions(-)

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 86c1ab7..fc687a9 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
@@ -486,19 +486,6 @@ public class PatientsQuery extends BaseQuery implements IConvertToNativeQuery {
             condition = condition.orCondition(new MongoCondition[]{con1, con});
         }
 
-        if (null != normal) {
-            if ("1".equals(normal))
-            {
-                MongoCondition con1 = MongoCondition.newInstance("normal", normal, MongoOper.IS);
-                MongoCondition con = MongoCondition.newInstance("normal", Boolean.FALSE, MongoOper.EXISTS);
-                condition = condition.orCondition(new MongoCondition[]{con1, con});
-            }
-            else
-            {
-                condition = condition.and("normal", normal, MongoOper.IS);
-            }
-
-        }
 
         if (null != pcensusTypeId) {
             condition = condition.and("pcensusTypeId", pcensusTypeId, MongoOper.IS);
@@ -735,6 +722,9 @@ public class PatientsQuery extends BaseQuery implements IConvertToNativeQuery {
 
         Criteria c1 = null;
 
+
+
+
         if (null != queryNo) {
             MongoCondition c = MongoCondition.newInstance();
             MongoCondition con1 = MongoCondition.newInstance("phone", queryNo, MongoOper.IS);
@@ -852,6 +842,25 @@ public class PatientsQuery extends BaseQuery implements IConvertToNativeQuery {
             condition = condition.and("fmHospital", fmHospitalList, MongoOper.IN);
         }
 
+        if (null != normal) {
+            if ("1".equals(normal))
+            {
+                MongoCondition c = MongoCondition.newInstance();
+                MongoCondition con1 = MongoCondition.newInstance("normal", normal, MongoOper.IS);
+                MongoCondition con2 = MongoCondition.newInstance("normal", Boolean.FALSE, MongoOper.EXISTS);
+                if (c1 != null) {
+                    c1 = c1.andOperator(c.orCondition(new MongoCondition[]{con1, con2}).getCriteria());
+                } else {
+                    c1 = c.orCondition(new MongoCondition[]{con1, con2}).getCriteria();
+                }
+            }
+            else
+            {
+                condition = condition.and("normal", normal, MongoOper.IS);
+            }
+        }
+
+
         if (lastCheckEmployeeId != null) {
             condition = condition.and("lastCheckEmployeeId", lastCheckEmployeeId, MongoOper.IS);
         } else if (lastCheckEId) {
-- 
1.8.3.1