From 4f601131ab88d44110b4ba2616df1c2cf5e7624b Mon Sep 17 00:00:00 2001
From: zengwh <zengwh>
Date: Wed, 21 Jun 2023 18:27:06 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=85=B6=E4=BB=96pdf?=
 =?UTF-8?q?=E5=8A=A0=E8=BD=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/emr/controller/inHospitalController.java    | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/src/main/java/com/emr/controller/inHospitalController.java b/src/main/java/com/emr/controller/inHospitalController.java
index 2a2670c1..6af7677a 100644
--- a/src/main/java/com/emr/controller/inHospitalController.java
+++ b/src/main/java/com/emr/controller/inHospitalController.java
@@ -1343,6 +1343,19 @@ public class inHospitalController {
         String key =list[0].substring(0,list[0].length()-1);
         //titleName为前端页面title显示的患者姓名，这里要去掉
         List<String> filePaths = SessionContant.getPdfUrl(key, request);
+        if(CollectionUtils.isEmpty(filePaths) && StringUtils.isNotBlank(key)){
+            //终审页面没有缓存,key为Mid_文件id逗号隔开
+            String[] keyArr = StringUtils.split(key, "_");
+            String[] assortIds = StringUtils.split(keyArr[1], ",");
+            String masterId = keyArr[0];
+            if(masterId.substring(0,masterId.length()-1).equals(keyArr[1])){
+                //按文件id集合,masterId.substring(0,masterId.length()-1)去掉最后面的逗号
+                filePaths = archiveDetailService.getPdfUrlByMasterOrId(null,null,"0",masterId);
+            }else{
+                //按文件分类id集合
+                filePaths = archiveDetailService.getPdfUrlByMasterOrId(assortIds,masterId,"0",null);
+            }
+        }
         if (null != filePaths && !filePaths.isEmpty()) {
             try {
                 //合成PDF