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 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