From 35b9b4db49111c4c38097a7cdfa1d24bf8417479 Mon Sep 17 00:00:00 2001
From: zengwh <81383286@qq.com>
Date: Thu, 13 Jan 2022 11:15:26 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A7=BB=E5=8A=A8=E6=9F=A5?=
 =?UTF-8?q?=E6=88=BF=E7=9A=84=E6=98=BE=E7=A4=BA=E5=92=8C=E8=B7=B3=E8=BD=AC?=
 =?UTF-8?q?=E6=96=B0=E4=B8=80=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/webapp/WEB-INF/views/font/recordPage.jsp | 8 ++++----
 src/main/webapp/static/js/record/recordPage.js    | 7 ++++---
 2 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/src/main/webapp/WEB-INF/views/font/recordPage.jsp b/src/main/webapp/WEB-INF/views/font/recordPage.jsp
index 37944e1..f7cb7bc 100644
--- a/src/main/webapp/WEB-INF/views/font/recordPage.jsp
+++ b/src/main/webapp/WEB-INF/views/font/recordPage.jsp
@@ -6,14 +6,14 @@
 <html lang="en">
 <head>
     <meta charset="utf-8" />
-    <title>病案浏览</title>
+    <title>查房记录</title>
     <meta http-equiv="Content-Type"  content="text/html;charset=utf-8">
     <%--<meta name="referrer" content="never">--%>
     <!-- 解决部分兼容性问题，如果安装了GCF，则使用GCF来渲染页面，如果未安装GCF，则使用最高版本的IE内核进行渲染。 -->
     <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
     <!-- 页面按原比例显示 -->
     <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
-    <link rel="shortcut icon" href="${path}/static/favicon.ico">
+    <link rel="shortcut icon" href="../../../static/favicon.ico">
     <!--[if lt IE 9]>
     <script type="text/javascript" src="${path}/static/js/html5shiv.min.js"></script>
     <script type="text/javascript" src="${path}/static/js/jquery-1.11.3.min.js"></script>
@@ -123,7 +123,7 @@
         <div class="headDiv"id="main1">
             <div class="headSpanDiv">
         <span class="headspan">
-            病案浏览
+            查房记录
         </span>
             </div>
         </div>
@@ -193,7 +193,7 @@
 <script type="text/javascript">
     var path = "${path}";
 </script>
-<script src="${path}/static/js/record/recordPage.js?time=2020-10-16"></script>
+<script src="${path}/static/js/record/recordPage.js?time=2022-01-13"></script>
 <script src="${path}/static/js/hospitalLoadPdf/loadPdf.js?time=2020-10-16"></script>
 <script src="${path}/static/js/hospitalCommom/hospitalCommom.js?time=2020-11-16"></script>
 </html>
\ No newline at end of file
diff --git a/src/main/webapp/static/js/record/recordPage.js b/src/main/webapp/static/js/record/recordPage.js
index 912a671..e77bb67 100644
--- a/src/main/webapp/static/js/record/recordPage.js
+++ b/src/main/webapp/static/js/record/recordPage.js
@@ -131,7 +131,7 @@ function initTable() {
                     valign: 'middle',
                     formatter: function (value, row) {
                         var html = "";
-                        html += '<button type="button" class="btn btn-danger btn-sm selInfo" title="查看">查看pdf信息</button>';
+                        html += '<button type="button" class="btn btn-danger btn-sm selInfo" title="查看">查看详情</button>';
                         /*if (selectPower == 1) {
                             html += '<button type="button" class="btn btn-danger btn-sm selInfo" title="查看">查看</button>';
                         }
@@ -168,8 +168,9 @@ function initTable() {
                             //加载iframe
                             $("#main").hide();
                             $("#main1").hide()
-                            $("#iframe").prop("src",path+"/font/showRecord?patientId="+patientId+"&assortIds="+$("#assortIds").val());
-
+                            var pdfUrl = path+"/font/showRecord?patientId="+patientId+"&assortIds="+$("#assortIds").val();
+                            var openWin = window.open(pdfUrl,"_blank");
+                            setTimeout(function(){ openWin.document.title = $("#nameLab").text(); }, 100);
                         },
                         //查看流程
                         'click .showFlowInfo': function (e, value, row) {
