From 8fde5228b75318202d983f69a4f8f8b47934fca1 Mon Sep 17 00:00:00 2001
From: liquanyu <liquanyu@lymsh.com>
Date: Wed, 29 Jul 2020 15:16:11 +0800
Subject: [PATCH] =?UTF-8?q?=E5=84=BF=E7=AB=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/lyms/platform/query/BabyModelQuery.java     | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/platform-dal/src/main/java/com/lyms/platform/query/BabyModelQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/BabyModelQuery.java
index 11de69e..e260cad 100644
--- a/platform-dal/src/main/java/com/lyms/platform/query/BabyModelQuery.java
+++ b/platform-dal/src/main/java/com/lyms/platform/query/BabyModelQuery.java
@@ -117,6 +117,7 @@ public class BabyModelQuery extends BaseQuery implements IConvertToNativeQuery {
 
     //就诊卡号
     private String vcCardNo;
+    private String card;
 
     //儿童身份证
     private String cardNo;
@@ -252,6 +253,15 @@ public class BabyModelQuery extends BaseQuery implements IConvertToNativeQuery {
 
     private String numberCode;
 
+
+    public String getCard() {
+        return card;
+    }
+
+    public void setCard(String card) {
+        this.card = card;
+    }
+
     public Date getEndCaseTimeStart() {
         return endCaseTimeStart;
     }
@@ -1072,6 +1082,12 @@ public class BabyModelQuery extends BaseQuery implements IConvertToNativeQuery {
             condition = condition.and("weakSonInfo", weakSonInfos, MongoOper.IN);
         }
 
+        if (StringUtils.isNotEmpty(card)) {
+            MongoCondition con1 = MongoCondition.newInstance("vcCardNo", card, MongoOper.IS);
+            MongoCondition con = MongoCondition.newInstance("sINCard", card, MongoOper.IS);
+            condition = condition.orCondition(new MongoCondition[]{con1, con});
+        }
+
         if (null != hospitalIdList) {
             condition = condition.and("hospitalId", hospitalIdList, MongoOper.IN);
         } else if (null != hospitalId) {
-- 
1.8.3.1