增加有审批权限的用户在首页间隔三分钟监听是否有待审批记录，有则请求权限系统接口发送通知，预览pdf开启关键字搜索功能

src/main/java/com/emr/controller/emrApprove/ApproveController.java

@@ -22,9 +22,13 @@ import com.fasterxml.jackson.databind.ObjectMapper;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import org.apache.commons.lang3.StringUtils;
+import org.apache.http.client.methods.CloseableHttpResponse;
+import org.apache.http.client.methods.HttpGet;
+import org.apache.http.impl.client.HttpClients;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
@@ -72,6 +76,8 @@ public class ApproveController {
     private AnnotationTemplateService annotationTemplateService;
     @Autowired
     private Emr_Apply_ApproveMapper applyApproveMapper;
+    @Value("${POWER_URLHEAD}")
+    private String POWER_URLHEAD;
     /**
      * @MethodName: approveListByAppleStatus
      * @Description: 查询该用户该记录是否有未提交，有则返回
@@ -175,6 +181,9 @@ public class ApproveController {
                             }
                         }
                     }
+                    //推送给权限系统下发审批人通知
+                    sendPowerApproveInterface(applyApprove.getApplyType(),commomtables.size());
+
                 } else {
                     return ResultUtil.error("该病案另一个申请还处于有效期，无须重复申请!");
                 }
@@ -188,6 +197,24 @@ public class ApproveController {
         }
     }
 
+    //推送给权限系统下发审批人通知
+    private void sendPowerApproveInterface(String applyType,Integer count) throws Exception{
+        //查询申请类型
+        List<Emr_Dictionary> dictionaryList = dictionaryMapper.selectDictionaryByTypeCode("apply_type");
+        /*String applyTypeName = "";
+        if(null != dictionaryList && !dictionaryList.isEmpty()){
+            for(Emr_Dictionary dictionary : dictionaryList){
+                if(dictionary.getCode().equals(applyType)){
+                    applyTypeName = dictionary.getName();
+                    break;
+                }
+            }
+        }
+        String url = POWER_URLHEAD+"/font/sendEmrRecordApproveNotice?applyType="+applyTypeName+"&count="+count;
+        // 执行请求
+        HttpClients.createDefault().execute(new HttpGet(url));*/
+    }
+
     /**
      * @MethodName: approveManageList
      * @Description: 跳转到申请列表
@@ -630,7 +657,8 @@ public class ApproveController {
     @RequiresPermissions("/approve/approveManageList174")
     @OptionalLog(module = "查看",methods = "借阅审批管理页面")
     @RequestMapping("approveManageList174")
-    public String approveManageList174(){
+    public String approveManageList174(Integer flag,Model model){
+        model.addAttribute("flag",flag);
         return "approveManage/approveManageList/approveManageList174";
     }
     /**
@@ -1054,4 +1082,34 @@ public class ApproveController {
             }
         }
     }
+
+    /**
+     * @MethodName: selectNotApproveList
+     * @Description: 查询未审批数量
+     * @Param
+     * @Return
+     * @Author: 曾文和
+     * @CreateDate: 2020-04-24
+     * @UpdateUser: 曾文和
+     * @UpdateDate: 2020-04-24
+     * @UpdateRemark: 更新说明
+     * @Version: 1.0
+     */
+    @RequestMapping("selectNotApproveList")
+    @ResponseBody
+    public void selectNotApproveList(){
+        try {
+            //查询未审批集合
+            List<Emr_Apply_Approve> applyApproves = applyApproveMapper.selectCountByApproveStateIsNull();
+            if (null != applyApproves && !applyApproves.isEmpty()) {
+                //调用权限系统推送通知
+                String applyTypeName = "申请";
+                String url = POWER_URLHEAD + "/font/sendEmrRecordApproveNotice?applyType=" + applyTypeName + "&count=" + applyApproves.size();
+                // 执行请求
+                HttpClients.createDefault().execute(new HttpGet(url));
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+        }
+    }
 }

src/main/webapp/WEB-INF/jspf/webSocket.jspf

@@ -7,6 +7,8 @@
     /************************通知操作************************************/
     $(function(){
         getNoticeCount();
+        //查询是否有审批权限，有审批权限到后台去查未审批数量，有未审批数量调用权限推送通知接口
+        getApproveCount();
     })
     //赋值未通知数量
     function getNoticeCount(){
@@ -28,6 +30,17 @@
             }
         })
     }
