diff --git a/src/main/java/com/emr/controller/SessionContant.java b/src/main/java/com/emr/controller/SessionContant.java index 8fbb1359..a477a47d 100644 --- a/src/main/java/com/emr/controller/SessionContant.java +++ b/src/main/java/com/emr/controller/SessionContant.java @@ -21,8 +21,6 @@ public class SessionContant { Object attribute = request.getSession().getAttribute(key); if(null != attribute){ List list = (List) attribute; - //删除缓存 - request.getSession().removeAttribute(key); return list; } return null; diff --git a/src/main/java/com/emr/controller/inHospitalController.java b/src/main/java/com/emr/controller/inHospitalController.java index cc59ee5c..2a2670c1 100644 --- a/src/main/java/com/emr/controller/inHospitalController.java +++ b/src/main/java/com/emr/controller/inHospitalController.java @@ -487,6 +487,24 @@ public class inHospitalController { */ @ResponseBody @RequestMapping(value = "/getPdfById") + public String getPdfById(HttpServletResponse response, HttpServletRequest request, @Param("id") String idStr) throws Exception { + //组织分类id集合 + if(StringUtils.isNotBlank(idStr)){ + List srcFileList = null; + try { + srcFileList = archiveDetailService.getPdfUrlByMasterOrId(null,null,null,idStr); + } catch (Exception e) { + e.printStackTrace(); + } + if(!CollectionUtils.isEmpty(srcFileList)){ + //设置进缓存 + String key = SessionContant.setPdfUrl(idStr, idStr, srcFileList, request); + return key; + } + } + return null; + } +/* public String getPdfById(HttpServletResponse response, HttpServletRequest request, @Param("id") String idStr) throws Exception { request.setCharacterEncoding("utf-8"); response.setCharacterEncoding("utf-8"); @@ -540,6 +558,7 @@ public class inHospitalController { } return result; } +*/ @ResponseBody @RequestMapping(value = "/delPdf") diff --git a/src/main/resources/mapper/Archive_DetailMapper.xml b/src/main/resources/mapper/Archive_DetailMapper.xml index 429dc1f4..851b4a6e 100644 --- a/src/main/resources/mapper/Archive_DetailMapper.xml +++ b/src/main/resources/mapper/Archive_DetailMapper.xml @@ -732,7 +732,11 @@ on Archive_Detail.AssortID = zd_assort.assort_id WHERE 1=1 - AND ID IN (${fileIds}) + AND ID IN ( + + #{item} + + ) AND MasterID = #{masterId}