From a9fede39b0c88260c2f945da6de180e42288736d Mon Sep 17 00:00:00 2001
From: liquanyu <liquanyu@lymsh.com>
Date: Tue, 2 May 2017 15:12:04 +0800
Subject: [PATCH] update

---
 .../src/main/resources/mainOrm/master/MasterLis.xml               | 4 ++++
 .../main/java/com/lyms/platform/operate/web/facade/LisFacade.java | 8 +++++++-
 2 files changed, 11 insertions(+), 1 deletion(-)

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 afda6b7..ce00c75 100644
--- a/platform-biz-service/src/main/resources/mainOrm/master/MasterLis.xml
+++ b/platform-biz-service/src/main/resources/mainOrm/master/MasterLis.xml
@@ -112,6 +112,10 @@
                 AND VCCARDNO = #{vcCardNo}
             </if>
 
+            <if test="phone != null and phone != ''">
+                AND PHONE = #{phone}
+            </if>
+
             <if test="hospitalId != null and hospitalId != ''">
                 AND HOSPITAL_ID = #{hospitalId}
             </if>
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/LisFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/LisFacade.java
index b3aab3b..f65805d 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/LisFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/LisFacade.java
@@ -302,9 +302,14 @@ public class LisFacade {
             if(CollectionUtils.isNotEmpty(list)){
                 for(Patients pat : list)
                 {
-                    if (pat != null && StringUtils.isNotEmpty(pat.getVcCardNo()) && StringUtils.isNotEmpty(pat.getHospitalId()))
+                    if (pat != null &&  StringUtils.isNotEmpty(pat.getHospitalId()))
                     {
 
+                        if (StringUtils.isNotEmpty(pat.getVcCardNo())  && StringUtils.isNotEmpty(pat.getPhone()))
+                        {
+                            continue;
+                        }
+
                         //获取医院的名称
                         String hospitalName = hIdNames.get(pat.getHospitalId());
                         if (!StringUtils.isNotEmpty(hospitalName))
@@ -321,6 +326,7 @@ public class LisFacade {
                         LisReportModel model = new LisReportModel();
                         model.setVcCardNo(pat.getVcCardNo());
                         model.setHospitalId(pat.getHospitalId());
+                        model.setPhone(pat.getPhone());
                         //通过就诊卡号和医院id查询到医院下面的lis记录
                         List<LisReportModel> lises = lisService.queryLisDataByModel(model);
                         if (CollectionUtils.isNotEmpty(lises))
-- 
1.8.3.1