From ca47de31046e7d56053192c45503b7cb910a9774 Mon Sep 17 00:00:00 2001
From: liquanyu <liquanyu@lymsh.com>
Date: Thu, 28 Dec 2017 11:45:07 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A3=80=E6=9F=A5=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     | 27 ++++++++++++++--------
 1 file changed, 17 insertions(+), 10 deletions(-)

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 1c9702f..12465b4 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
@@ -89,14 +89,17 @@ public class LisFacade {
     public BaseResponse getLisAndRisData(String vcCardNo,String phone,Integer sortType,Integer userId) {
 
         List<CheckByDate> checkByDate=new ArrayList<CheckByDate>();
-        List<CheckResponse> result = queryLisCheckList(vcCardNo,phone,userId);
+        //根据用户id获取医院ID
+        String hospitalId = autoMatchFacade.getHospitalId(userId);
+
+        List<CheckResponse> result = queryLisCheckList(vcCardNo,phone,hospitalId);
 
         //排序检查大项
         sortLis(result);
 
         if(1 == sortType){
             List<String> keyList = new ArrayList<>();
-            for (CheckResponse check:result) {
+            for (CheckResponse check : result) {
                 //明细项排序
                 sortLisItems(check);
                 Date date = check.getApplyDate() == null ? check.getModified() : check.getApplyDate();
@@ -134,20 +137,25 @@ public class LisFacade {
             checkByItem.setTime("检验报告");
             checkByDate.add(checkByItem);
 
-            List<CheckType> checkType =new ArrayList<CheckType>();
+            List<CheckType> checkType = new ArrayList<CheckType>();
 
             for (CheckResponse check : result) {
                 sortLisItems(check);
-
-
                 List<CheckResponse> result2 = new ArrayList<>();
-
                 check.setTitle(check.getTitle() + " " + DateUtil.getyyyy_MM_dd(check.getApplyDate()));
                 CheckType CheckType1 = new CheckType();
                 result2.add(check);
 
                 if(result2.size() > 0){
-                    CheckType1.setType(check.getTitle());
+                    //秦皇岛显示检验报告类别名称
+                    if ("216".equals(hospitalId))
+                    {
+                        CheckType1.setType(check.getLisTypeName());
+                    }
+                    else
+                    {
+                        CheckType1.setType(check.getTitle());
+                    }
                     CheckType1.setTypeName(result2);
                     checkType.add(CheckType1);
                 }
@@ -226,7 +234,7 @@ public class LisFacade {
      * @param userId 用户ID
      * @return
      */
-    public List<CheckResponse> queryLisCheckList(String vcCardNo,String phone,Integer userId) {
+    public List<CheckResponse> queryLisCheckList(String vcCardNo,String phone,String hospitalId) {
 
         //保存这个人在所有医院的lis记录
         List<CheckResponse> result = new ArrayList<>();
@@ -234,8 +242,7 @@ public class LisFacade {
         //缓存查询到的医院
         Map<String,String> hIdNames = new HashMap<>();
 
-        //根据用户id获取医院ID
-        String hospitalId = autoMatchFacade.getHospitalId(userId);
+
 
         OrganizationQuery organizationQuery = new OrganizationQuery();
         organizationQuery.setYn(YnEnums.YES.getId());
-- 
1.8.3.1