From de64e210b47ce9a546ca41f23674c1c66a1bb0a2 Mon Sep 17 00:00:00 2001
From: zengwh <81383286@qq.com>
Date: Tue, 7 Jul 2020 10:52:05 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=B6=E8=97=8F=E5=88=97=E8=A1=A8=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E5=87=BA=E9=99=A2=E6=97=A5=E6=9C=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/emrCollect/Emr_CollectMapper.xml          |  3 ++-
 .../recordManage/commomSearch/showRecord174.jsp      |  1 +
 .../js/approveManage/collection/collectManage174.js  | 12 +++++++-----
 src/main/webapp/static/js/dateUtil.js                |  8 +++++++-
 .../js/recordManage/commomSearch/showRecord174.js    |  4 +++-
 5 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/src/main/resources/mapper/emrCollect/Emr_CollectMapper.xml b/src/main/resources/mapper/emrCollect/Emr_CollectMapper.xml
index 60b7c69..a13b5df 100644
--- a/src/main/resources/mapper/emrCollect/Emr_CollectMapper.xml
+++ b/src/main/resources/mapper/emrCollect/Emr_CollectMapper.xml
@@ -259,7 +259,8 @@
           b.collect_type_name,
           a.creater,
           a.parent_id,
-          c.name
+          c.name,
+          c.dis_date disTime
       FROM
           emr_collect a
       LEFT JOIN
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 df18857..a1328f4 100644
--- a/src/main/webapp/WEB-INF/views/recordManage/commomSearch/showRecord174.jsp
+++ b/src/main/webapp/WEB-INF/views/recordManage/commomSearch/showRecord174.jsp
@@ -884,5 +884,6 @@
 </div>
 <script type="text/javascript" src="${path}/static/js/recordManage/commomSearch/showRecord174.js?t=2019-12-20"></script>
 <script type="text/javascript" src="${path}/static/js/recordManage/commomSearch/showRecordIframeBloodCommom.js"></script>
+<script type="text/javascript" src="${path}/static/js/dateUtil.js"></script>
 </body>
 </html>
diff --git a/src/main/webapp/static/js/approveManage/collection/collectManage174.js b/src/main/webapp/static/js/approveManage/collection/collectManage174.js
index 431e143..b39bbc7 100644
--- a/src/main/webapp/static/js/approveManage/collection/collectManage174.js
+++ b/src/main/webapp/static/js/approveManage/collection/collectManage174.js
@@ -65,6 +65,13 @@ $('#mytab').bootstrapTable({
             title:'住院次数',
             field:'admissTimes',
         },
+        {
+            title:'出院日期',
+            field:'disTime',
+            formatter: function(value,row,index){
+                return covertDate(value);
+            }
+        },
         {
             title:'操作',
             formatter: function(value,row,index){
@@ -574,8 +581,3 @@ function borrowings(){
         }
     })
 }
-
-//查看详情
-// function showDetail(){
-//     window.location.href=path+'/commom/showRecord?patientId='+$("#patientId").val();
-// }
diff --git a/src/main/webapp/static/js/dateUtil.js b/src/main/webapp/static/js/dateUtil.js
index e4ebed1..537c8f5 100644
--- a/src/main/webapp/static/js/dateUtil.js
+++ b/src/main/webapp/static/js/dateUtil.js
@@ -96,6 +96,12 @@ function pickTime(info, showDate){
         }
     })
 }
-
+//转换日期
+function covertDate(value){
+    if(value != '' && value.length >= 10){
+        value = value.substring(0,10);
+    }
+    return value;
+}
 
 
diff --git a/src/main/webapp/static/js/recordManage/commomSearch/showRecord174.js b/src/main/webapp/static/js/recordManage/commomSearch/showRecord174.js
index 85fb5e3..fa6a7aa 100644
--- a/src/main/webapp/static/js/recordManage/commomSearch/showRecord174.js
+++ b/src/main/webapp/static/js/recordManage/commomSearch/showRecord174.js
@@ -42,7 +42,9 @@ function loadRecord(){
 				$("#inpatientNo1").val(data.inpatientNo);
 				$("#name1").val(data.name);
 				$("#admissTimesValue").val(data.admissTimes);
-				$("#disDate").val(data.disDate);
+				var disDate = data.disDate;
+				disDate = covertDate(disDate);
+				$("#disDate").val(disDate);
 				$("#disDeptName").val(data.disDept);
 				$("#diagName").val(data.mainDiagName);
 				var delCount = data.delCount;