From 8df70cedf7f9235ab2c7fef7c38eee061ae74154 Mon Sep 17 00:00:00 2001
From: liquanyu <liquanyu@lymsh.com>
Date: Wed, 10 May 2017 15:48:30 +0800
Subject: [PATCH] update

---
 .../permission/dao/master/MasterLisMapper.java     |  2 ++
 .../permission/service/impl/LisServiceImpl.java    |  2 +-
 .../main/resources/mainOrm/master/MasterLis.xml    | 39 ++++++++++++++++++++--
 3 files changed, 40 insertions(+), 3 deletions(-)

diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/MasterLisMapper.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/MasterLisMapper.java
index 053bd18..a3f7256 100644
--- a/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/MasterLisMapper.java
+++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/dao/master/MasterLisMapper.java
@@ -17,6 +17,8 @@ public interface MasterLisMapper {
 
     List<LisReportModel> queryLisDataByModel(LisReportModel model);
 
+    List<LisReportModel> queryLisDataByLisIdAndHid(LisReportModel model);
+
     List<LisReportItemModel> queryLisItemByModel(LisReportItemModel query);
 
     List<LisReportModel> queryListItems(LisReportModel query);
diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/LisServiceImpl.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/LisServiceImpl.java
index cf41858..bf429ab 100644
--- a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/LisServiceImpl.java
+++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/LisServiceImpl.java
@@ -146,7 +146,7 @@ public class LisServiceImpl extends DataAccessLayerService implements LisService
         public void run() {
             for(LisReportModel model : lisList)
             {
-                List<LisReportModel> dbLis = masterLisMapper.queryLisDataByModel(model);
+                List<LisReportModel> dbLis = masterLisMapper.queryLisDataByLisIdAndHid(model);
                 if (CollectionUtils.isEmpty(dbLis))
                 {
                     masterLisMapper.saveLisData(model);
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 c0001e3..1b3b803 100644
--- a/platform-biz-service/src/main/resources/mainOrm/master/MasterLis.xml
+++ b/platform-biz-service/src/main/resources/mainOrm/master/MasterLis.xml
@@ -111,15 +111,50 @@
             <if test="lisId != null and lisId != ''">
                 AND  LIS_ID = #{lisId}
             </if>
-            <if test="vcCardNo != null || phone != null">
+<!--            <if test="vcCardNo != null || phone != null">
                 AND (VCCARDNO = #{vcCardNo} OR PHONE = #{phone})
-            </if>
+            </if>-->
             <if test="hospitalId != null and hospitalId != ''">
                 AND HOSPITAL_ID = #{hospitalId}
             </if>
 
     </select>
 
+
+    <select id="queryLisDataByLisIdAndHid" parameterType="com.lyms.platform.permission.model.LisReportModel"
+            resultType="com.lyms.platform.permission.model.LisReportModel">
+        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="hospitalId != null and hospitalId != ''">
+            AND HOSPITAL_ID = #{hospitalId}
+        </if>
+
+    </select>
+
     <select id="queryLisItemByModel" parameterType="com.lyms.platform.permission.model.LisReportItemModel"
             resultType="com.lyms.platform.permission.model.LisReportItemModel">
         SELECT
-- 
1.8.3.1