+
+    //查询是否有审批权限，有审批权限到后台去查未审批数量，有未审批数量调用权限推送通知接口
+    function getApproveCount(){
+        var approvePower = $("#approvePower").val();
+        if(approvePower == 1){
+            setInterval(function () {
+                $.get(path + "/approve/selectNotApproveList", function () {
+                });
+            },3*60*1000);
+        }
+    }
     //每隔1分钟轮询一次未通知数量
     setInterval(function () {
         getNoticeCount();
@@ -49,17 +62,25 @@
     }, 1000);
     //跳转到通知
     function noticeManage1(noticeId){
-        var url = powerUrlHead+"/gatewayPage?noticeId="+noticeId;
+        //noticeId = 'emr_record'为跳转病案管理系统的病案未审批页面
+        var url = '';
+        if(noticeId == 'emr_record'){
+            url = path+"/approve/approveManageList174?flag=1";
+            parent.$("#iFrame1").prop("src",url);
+        }else{
+            url = powerUrlHead+"/gatewayPage?noticeId="+noticeId;
             window.location.href = url;
         }
 
+    }
+
     /*******************************webSocket***********************************/
     var userId = $("#userId").val();
     var webSocketUrl = $("#webSocketUrl").val();
     var strSplit = $("#strSplit").val();
     var ws = new WebSocket("ws://"+webSocketUrl);
     ws.onopen = function(){
-        ws.send(userId);
+        ws.send("emr_record_"+userId);
         console.log("连接...")
     }
 

src/main/webapp/WEB-INF/views/approveManage/approveManageList/approveManageList174.jsp

@@ -172,7 +172,7 @@
                 <div class="searchInputElement left">
                     <select class="form-control input-sm" id="searchApproveState">
                         <option value="">请选择</option>
-                        <option value="待审批">待审批</option>
+                        <option value="待审批" <c:if test="${flag == 1}">selected</c:if>>待审批</option>
                         <option value="审核通过">审核通过</option>
                         <option value="审核不通过">审核不通过</option>
                         <option value="已过期">已过期</option>

src/main/webapp/WEB-INF/views/recordManage/commomSearch/commomListqf.jsp

@@ -149,7 +149,7 @@
         }
 
         .fht-cell {
-            width: 75px !important;
+            width: 85px !important;
         }
 
         .table-hover > tbody > tr:hover > td,

src/main/webapp/index.jsp

@@ -1,4 +1,6 @@
 <%@ page language="java" import="java.util.*" pageEncoding="UTF-8" contentType="text/html;charset=UTF-8" %>
+<%@ page import="com.emr.entity.Power_User" %>
+<%@ page import="org.apache.commons.lang3.StringUtils" %>
 <%@taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
 <%@ taglib uri="http://shiro.apache.org/tags" prefix="shiro" %>
 <c:set var="path" value="${pageContext.request.contextPath}"/>
@@ -44,6 +46,15 @@
         String POWER_URLHEAD = (String) request.getParameter("POWER_URLHEAD");
         String POWER_JSP = (String) request.getParameter("POWER_JSP");
         String token = (String) request.getSession().getAttribute("token");
+        Power_User user = (Power_User) request.getSession().getAttribute("CURRENT_USER");
+        Set<String> menus = user.getMenus();
+        Integer approvePower = 0;
+        for(String menu : menus){
+            if(StringUtils.isNoneBlank(menu) && "/approve/updateApprove".equals(menu)){
+                approvePower = 1;
+                break;
+            }
+        }
 //        String token = (String)request.getParameter("token");
         String WEBSOCKET_URLHEAD = (String) request.getParameter("WEBSOCKET_URLHEAD");
         String STR_SPLIT = (String) request.getParameter("STR_SPLIT");
@@ -62,6 +73,8 @@
 <input type="hidden" id="POWER_JSP" value="<%=POWER_JSP%>">
 <input type="hidden" id="webSocketUrl" value="<%=WEBSOCKET_URLHEAD%>">
 <input type="hidden" id="strSplit" value="<%=STR_SPLIT%>">
+<!--是否审批权限-->
+<input type="hidden" id="approvePower" value="<%=approvePower%>">
 <div class="wrapper">
     <header class="main-header">
         <!--logo-->

src/main/webapp/refuse.jsp

@@ -12,6 +12,7 @@
 	<meta http-equiv="keywords" content="keyword1,keyword2,keyword3">
 	<meta http-equiv="description" content="This is my page">
 	<link rel="stylesheet" href="${path}/static/css/layui.css" media="all" />
+	  <link rel="shortcut icon" href="${path}/static/js/favicon.ico">
   </head>
   
   <body>

src/main/webapp/static/css/layui.css

@@ -23,7 +23,7 @@ h1, h2, h3, h4, h5, h6 {
 }
 
 blockquote, body, button, dd, div, dl, dt, form, h1, h2, h3, h4, h5, h6,
