收藏列表增加出院日期

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

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>

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();
-// }

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;
+}
 
 

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;