Browse Source

时效性相关报表bug修复

DESKTOP-QGP20P1\dev_2 10 months atrás
parent
commit
071bfe5445

+ 2 - 2
src/html/uncorrectedCasesStatisticsAdm.html

@@ -20,12 +20,12 @@
     <div class="main-body">
         <div class="filterBox clearfix">
             <span class="filterItem typeFilter">
-                <!-- <span>科室:</span> -->
+                <span>规则名称:</span>
                 <input type="text" class="selectDept canEditDept" value="全部">
                 <ul class="deptList filterDropList"></ul>
             </span>
             <span class="filterItem typeFilter clearfix dataSelectLight">
-                    <span class="fl">院日期:</span>
+                    <span class="fl">院日期:</span>
                     <span class="datapickerBox fl"><input type="text" placeholder="请选择时间" id="datepicker" autocomplete="off" readonly/></span>
                     <span  class="divide fl">-</span>
                     <span class="datapickerBox fl"><input type="text" placeholder="请选择时间" id="datepicker2"  autocomplete="off" readonly/></span>

+ 9 - 9
src/js/uncorrectedCasesStatisticsAdm.js

@@ -53,8 +53,8 @@ $(".abnormalClear").click(function () {
   $('.patientNumInp').val('')
   $("th[code]").removeClass("asc desc")
   //behospitalCode =behospitalCodeTemp= ""
-  getTabData(1)
   getDeptList()
+  getTabData(1)  
 
 })
 $(".partTitle a").click(function () {
@@ -82,7 +82,7 @@ function getTabData(activePage) {
   const dateEnd = getPickerDate($("#datepicker2"), 2)
   const start = new Date(dateStatrt).getTime()
   const end = new Date(dateEnd).getTime()
-  if (start > end) {
+   if (start > end) {
     $.alerModal({ "message": '开始时间不能大于结束时间~', type: "tip", time: '1000', isFather: true, fatherWrapper: $("#mainBox", parent.document) });
     return
   }
@@ -96,7 +96,7 @@ function getTabData(activePage) {
     //"type": 0, //1-本月,2-本年,0-自定义时间(现在所有都是自定义时间,都会传开始日期和结束日期)
     "startDate": dateStatrt.replace(/\//g, '-'),
     "endDate": dateEnd.replace(/\//g, '-'),
-    "casesEntryIds": [timelinessId]
+    "casesEntryIds":[timelinessId]
   }
   startDateParam = dateStatrt
   endDateParam = dateEnd
@@ -154,7 +154,7 @@ function formatTableData(data) {
 function renderTab(data, hisId, activePage) {
   let formatColumns = formatTableData(data.columns)
   data = data.data;
-  console.log("renderTab", data);
+  // console.log("renderTab", data);
 
   let str = ``
 
@@ -164,10 +164,10 @@ function renderTab(data, hisId, activePage) {
       str += `
             <tr  data-index=${i}>
                 <td  class="textCenter">${(activePage - 1) * 15 + i + 1}</td>
-                <td>${item.hospitalId || "-"}</td>            
+                <td>${item.behospitalCode || "-"}</td>            
                 <td>${item.name || "-"}</td>            
                 <td>${item.sex || "-"}</td>            
-                <td>${item.behospitalCode || "-"}</td>            
+                <td>${item.fileCode || "-"}</td>            
                 <td>${item.doctorName || "-"}</td>            
                 <td>${item.behDeptName || "-"}</td>            
                 <td>${item.ruleName || "-"}</td>            
@@ -180,14 +180,14 @@ function renderTab(data, hisId, activePage) {
       str += `
       <tr  data-index=${i}>
           <td  class="textCenter">${(activePage - 1) * 15 + i + 1}</td>    
-          <td>${item.hospitalId || "-"}</td>       
+          <td>${item.behospitalCode || "-"}</td>       
           <td>${item.name || "-"}</td>            
           <td>${item.sex || "-"}</td>            
-          <td>${item.behospitalCode || "-"}</td>            
+          <td>${item.fileCode || "-"}</td>            
           <td>${item.doctorName || "-"}</td>            
           <td>${item.behDeptName || "-"}</td>            
           <td>${item.ruleName || "-"}</td>                               
-          <td>${item.wardName || "-"}</td>            
+          <td>${item.remark || "-"}</td>            
           <td>${item.behospitalDate || "-"}</td>   
           <td>${item.isPlacefile || "-"}</td>            
       </tr>