-	input, li, ol, p, pre, td, textarea, th, ul {
+input, li, ol, p, pre, td, textarea, th, ul {
 	margin: 0;
 	padding: 0;
 	-webkit-tap-highlight-color: rgba(0, 0, 0, 0)
@@ -913,25 +913,25 @@ a cite {
 }
 
 .layui-col-lg1, .layui-col-lg10, .layui-col-lg11, .layui-col-lg12,
-	.layui-col-lg2, .layui-col-lg3, .layui-col-lg4, .layui-col-lg5,
-	.layui-col-lg6, .layui-col-lg7, .layui-col-lg8, .layui-col-lg9,
-	.layui-col-md1, .layui-col-md10, .layui-col-md11, .layui-col-md12,
-	.layui-col-md2, .layui-col-md3, .layui-col-md4, .layui-col-md5,
-	.layui-col-md6, .layui-col-md7, .layui-col-md8, .layui-col-md9,
-	.layui-col-sm1, .layui-col-sm10, .layui-col-sm11, .layui-col-sm12,
-	.layui-col-sm2, .layui-col-sm3, .layui-col-sm4, .layui-col-sm5,
-	.layui-col-sm6, .layui-col-sm7, .layui-col-sm8, .layui-col-sm9,
-	.layui-col-xs1, .layui-col-xs10, .layui-col-xs11, .layui-col-xs12,
-	.layui-col-xs2, .layui-col-xs3, .layui-col-xs4, .layui-col-xs5,
-	.layui-col-xs6, .layui-col-xs7, .layui-col-xs8, .layui-col-xs9 {
+.layui-col-lg2, .layui-col-lg3, .layui-col-lg4, .layui-col-lg5,
+.layui-col-lg6, .layui-col-lg7, .layui-col-lg8, .layui-col-lg9,
+.layui-col-md1, .layui-col-md10, .layui-col-md11, .layui-col-md12,
+.layui-col-md2, .layui-col-md3, .layui-col-md4, .layui-col-md5,
+.layui-col-md6, .layui-col-md7, .layui-col-md8, .layui-col-md9,
+.layui-col-sm1, .layui-col-sm10, .layui-col-sm11, .layui-col-sm12,
+.layui-col-sm2, .layui-col-sm3, .layui-col-sm4, .layui-col-sm5,
+.layui-col-sm6, .layui-col-sm7, .layui-col-sm8, .layui-col-sm9,
+.layui-col-xs1, .layui-col-xs10, .layui-col-xs11, .layui-col-xs12,
+.layui-col-xs2, .layui-col-xs3, .layui-col-xs4, .layui-col-xs5,
+.layui-col-xs6, .layui-col-xs7, .layui-col-xs8, .layui-col-xs9 {
 	position: relative;
 	display: block;
 	box-sizing: border-box
 }
 
 .layui-col-xs1, .layui-col-xs10, .layui-col-xs11, .layui-col-xs12,
-	.layui-col-xs2, .layui-col-xs3, .layui-col-xs4, .layui-col-xs5,
-	.layui-col-xs6, .layui-col-xs7, .layui-col-xs8, .layui-col-xs9 {
+.layui-col-xs2, .layui-col-xs3, .layui-col-xs4, .layui-col-xs5,
+.layui-col-xs6, .layui-col-xs7, .layui-col-xs8, .layui-col-xs9 {
 	float: left
 }
 
@@ -1428,7 +1428,7 @@ a cite {
 }
 
 .layui-btn, .layui-input, .layui-select, .layui-textarea,
-	.layui-upload-button {
+.layui-upload-button {
 	outline: 0;
 	-webkit-appearance: none;
 	transition: all .3s;
@@ -1582,7 +1582,7 @@ a cite {
 }
 
 .layui-bg-black, .layui-bg-blue, .layui-bg-cyan, .layui-bg-green,
-	.layui-bg-orange, .layui-bg-red {
+.layui-bg-orange, .layui-bg-red {
 	color: #fff !important
 }
 
@@ -1629,7 +1629,7 @@ a cite {
 }
 
 .layui-form-label, .layui-form-mid, .layui-form-select,
-	.layui-input-block, .layui-input-inline, .layui-textarea {
+.layui-input-block, .layui-input-inline, .layui-textarea {
 	position: relative
 }
 
@@ -1663,11 +1663,11 @@ a cite {
 }
 
 .layui-badge-rim, .layui-colla-content, .layui-colla-item,
-	.layui-collapse, .layui-elem-field, .layui-form-pane .layui-form-item[pane],
-	.layui-form-pane .layui-form-label, .layui-input, .layui-layedit,
-	.layui-layedit-tool, .layui-quote-nm, .layui-select, .layui-tab-bar,
-	.layui-tab-card, .layui-tab-title, .layui-tab-title .layui-this:after,
-	.layui-textarea {
+.layui-collapse, .layui-elem-field, .layui-form-pane .layui-form-item[pane],
+.layui-form-pane .layui-form-label, .layui-input, .layui-layedit,
+.layui-layedit-tool, .layui-quote-nm, .layui-select, .layui-tab-bar,
+.layui-tab-card, .layui-tab-title, .layui-tab-title .layui-this:after,
+.layui-textarea {
 	border-color: #e6e6e6
 }
 
@@ -1802,7 +1802,7 @@ a cite {
 }
 
 .layui-btn-disabled, .layui-btn-disabled:active, .layui-btn-disabled:hover
-	{
+{
 	border: 1px solid #e6e6e6;
 	background-color: #FBFBFB;
 	color: #C9C9C9;
@@ -1897,7 +1897,7 @@ a cite {
 }
 
 .layui-input::-webkit-input-placeholder, .layui-select::-webkit-input-placeholder,
-	.layui-textarea::-webkit-input-placeholder {
+.layui-textarea::-webkit-input-placeholder {
 	line-height: 1.3
 }
 
@@ -1928,7 +1928,7 @@ a cite {
 }
 
 .layui-form input[type=checkbox], .layui-form input[type=radio],
-	.layui-form select {
+.layui-form select {
 	display: none
 }
 
@@ -2002,7 +2002,7 @@ a cite {
 }
 
 .layui-form-danger+.layui-form-select .layui-input, .layui-form-danger:focus
-	{
+{
 	border-color: #FF5722 !important
 }
 
@@ -2406,7 +2406,7 @@ a cite {
 }
 
 .layui-form-pane .layui-form-radio, .layui-form-pane .layui-form-switch
-	{
+{
 	margin-top: 6px;
 	margin-left: 10px
 }
@@ -2516,7 +2516,7 @@ a cite {
 }
 
 .layui-layedit-tool .layui-disabled, .layui-layedit-tool .layui-disabled:hover
-	{
+{
 	color: #d2d2d2;
 	cursor: not-allowed
 }
@@ -2538,7 +2538,7 @@ a cite {
 }
 
 .layedit-tool-d, .layedit-tool-face, .layedit-tool-image,
-	.layedit-tool-unlink {
+.layedit-tool-unlink {
 	font-size: 18px !important
 }
 
@@ -2589,7 +2589,7 @@ a cite {
 }
 
 .layui-laypage a, .layui-laypage button, .layui-laypage input,
-	.layui-laypage select, .layui-laypage span {
+.layui-laypage select, .layui-laypage span {
 	border: 1px solid #e2e2e2
 }
 
@@ -2608,7 +2608,7 @@ a cite {
 }
 
 .layui-flow-more a *, .layui-laypage input, .layui-table-view select[lay-ignore]
-	{
+{
 	display: inline-block
 }
 
@@ -2658,8 +2658,8 @@ a cite {
 }
 
 .layui-laypage .layui-laypage-count, .layui-laypage .layui-laypage-limits,
-	.layui-laypage .layui-laypage-refresh, .layui-laypage .layui-laypage-skip
-	{
+.layui-laypage .layui-laypage-refresh, .layui-laypage .layui-laypage-skip
+{
 	margin-left: 10px;
 	margin-right: 10px;
 	padding: 0;
@@ -2667,7 +2667,7 @@ a cite {
 }
 
 .layui-laypage .layui-laypage-limits, .layui-laypage .layui-laypage-refresh
-	{
+{
 	vertical-align: top
 }
 
@@ -2769,17 +2769,17 @@ a cite {
 }
 
 .layui-table tbody tr:hover, .layui-table thead tr, .layui-table-click,
-	.layui-table-header, .layui-table-hover, .layui-table-mend,
-	.layui-table-patch, .layui-table-tool, .layui-table-total,
-	.layui-table-total tr, .layui-table[lay-even] tr:nth-child(even) {
+.layui-table-header, .layui-table-hover, .layui-table-mend,
+.layui-table-patch, .layui-table-tool, .layui-table-total,
+.layui-table-total tr, .layui-table[lay-even] tr:nth-child(even) {
 	background-color: #f2f2f2
 }
 
 .layui-table td, .layui-table th, .layui-table-col-set,
-	.layui-table-fixed-r, .layui-table-grid-down, .layui-table-header,
-	.layui-table-page, .layui-table-tips-main, .layui-table-tool,
-	.layui-table-total, .layui-table-view, .layui-table[lay-skin=line],
-	.layui-table[lay-skin=row] {
+.layui-table-fixed-r, .layui-table-grid-down, .layui-table-header,
+.layui-table-page, .layui-table-tips-main, .layui-table-tool,
+.layui-table-total, .layui-table-view, .layui-table[lay-skin=line],
+.layui-table[lay-skin=row] {
 	border-width: 1px;
 	border-style: solid;
 	border-color: #e6e6e6
@@ -2858,7 +2858,7 @@ a cite {
 }
 
 .layui-table-view .layui-table th.layui-unselect .layui-table-cell span
-	{
+{
 	cursor: pointer
 }
 
@@ -3063,7 +3063,7 @@ a cite {
 }
 
 .laytable-cell-checkbox, .laytable-cell-numbers, .laytable-cell-radio,
-	.laytable-cell-space {
+.laytable-cell-space {
 	padding: 0;
 	text-align: center
 }
@@ -3155,7 +3155,7 @@ a cite {
 }
 
 .layui-table-page .layui-laypage a, .layui-table-page .layui-laypage span
-	{
+{
 	height: 26px;
 	line-height: 26px;
 	margin-bottom: 10px;
@@ -3164,7 +3164,7 @@ a cite {
 }
 
 .layui-table-page .layui-laypage a, .layui-table-page .layui-laypage span.layui-laypage-curr
-	{
+{
 	padding: 0 12px
 }
 
@@ -3184,7 +3184,7 @@ a cite {
 }
 
 .layui-table-page .layui-laypage button, .layui-table-page .layui-laypage input
-	{
+{
 	height: 26px;
 	line-height: 26px
 }
@@ -3227,7 +3227,7 @@ select.layui-table-edit {
 }
 
 .layui-table-view .layui-form-checkbox, .layui-table-view .layui-form-radio,
-	.layui-table-view .layui-form-switch {
+.layui-table-view .layui-form-switch {
 	top: 0;
 	margin: 0;
 	box-sizing: content-box
@@ -3480,7 +3480,7 @@ body .layui-table-tips .layui-layer-content {
 }
 
 .layui-nav .layui-this:after, .layui-nav-bar, .layui-nav-tree .layui-nav-itemed:after
-	{
+{
 	position: absolute;
 	left: 0;
 	top: 0;
@@ -3567,7 +3567,7 @@ body .layui-table-tips .layui-layer-content {
 }
 
 .layui-nav .layui-nav-child dd.layui-this a, .layui-nav-child dd.layui-this
-	{
+{
 	background-color: #5FB878;
 	color: #fff
 }
@@ -3607,8 +3607,8 @@ body .layui-table-tips .layui-layer-content {
 }
 
 .layui-nav-tree .layui-nav-child dd.layui-this, .layui-nav-tree .layui-nav-child dd.layui-this a,
-	.layui-nav-tree .layui-this, .layui-nav-tree .layui-this>a,
-	.layui-nav-tree .layui-this>a:hover {
+.layui-nav-tree .layui-this, .layui-nav-tree .layui-this>a,
+.layui-nav-tree .layui-this>a:hover {
 	background-color: #009688;
 	color: #fff
 }
@@ -3618,7 +3618,7 @@ body .layui-table-tips .layui-layer-content {
 }
 
 .layui-nav-itemed>a, .layui-nav-tree .layui-nav-title a, .layui-nav-tree .layui-nav-title a:hover
-	{
+{
 	color: #fff !important
 }
 
@@ -3638,7 +3638,7 @@ body .layui-table-tips .layui-layer-content {
 }
 
 .layui-nav-tree .layui-nav-child, .layui-nav-tree .layui-nav-child a:hover
-	{
+{
 	background: 0 0;
 	color: #fff
 }
@@ -3667,7 +3667,7 @@ body .layui-table-tips .layui-layer-content {
 }
 
 .layui-bg-blue .layui-nav-bar, .layui-bg-blue .layui-nav-itemed:after,
-	.layui-bg-blue .layui-this:after {
+.layui-bg-blue .layui-this:after {
 	background-color: #93D1FF
 }
 
@@ -3676,7 +3676,7 @@ body .layui-table-tips .layui-layer-content {
 }
 
 .layui-bg-blue .layui-nav-itemed>a, .layui-nav-tree.layui-bg-blue .layui-nav-title a,
-	.layui-nav-tree.layui-bg-blue .layui-nav-title a:hover {
+.layui-nav-tree.layui-bg-blue .layui-nav-title a:hover {
 	background-color: #007DDB !important
 }
 
@@ -3846,7 +3846,7 @@ body .layui-table-tips .layui-layer-content {
 }
 
 .layui-tab-brief>.layui-tab-more li.layui-this:after, .layui-tab-brief>.layui-tab-title .layui-this:after
-	{
+{
 	border: none;
 	border-radius: 0;
 	border-bottom: 2px solid #5FB878
@@ -4076,7 +4076,7 @@ body .layui-table-tips .layui-layer-content {
 }
 
 .layui-carousel:hover .layui-carousel-arrow[lay-type=add],
-	.layui-carousel[lay-arrow=always] .layui-carousel-arrow[lay-type=add] {
+.layui-carousel[lay-arrow=always] .layui-carousel-arrow[lay-type=add] {
 	right: 20px
 }
 
@@ -4156,7 +4156,7 @@ body .layui-table-tips .layui-layer-content {
 }
 
 .layui-carousel>[carousel-item]>.layui-carousel-next, .layui-carousel>[carousel-item]>.layui-carousel-prev,
-	.layui-carousel>[carousel-item]>.layui-this {
+.layui-carousel>[carousel-item]>.layui-this {
 	display: block
 }
 
@@ -4173,8 +4173,8 @@ body .layui-table-tips .layui-layer-content {
 }
 
 .layui-carousel>[carousel-item]>.layui-carousel-next.layui-carousel-left,
-	.layui-carousel>[carousel-item]>.layui-carousel-prev.layui-carousel-right
-	{
+.layui-carousel>[carousel-item]>.layui-carousel-prev.layui-carousel-right
+{
 	left: 0
 }
 
@@ -4193,7 +4193,7 @@ body .layui-table-tips .layui-layer-content {
 }
 
 .layui-carousel[lay-anim=updown]>[carousel-item]>*, .layui-carousel[lay-anim=fade]>[carousel-item]>*
-	{
+{
 	left: 0 !important
 }
 
@@ -4232,35 +4232,35 @@ body .layui-table-tips .layui-layer-content {
 }
 
 .layui-carousel[lay-anim=updown]>[carousel-item]>.layui-carousel-next.layui-carousel-left,
-	.layui-carousel[lay-anim=updown]>[carousel-item]>.layui-carousel-prev.layui-carousel-right
-	{
+.layui-carousel[lay-anim=updown]>[carousel-item]>.layui-carousel-prev.layui-carousel-right
+{
 	top: 0
 }
 
 .layui-carousel[lay-anim=updown]>[carousel-item]>.layui-this.layui-carousel-left
-	{
+{
 	top: -100%
 }
 
 .layui-carousel[lay-anim=updown]>[carousel-item]>.layui-this.layui-carousel-right
-	{
+{
 	top: 100%
 }
 
 .layui-carousel[lay-anim=fade]>[carousel-item]>.layui-carousel-next,
-	.layui-carousel[lay-anim=fade]>[carousel-item]>.layui-carousel-prev {
+.layui-carousel[lay-anim=fade]>[carousel-item]>.layui-carousel-prev {
 	opacity: 0
 }
 
 .layui-carousel[lay-anim=fade]>[carousel-item]>.layui-carousel-next.layui-carousel-left,
-	.layui-carousel[lay-anim=fade]>[carousel-item]>.layui-carousel-prev.layui-carousel-right
-	{
+.layui-carousel[lay-anim=fade]>[carousel-item]>.layui-carousel-prev.layui-carousel-right
+{
 	opacity: 1
 }
 
 .layui-carousel[lay-anim=fade]>[carousel-item]>.layui-this.layui-carousel-left,
-	.layui-carousel[lay-anim=fade]>[carousel-item]>.layui-this.layui-carousel-right
-	{
+.layui-carousel[lay-anim=fade]>[carousel-item]>.layui-this.layui-carousel-right
+{
 	opacity: 0
 }
 
@@ -4653,7 +4653,7 @@ body .layui-util-face .layui-layer-content {
 }
 
 .layui-slider-wrap-btn.layui-slider-hover, .layui-slider-wrap-btn:hover
-	{
+{
 	transform: scale(1.2)
 }
 
@@ -4809,24 +4809,22 @@ body .layui-util-face .layui-layer-content {
 	-webkit-transition: all .3s
 }
 
-@
--webkit-keyframes layui-rotate {
+@-webkit-keyframes layui-rotate {
 	from {-webkit-transform: rotate(0)
-}
+	}
 
-to {
+	to {
 		-webkit-transform: rotate(360deg)
-}
+	}
 
 }
-@
-keyframes layui-rotate {
+@keyframes layui-rotate {
 	from {transform: rotate(0)
-}
+	}
 
-to {
+	to {
 		transform: rotate(360deg)
-}
+	}
 
 }
 .layui-anim-rotate {
@@ -4838,28 +4836,26 @@ to {
 	animation-timing-function: linear
 }
 
-@
--webkit-keyframes layui-up {
+@-webkit-keyframes layui-up {
 	from {-webkit-transform: translate3d(0, 100%, 0);
 		opacity: .3
-}
+	}
 
-to {
+	to {
 		-webkit-transform: translate3d(0, 0, 0);
 		opacity: 1
-}
+	}
 
 }
-@
-keyframes layui-up {
+@keyframes layui-up {
 	from {transform: translate3d(0, 100%, 0);
 		opacity: .3
-}
+	}
 
-to {
+	to {
 		transform: translate3d(0, 0, 0);
 		opacity: 1
-}
+	}
 
 }
 .layui-anim-up {
@@ -4867,28 +4863,26 @@ to {
 	animation-name: layui-up
 }
 
-@
--webkit-keyframes layui-upbit {
+@-webkit-keyframes layui-upbit {
 	from {-webkit-transform: translate3d(0, 30px, 0);
 		opacity: .3
-}
+	}
 
-to {
+	to {
 		-webkit-transform: translate3d(0, 0, 0);
 		opacity: 1
-}
+	}
 
 }
-@
-keyframes layui-upbit {
+@keyframes layui-upbit {
 	from {transform: translate3d(0, 30px, 0);
 		opacity: .3
-}
+	}
 
-to {
+	to {
 		transform: translate3d(0, 0, 0);
 		opacity: 1
-}
+	}
 
 }
 .layui-anim-upbit {
@@ -4896,139 +4890,125 @@ to {
 	animation-name: layui-upbit
 }
 
-@
--webkit-keyframes layui-scale { 0%{
+@-webkit-keyframes layui-scale { 0%{
 	opacity: .3;
 	-webkit-transform: scale(.5)
 }
 
-100%{
-opacity
-:
-1;-webkit-transform
-:scale(1)
-}
+	100%{
+		opacity
+		:
+				1;-webkit-transform
+	:scale(1)
+	}
 }
-@
-keyframes layui-scale { 0%{
+@keyframes layui-scale { 0%{
 	opacity: .3;
 	-ms-transform: scale(.5);
 	transform: scale(.5)
 }
 
-100%{
-opacity
-:
-1;-ms-transform
-:scale(1)
-;transform
-:scale(1)
-}
+	100%{
+		opacity
+		:
+				1;-ms-transform
+	:scale(1)
+	;transform
+	:scale(1)
+	}
 }
 .layui-anim-scale {
 	-webkit-animation-name: layui-scale;
 	animation-name: layui-scale
 }
 
-@
--webkit-keyframes layui-scale-spring { 0%{
+@-webkit-keyframes layui-scale-spring { 0%{
 	opacity: .5;
 	-webkit-transform: scale(.5)
 }
 
-80%{
-opacity
-:
-.8
-;-webkit-transform
-:scale
-(1
-.1
-)
-}
-100%{
-opacity
-:
-1;-webkit-transform
-:scale(1)
-}
+	80%{
+		opacity
+		:
+				.8
+	;-webkit-transform
+	:scale(1.1)
+	}
+	100%{
+		opacity
+		:
+				1;-webkit-transform
+	:scale(1)
+	}
 }
-@
-keyframes layui-scale-spring { 0%{
+@keyframes layui-scale-spring { 0%{
 	opacity: .5;
 	transform: scale(.5)
 }
 
-80%{
-opacity
-:
-.8
-;transform
-:scale
-(1
-.1
-)
-}
-100%{
-opacity
-:
-1;transform
-:scale(1)
-}
+	80%{
+		opacity
+		:
+				.8
+	;transform
+	:scale(1.1)
+	}
+	100%{
+		opacity
+		:
+				1;transform
+	:scale(1)
+	}
 }
 .layui-anim-scaleSpring {
 	-webkit-animation-name: layui-scale-spring;
 	animation-name: layui-scale-spring
 }
 
-@
--webkit-keyframes layui-fadein { 0%{
+@-webkit-keyframes layui-fadein { 0%{
 	opacity: 0
 }
 
-100%{
-opacity
-:
-1
-}
+	100%{
+		opacity
+		:
+				1
+	}
 }
-@
-keyframes layui-fadein { 0%{
+@keyframes layui-fadein { 0%{
 	opacity: 0
 }
 
-100%{
-opacity
-:
-1
-}
+	100%{
+		opacity
+		:
+				1
+	}
 }
 .layui-anim-fadein {
 	-webkit-animation-name: layui-fadein;
 	animation-name: layui-fadein
 }
 
-@
--webkit-keyframes layui-fadeout { 0%{
+@-webkit-keyframes layui-fadeout { 0%{
 	opacity: 1
 }
 
-100%{
-opacity
-:
-0
-}
+	100%{
+		opacity
+		:
+				0
+	}
 }
-@
-keyframes layui-fadeout { 0%{
+@keyframes layui-fadeout { 0%{
 	opacity: 1
 }
 
-100%{
-opacity
-:
-0
-}
+	100%{
+		opacity
+		:
+				0
+	}
 }
 .layui-anim-fadeout {
 	-webkit-animation-name: layui-fadeout;

src/main/webapp/static/js/recordManage/commomSearch/showRecord174.js

@@ -107,13 +107,13 @@ $("#admissTimes").change(function () {
 		success:function(d){
 			if(d != null){
 				$("#patientId").val(d.patientId);
-				$("#iframe").prop("src",path+"/commom/showRecordIframeBlood?patientId="+d.patientId);
+				$("#iframe").prop("src",path+"/commom/showRecordIframe?patientId="+d.patientId);
 				$("#disDate").val(d.disDate);
 				$("#disDeptName").val(d.disDept);
 				$("#diagName").val(d.mainDiagName);
 				$("#otherDiagName").val(d.otherDiagName);
 				//重新加载其他诊断名称鼠标滑过显示全部文本
-				/*loadQtip('.otherDiagName');*/
+				loadQtip('.otherDiagName');
 				//变更收藏信息
 				$("#collectId").val("");
 				$("#collectTime").val(currentDate);

src/main/webapp/static/pdfjs/web/viewer.css

@@ -39,7 +39,7 @@
   margin: -1px;
   padding: 1px;
 
-  background-color: rgb(180, 0, 170);
+  background-color: red;
   border-radius: 4px;
 }
 
@@ -56,7 +56,8 @@
 }
 
 .textLayer .highlight.selected {
-  background-color: rgb(0, 100, 0);
+  /*background-color: rgb(0, 100, 0);*/
+  background-color:red;
 }
 
 .textLayer ::selection { background: rgb(0,0,255); }

src/main/webapp/static/pdfjs/web/viewer.html

@@ -180,9 +180,9 @@ http://sourceforge.net/adobe/cmap/wiki/License/
                   <span data-l10n-id="toggle_sidebar_label">Toggle Sidebar</span>
                 </button>
                 <div class="toolbarButtonSpacer"></div>
-                <!--<button id="viewFind" class="toolbarButton group hiddenSmallView" title="Find in Document" tabindex="12" data-l10n-id="findbar">
+                <button id="viewFind" class="toolbarButton group hiddenSmallView" title="Find in Document" tabindex="12" data-l10n-id="findbar">
                    <span data-l10n-id="findbar_label">Find</span>
-                </button>-->
+                </button>
                 <div class="splitToolbarButton">
                   <button class="toolbarButton pageUp" title="Previous Page" id="previous" tabindex="13" data-l10n-id="previous">
                     <span data-l10n-id="previous_label">Previous</span>
@@ -471,6 +471,20 @@ http://sourceforge.net/adobe/cmap/wiki/License/
       return false;
     }
   }
+  /*$(function() {
+      //PDFFindBar.prototype.open(); //optional if you want to show the search bar
+      var keys = ['人','心','人心'];
+      for (var i = 0; i < keys.length; i++) {
+        var event = document.createEvent('CustomEvent');
+          event.initCustomEvent('find' + 'again', true, true, {
+              query: keys[i],
+              highlightAll: true,
+              findPrevious: false
+          });
+        window.dispatchEvent(event);
+      }
+      //return window.dispatchEvent(event);
+  })*/
 </script>
 </html>
 

src/main/webapp/static/pdfjs/web/viewer.js

@@ -927,12 +927,11 @@ var PDFFindBar = (function PDFFindBarClosure() {
       throw new Error('PDFFindBar cannot be used without a ' +
                       'PDFFindController instance.');
     }
-
     // Add event listeners to the DOM elements.
     var self = this;
-    /*this.toggleButton.addEventListener('click', function() {
+    this.toggleButton.addEventListener('click', function() {
       self.toggle();
-    });*/
+    });
 
     this.findField.addEventListener('input', function() {
       self.dispatchEvent('');
@@ -5742,7 +5741,7 @@ var PDFViewerApplication = {
 
     this.findBar = new PDFFindBar({
       bar: document.getElementById('findbar'),
-     /* toggleButton: document.getElementById('viewFind'),*/
+      toggleButton: document.getElementById('viewFind'),
       findField: document.getElementById('findInput'),
       highlightAllCheckbox: document.getElementById('findHighlightAll'),
       caseSensitiveCheckbox: document.getElementById('findMatchCase'),
@@ -6948,9 +6947,9 @@ function webViewerInitialized() {
       classList.add('hidden');
   }
 
-/*  if (PDFViewerApplication.supportsIntegratedFind) {
+  if (PDFViewerApplication.supportsIntegratedFind) {
     document.getElementById('viewFind').classList.add('hidden');
-  }*/
+  }
 
   // Listen for unsupported features to trigger the fallback UI.
   PDFJS.UnsupportedManager.listen(