diff --git a/src/main/java/com/emr/controller/commomSearch/CommomSearchController.java b/src/main/java/com/emr/controller/commomSearch/CommomSearchController.java index 8284c26..c5f08cf 100644 --- a/src/main/java/com/emr/controller/commomSearch/CommomSearchController.java +++ b/src/main/java/com/emr/controller/commomSearch/CommomSearchController.java @@ -738,6 +738,12 @@ public class CommomSearchController { EmrPdfWaterSet emrPdfWaterSet = pdfWaterSetMapper.selectByPrimaryKey(1); //定义第二文本水印 姓名 + 科室 + ip EmrPdfWaterSet emrPdfWaterSet1 = commomService.getEmrPdfWaterSet(emrPdfWaterSet); + //获取角色是否加水印 + Integer userSex = user.getUserSex(); + if(userSex == null || userSex == 0){ + emrPdfWaterSet.setEffective(Short.valueOf("0")); + emrPdfWaterSet1.setEffective(Short.valueOf("0")); + } img2PdfUtil.imageToPdf(response, scanPages, pdfName, emrPdfWaterSet,emrPdfWaterSet1); //移除缓存 request.removeAttribute(mapKey); diff --git a/src/main/webapp/WEB-INF/views/recordManage/commomSearch/showRecord174.jsp b/src/main/webapp/WEB-INF/views/recordManage/commomSearch/showRecord174.jsp index 9a7b675..3705839 100644 --- a/src/main/webapp/WEB-INF/views/recordManage/commomSearch/showRecord174.jsp +++ b/src/main/webapp/WEB-INF/views/recordManage/commomSearch/showRecord174.jsp @@ -289,13 +289,13 @@ - <%----%> +
- <%--
--%> +