From 9b9bb6a539cf28765b19ac090c67c8b6342f70ff Mon Sep 17 00:00:00 2001
From: zengwh <81383286@qq.com>
Date: Mon, 15 Jun 2020 15:41:30 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E8=84=90=E8=A1=80=E5=BA=93?=
 =?UTF-8?q?=E7=89=88=E6=9C=AC=E9=80=82=E9=85=8D=E7=A5=88=E7=A6=8F=E5=8C=BB?=
 =?UTF-8?q?=E9=99=A2=E7=89=88=E6=9C=AC=20=E7=A5=88=E7=A6=8F=E5=8C=BB?=
 =?UTF-8?q?=E9=99=A2=E6=95=B0=E6=8D=AE=E5=BA=93=E9=9C=80=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=EF=BC=9At=5Fscan=5Fpage=E8=A1=A8source=20smallInt=20default=20?=
 =?UTF-8?q?1,is=5Fdel=20smallInt=20default=200;commomtable=E8=A1=A8new=5Fp?=
 =?UTF-8?q?ath=20nvarchar(200);emr=5Fprint=5Fdownload=5Finfo=E8=A1=A8ip=20?=
 =?UTF-8?q?nvarchar(16);emr=5Fcommom=5Fset=E8=A1=A8new=5Fpic=5Froot=20nvar?=
 =?UTF-8?q?char(100)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../EmrPrintDownloadInfoMapper.xml                  |  1 +
 .../recordManage/commomSearch/commomListqf.jsp      | 13 ++-----------
 .../recordManage/commomSearch/showRecord174.jsp     |  1 -
 .../js/recordManage/commomSearch/showRecord174.js   |  1 +
 4 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/src/main/resources/mapper/emrPrintAndDownLoad/EmrPrintDownloadInfoMapper.xml b/src/main/resources/mapper/emrPrintAndDownLoad/EmrPrintDownloadInfoMapper.xml
index 4c26327..a2d2b2f 100644
--- a/src/main/resources/mapper/emrPrintAndDownLoad/EmrPrintDownloadInfoMapper.xml
+++ b/src/main/resources/mapper/emrPrintAndDownLoad/EmrPrintDownloadInfoMapper.xml
@@ -114,6 +114,7 @@
     commomtable.${flag} + '/' + emr_print_download_info.scan_page
     ) scanAddr,
     emr_print_download_info.creater,
+    emr_print_download_info.ip,
     commomtable.name,
     commomtable.admiss_times,
     commomtable.inpatient_no,
diff --git a/src/main/webapp/WEB-INF/views/recordManage/commomSearch/commomListqf.jsp b/src/main/webapp/WEB-INF/views/recordManage/commomSearch/commomListqf.jsp
index 434afb0..eef4648 100644
--- a/src/main/webapp/WEB-INF/views/recordManage/commomSearch/commomListqf.jsp
+++ b/src/main/webapp/WEB-INF/views/recordManage/commomSearch/commomListqf.jsp
@@ -12,21 +12,12 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no"/>
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta http-equiv=X-UA-Compatible IE=EmulateIE7>
-    <link rel="stylesheet"
-          href="${path}/static/bootstrap-3.3.7/bower_components/bootstrap-table/bootstrap-table.min.css"
-          type="text/css">
     <link rel="stylesheet" href="${path}/static/bootstrap-3.3.7/bootstrap-table-fixed-columns.css" type="text/css">
-    <link href="https://cdnjs.cloudflare.com/ajax/libs/select2/4.0.4/css/select2.min.css" rel="stylesheet"/>
-
-    <!--[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>
-    <script type="text/javascript" src="${path}/static/js/respond.min.js"></script>
-    <![endif]-->
+    <link href="${path}/static/bootstrap-3.3.7/bower_components/select2/dist/css/select2.min.css" rel="stylesheet"/>
     <script type="text/javascript"
             src="${path}/static/bootstrap-3.3.7/bootstrap-table-fixed-columns.js?time=2019-12-25"></script>
     <script type="text/javascript" src="${path}/static/js/pinying.js"></script>
-    <script src="https://cdnjs.cloudflare.com/ajax/libs/select2/4.0.4/js/select2.min.js"></script>
+    <script src="${path}/static/bootstrap-3.3.7/bower_components/select2/dist/js/select2.min.js"></script>
     <script>
         var path = "${path}";
     </script>
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 85f86fd..d82c74e 100644
--- a/src/main/webapp/WEB-INF/views/recordManage/commomSearch/showRecord174.jsp
+++ b/src/main/webapp/WEB-INF/views/recordManage/commomSearch/showRecord174.jsp
@@ -22,7 +22,6 @@
     <script>
         var path = "${path}";
     </script>
-    <script type="text/javascript" src="${path}/static/js/jquery.media.js"></script>
     <script type="text/javascript" src="${path}/static/js/udpatePic/imgUp.js"></script>
     <style type="text/css">
         body{
diff --git a/src/main/webapp/static/js/recordManage/commomSearch/showRecord174.js b/src/main/webapp/static/js/recordManage/commomSearch/showRecord174.js
index 68f112f..3d04578 100644
--- a/src/main/webapp/static/js/recordManage/commomSearch/showRecord174.js
+++ b/src/main/webapp/static/js/recordManage/commomSearch/showRecord174.js
@@ -1122,6 +1122,7 @@ function save(){
 			}
 			formData.append('patientId',$("#patientId").val());
 			formData.append('assortId', assortId);
+			formData.append('name',$("#name").val());
 			formData.append('flag', $("#flag").val());
 			$.ajax({
 				url:path+'/commom/updatePic',