From 3d6e081064f4c804eefbd8cc6496d15cef363d63 Mon Sep 17 00:00:00 2001
From: liquanyu <liquanyu@lymsh.com>
Date: Wed, 12 Dec 2018 16:42:26 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A3=80=E9=AA=8C=E6=8A=A5=E5=91=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../platform/operate/web/facade/LisFacade.java     | 37 +++++++++++++++++++++-
 .../operate/web/facade/ResidentsArchiveFacade.java |  3 ++
 .../web/result/ResidentsArchiveHistoryResult.java  | 27 ++++++++++++++++
 3 files changed, 66 insertions(+), 1 deletion(-)

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 0555823..36ec9f5 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
@@ -252,7 +252,12 @@ public class LisFacade {
             model.setHospitalId(hospitalId);
             //通过就诊卡号和医院id查询到医院下面的lis记录
             lises = queryLisData(vcCardNo, "", "",perType, model);
-        } else {
+        }
+        else if (perType == 3)
+        {
+            lises = queryLisWhfyData(vcCardNo, cardNo,model);
+        }
+        else {
             PatientsQuery patientsQuery = new PatientsQuery();
             String[] strs = new String[]{phone, vcCardNo, cardNo};
             patientsQuery.setPv(strs);
@@ -452,6 +457,36 @@ public class LisFacade {
 
     }
 
+
+    private List<LisReportModel> queryLisWhfyData(String vcCardNo,  String cardNo,LisReportQuery model) {
+        List<LisReportModel> reportModelList = new ArrayList<>();
+        //通过就诊卡号和医院id查询到医院下面的lis记录
+        if (StringUtils.isNotEmpty(vcCardNo) || StringUtils.isNotEmpty(cardNo)) {
+            if (StringUtils.isNotEmpty(cardNo))
+            {
+                model.setVcCardNo(cardNo);
+            }
+            List<LisReportModel> lises = lisService.queryLisDataByModel(model);
+            if (CollectionUtils.isNotEmpty(lises)) {
+                reportModelList.addAll(lises);
+            }
+            else
+            {
+                if (StringUtils.isNotEmpty(vcCardNo))
+                {
+                    model.setVcCardNo(vcCardNo);
+                }
+                lises = lisService.queryLisDataByModel(model);
+                if (CollectionUtils.isNotEmpty(lises)) {
+                    reportModelList.addAll(lises);
+                }
+            }
+        }
+        return reportModelList;
+
+    }
+
+
     /**
      * 诸城就诊卡号处理
      *
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ResidentsArchiveFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ResidentsArchiveFacade.java
index f6dcf57..e555b75 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ResidentsArchiveFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ResidentsArchiveFacade.java
@@ -496,6 +496,9 @@ public class ResidentsArchiveFacade{
                     }
                     temp.setBookBuildDate(DateUtil.getyyyy_MM_dd(archiveModel.getBuildDay()));
                     temp.setId(archiveModel.getId());
+                    temp.setVcCardNo(archiveModel.getVcCardNo());
+                    temp.setCardNo(archiveModel.getCertificateNum());
+                    temp.setPhone(archiveModel.getPhone());
                     historyResults.add(temp);
                 }
             }
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/ResidentsArchiveHistoryResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/ResidentsArchiveHistoryResult.java
index d1a1b44..76e0e9e 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/ResidentsArchiveHistoryResult.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/ResidentsArchiveHistoryResult.java
@@ -16,6 +16,33 @@ public class ResidentsArchiveHistoryResult {
     private String bookBuildHospital;
     //医院ID
     private String hospitalId;
+    private String phone;
+    private String vcCardNo;
+    private String cardNo;
+
+    public String getPhone() {
+        return phone;
+    }
+
+    public void setPhone(String phone) {
+        this.phone = phone;
+    }
+
+    public String getVcCardNo() {
+        return vcCardNo;
+    }
+
+    public void setVcCardNo(String vcCardNo) {
+        this.vcCardNo = vcCardNo;
+    }
+
+    public String getCardNo() {
+        return cardNo;
+    }
+
+    public void setCardNo(String cardNo) {
+        this.cardNo = cardNo;
+    }
 
     public String getId() {
         return id;
-- 
1.8.3.1