From 3d0ea8a5680281937adefbf14b72526c32bd4da0 Mon Sep 17 00:00:00 2001
From: zengwh <zengwh>
Date: Thu, 24 Nov 2022 22:54:37 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=A7=92=E8=89=B2=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E9=85=8D=E7=BD=AE=E9=A2=84=E8=A7=88=E6=98=AF=E5=90=A6?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E6=B0=B4=E5=8D=B0=E5=92=8C=E9=AB=98=E6=8B=8D?=
 =?UTF-8?q?=E4=BB=AA=E5=A2=9E=E5=8A=A0=E6=9D=83=E9=99=90=E6=8E=A7=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../emr/controller/commomSearch/CommomSearchController.java | 6 ++++++
 .../views/recordManage/commomSearch/showRecord174.jsp       | 4 ++--
 2 files changed, 8 insertions(+), 2 deletions(-)

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 @@
                             </button>
                         </div>
                     </shiro:hasPermission>
-                    <%--<shiro:hasPermission name="/commom/openUrl">--%>
+                    <shiro:hasPermission name="/commom/metronome">
                             <div class="col-sm-4">
                                 <button type="button" class="btn btn-sm btn-primary"
                                     onclick="openUrl()">高拍仪
                                 </button>
                             </div>
-                    <%--</shiro:hasPermission>--%>
+                    </shiro:hasPermission>
                     <shiro:hasPermission name="/commom/recoverPic">
                         <div class="btn" id="recoverPic" style="display: none">
                             <button type="button" class="btn btn-sm btn-warning" data-toggle="modal"