增加角色管理配置预览是否显示水印和高拍仪增加权限控制

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

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"