From 35c33b42d6ebe7bb699cb5ada1d17f60067d114d Mon Sep 17 00:00:00 2001
From: liquanyu <liquanyu@lymsh.com>
Date: Fri, 12 May 2017 09:11:26 +0800
Subject: [PATCH] update

---
 .../main/resources/mainOrm/master/MasterLis.xml    | 45 +++++++++++++++++++++-
 1 file changed, 43 insertions(+), 2 deletions(-)

diff --git a/platform-biz-service/src/main/resources/mainOrm/master/MasterLis.xml b/platform-biz-service/src/main/resources/mainOrm/master/MasterLis.xml
index 4dabd64..b511f97 100644
--- a/platform-biz-service/src/main/resources/mainOrm/master/MasterLis.xml
+++ b/platform-biz-service/src/main/resources/mainOrm/master/MasterLis.xml
@@ -111,12 +111,53 @@
             <if test="lisId != null and lisId != ''">
                 AND  LIS_ID = #{lisId}
             </if>
-            <if test="vcCardNo != null || phone != null">
-                AND (VCCARDNO = #{vcCardNo} OR PHONE = #{phone})
+            <if test="vcCardNo != null">
+                AND VCCARDNO = #{vcCardNo}
+            </if>
+            <if test="vcCardNo == null">
+                AND VCCARDNO = ''
             </if>
             <if test="hospitalId != null and hospitalId != ''">
                 AND HOSPITAL_ID = #{hospitalId}
             </if>
+            UNION
+            SELECT
+            ID AS id,
+            LIS_ID AS lisId,
+            TITLE AS title,
+            TYPE AS type,
+            VCCARDNO AS vcCardNo,
+            NAME AS name,
+            BHNUM AS bhnum,
+            AGE AS age,
+            SEX AS sex,
+            APPLY_TIME AS applyTime,
+            CHECK_TIME AS checkTime,
+            PUBLISH_TIME AS publishTime,
+            APPLY_DOCTOR AS applyDoctor,
+            APPLY_DEPT AS applyDept,
+            CHECKER AS checker,
+            MODIFIED AS modified,
+            CREATED AS created,
+            HOSPITAL_ID AS hospitalId,
+            PHONE AS phone,
+            ITEM_JSON AS itemJson
+            FROM LIS_REPORT_TBL
+            WHERE  1 = 1
+            <if test="lisId != null and lisId != ''">
+                AND  LIS_ID = #{lisId}
+            </if>
+            <if test="phone != null">
+                AND  PHONE = #{phone}
+            </if>
+            <if test="phone == null">
+                AND  PHONE = ''
+            </if>
+            <if test="hospitalId != null and hospitalId != ''">
+                AND HOSPITAL_ID = #{hospitalId}
+            </if>
+
+
 
     </select>
 
-- 
1.8.3.1