Merge remote-tracking branch 'remotes/origin/version1.3.7.2' into test

src/html/uncorrectedCasesStatistics.html

@@ -19,12 +19,16 @@
     <div class="partTitleT"></div>
     <div class="main-body">
         <div class="filterBox clearfix">
-            <span class="filterItem typeFilter deptListWrap">
+            <!-- <span class="filterItem typeFilter deptListWrap">
                 <span>科室名称：</span>
                 <span class="selectDept">
                     全部
                 </span>
                 <ul class="deptList filterDropList"></ul>
+            </span> -->
+            <span class="filterItem typeFilter">
+                <span>科室名称：</span>
+                <input class="patientNumInp" style="width: 148px;" type="text" placeholder="请输入科室名称">
             </span>
             <span class="filterItem typeFilter clearfix dataSelectLight">
                     <span class="fl">出院日期：</span>

src/js/uncorrectedCasesStatistics.js

@@ -46,6 +46,7 @@ $(".abnormalClear").click(function(){
   deptNameTemp="";
   setDatePicker($("#datepicker"),$("#datepicker2"),"default")
   $('.selectDept ').html('全部')
+  $('.patientNumInp').val('')
   $(".deptList").css("display", "none")
   $(".selectDept").append(`<img class="arrow" src=${iconDown} alt="下拉">`);
   $("th[code]").removeClass("asc desc")
@@ -96,7 +97,7 @@ function getTabData(activePage){
     if(res.data.code == '0'){
       const data = res.data.data||[];
       renderTab(data,data.hospitalId,activePage);
-      renderTabTitle(data)   //渲染Table表头
+      // renderTabTitle(data)   //渲染Table表头
       renderPagination(totalPage,Number(activePage),totalNum)
       if(totalPage > 1){
         renderPagination(totalPage,Number(activePage),totalNum)
@@ -109,56 +110,81 @@ function getTabData(activePage){
   }).catch((e) =>{
 
   })
+ 
 }
 
 getTabData(1)
 
 $(".filter").on("click", function(e){
-  deptName = deptNameTemp;
+  // deptName = deptNameTemp;
   behospitalCode = behospitalCodeTemp;
   getTabData(1)
 })
 // // 处理th tr数据
-// function formatTableData(data){
-//   let trData = []
-//   let newColumns = columns.filter(function(item,index){
-//     if(item.isShow === 1) {
-//       return item
-//     }
-//   })
-//   console.log(newColumns,'newColumns');
-//   // newColumns.map()
-// }
+function formatTableData(data){
+  let newColumns = data.filter(function(item,index){
+    if(item.isShow === 1) {
+      return item
+    }
+  })
+  return newColumns
+}
 
 
 function renderTab(data,hisId,activePage){
+  let formatColumns = formatTableData(data.columns)
   data = data.data;
+  console.log(data,'==============data============');
+  console.log(formatColumns,'==============formatColumns============');
   let str = ``
   for(let i = 0; i < data.length; i++){
-    const item = data[i];
+    const item = data[i]
     str += `
-            <tr  data-index=${i}>
-                <td  class="textCenter">${(activePage-1)*15 + i+1}</td>
-                <td>${item.deptId || "-"}</td>
-                <td>${item.deptName+'' || "-"}</td>            
-                <td class="goHomeDetail" dept-id="${item.deptId || ""}" dept-name="${item.deptName || ""}" data-id="${item.entry_2658_id || ""}" data-name="${item.entry_2658_name || ""}">${item.entry_2658_num+'' || "-"}</td>            
-                <td class="goHomeDetail" dept-id="${item.deptId || ""}" dept-name="${item.deptName || ""}" data-id="${item.entry_2686_id || ""}" data-name="${item.entry_2686_name || ""}">${item.entry_2686_num+'' || "-"}</td>            
-                <td class="goHomeDetail" dept-id="${item.deptId || ""}" dept-name="${item.deptName || ""}" data-id="${item.entry_3010_id || ""}" data-name="${item.entry_3010_name || ""}">${item.entry_3010_num+'' || "-"}</td>            
-                <td class="goHomeDetail" dept-id="${item.deptId || ""}" dept-name="${item.deptName || ""}" data-id="${item.entry_2656_id || ""}" data-name="${item.entry_2656_name || ""}">${item.entry_2656_num+'' || "-"}</td>            
-                <td class="goHomeDetail" dept-id="${item.deptId || ""}" dept-name="${item.deptName || ""}" data-id="${item.entry_2657_id || ""}" data-name="${item.entry_2657_name || ""}">${item.entry_2657_num+'' || "-"}</td>            
-                <td class="goHomeDetail" dept-id="${item.deptId || ""}" dept-name="${item.deptName || ""}" data-id="${item.entry_2170_id || ""}" data-name="${item.entry_2170_name || ""}">${item.entry_2170_num+'' || "-"}</td>            
-                <td class="goHomeDetail" dept-id="${item.deptId || ""}" dept-name="${item.deptName || ""}" data-id="${item.entry_2930_id || ""}" data-name="${item.entry_2930_name || ""}">${item.entry_2930_num+'' || "-"}</td>            
-                <td class="goHomeDetail" dept-id="${item.deptId || ""}" dept-name="${item.deptName || ""}" data-id="${item.entry_2900_id || ""}" data-name="${item.entry_2900_name || ""}">${item.entry_2900_num+'' || "-"}</td>            
-                <td class="goHomeDetail" dept-id="${item.deptId || ""}" dept-name="${item.deptName || ""}" data-id="${item.entry_2229_id || ""}" data-name="${item.entry_2229_name || ""}">${item.entry_2229_num+'' || "-"}</td>            
-                <td class="goHomeDetail" dept-id="${item.deptId || ""}" dept-name="${item.deptName || ""}" data-id="${item.entry_2220_id || ""}" data-name="${item.entry_2220_name || ""}">${item.entry_2220_num+'' || "-"}</td>            
-                <td class="goHomeDetail" dept-id="${item.deptId || ""}" dept-name="${item.deptName || ""}" data-id="${item.entry_2221_id || ""}" data-name="${item.entry_2221_name || ""}">${item.entry_2221_num+'' || "-"}</td>            
-                <td class="goHomeDetail" dept-id="${item.deptId || ""}" dept-name="${item.deptName || ""}" data-id="${item.entry_2655_id || ""}" data-name="${item.entry_2655_name || ""}">${item.entry_2655_num+'' || "-"}</td>            
-                <td class="goHomeDetail" dept-id="${item.deptId || ""}" dept-name="${item.deptName || ""}" data-id="${item.entry_2654_id || ""}" data-name="${item.entry_2654_name || ""}">${item.entry_2654_num+'' || "-"}</td>            
-                <td class="goHomeDetail" dept-id="${item.deptId || ""}" dept-name="${item.deptName || ""}" data-id="${item.entry_2217_id || ""}" data-name="${item.entry_2217_name || ""}">${item.entry_2217_num+'' || "-"}</td>            
-                <td class="goHomeDetail" dept-id="${item.deptId || ""}" dept-name="${item.deptName || ""}" data-id="${item.entry_2495_id || ""}" data-name="${item.entry_2495_name || ""}">${item.entry_2495_num+'' || "-"}</td>            
-            </tr>
-        `
-  }
+        <tr  data-index=${i}>
+            <td  class="textCenter">${(activePage-1)*15 + i+1}</td>`
+      for(var j = 0; j < formatColumns.length ; j++) {
+          let dataId = `entry_${formatColumns[j].id}_id`;
+          let dataName = `entry_${formatColumns[j].id}_name`
+          let dataNum = `entry_${formatColumns[j].id}_num`
+          console.log(dataId,'dataId');
+          entryId = item[dataId]
+          entryName = item[dataName]
+          entryNum = item[dataNum]
+          console.log(entryId,entryName,entryNum);
+          if(!formatColumns[j].id){
+            str += `<td>${item.deptName+'' || "-"}</td>`
+          }else{
+            str += `<td class="goHomeDetail" dept-id="${item.deptId || ""}" dept-name="${item.deptName || ""}" data-id="${entryId || ""}" data-name="${entryName || ""}">${entryNum+'' || "-"}</td>`
+          }         
+      }      
+    str += `</tr>`
+  
+ }
+  // for(let i = 0; i < data.length; i++){
+  //   const item = data[i];
+  //   str += `
+  //           <tr  data-index=${i}>
+  //               <td  class="textCenter">${(activePage-1)*15 + i+1}</td>
+  //               <td>${item.deptName+'' || "-"}</td>            
+  //               <td class="goHomeDetail" dept-id="${item.deptId || ""}" dept-name="${item.deptName || ""}" data-id="${item.entry_2658_id || ""}" data-name="${item.entry_2658_name || ""}">${item.entry_2658_num+'' || "-"}</td>            
+  //               <td class="goHomeDetail" dept-id="${item.deptId || ""}" dept-name="${item.deptName || ""}" data-id="${item.entry_2686_id || ""}" data-name="${item.entry_2686_name || ""}">${item.entry_2686_num+'' || "-"}</td>            
+  //               <td class="goHomeDetail" dept-id="${item.deptId || ""}" dept-name="${item.deptName || ""}" data-id="${item.entry_3010_id || ""}" data-name="${item.entry_3010_name || ""}">${item.entry_3010_num+'' || "-"}</td>            
+  //               <td class="goHomeDetail" dept-id="${item.deptId || ""}" dept-name="${item.deptName || ""}" data-id="${item.entry_2656_id || ""}" data-name="${item.entry_2656_name || ""}">${item.entry_2656_num+'' || "-"}</td>            
+  //               <td class="goHomeDetail" dept-id="${item.deptId || ""}" dept-name="${item.deptName || ""}" data-id="${item.entry_2657_id || ""}" data-name="${item.entry_2657_name || ""}">${item.entry_2657_num+'' || "-"}</td>            
+  //               <td class="goHomeDetail" dept-id="${item.deptId || ""}" dept-name="${item.deptName || ""}" data-id="${item.entry_2170_id || ""}" data-name="${item.entry_2170_name || ""}">${item.entry_2170_num+'' || "-"}</td>            
+  //               <td class="goHomeDetail" dept-id="${item.deptId || ""}" dept-name="${item.deptName || ""}" data-id="${item.entry_2930_id || ""}" data-name="${item.entry_2930_name || ""}">${item.entry_2930_num+'' || "-"}</td>            
+  //               <td class="goHomeDetail" dept-id="${item.deptId || ""}" dept-name="${item.deptName || ""}" data-id="${item.entry_2900_id || ""}" data-name="${item.entry_2900_name || ""}">${item.entry_2900_num+'' || "-"}</td>            
+  //               <td class="goHomeDetail" dept-id="${item.deptId || ""}" dept-name="${item.deptName || ""}" data-id="${item.entry_2229_id || ""}" data-name="${item.entry_2229_name || ""}">${item.entry_2229_num+'' || "-"}</td>            
+  //               <td class="goHomeDetail" dept-id="${item.deptId || ""}" dept-name="${item.deptName || ""}" data-id="${item.entry_2220_id || ""}" data-name="${item.entry_2220_name || ""}">${item.entry_2220_num+'' || "-"}</td>            
+  //               <td class="goHomeDetail" dept-id="${item.deptId || ""}" dept-name="${item.deptName || ""}" data-id="${item.entry_2221_id || ""}" data-name="${item.entry_2221_name || ""}">${item.entry_2221_num+'' || "-"}</td>            
+  //               <td class="goHomeDetail" dept-id="${item.deptId || ""}" dept-name="${item.deptName || ""}" data-id="${item.entry_2655_id || ""}" data-name="${item.entry_2655_name || ""}">${item.entry_2655_num+'' || "-"}</td>            
+  //               <td class="goHomeDetail" dept-id="${item.deptId || ""}" dept-name="${item.deptName || ""}" data-id="${item.entry_2654_id || ""}" data-name="${item.entry_2654_name || ""}">${item.entry_2654_num+'' || "-"}</td>            
+  //               <td class="goHomeDetail" dept-id="${item.deptId || ""}" dept-name="${item.deptName || ""}" data-id="${item.entry_2218_id || ""}" data-name="${item.entry_2218_name || ""}">${item.entry_2218_num+'' || "-"}</td>            
+  //               <td class="goHomeDetail" dept-id="${item.deptId || ""}" dept-name="${item.deptName || ""}" data-id="${item.entry_2217_id || ""}" data-name="${item.entry_2217_name || ""}">${item.entry_2217_num+'' || "-"}</td>            
+  //               <td class="goHomeDetail" dept-id="${item.deptId || ""}" dept-name="${item.deptName || ""}" data-id="${item.entry_2495_id || ""}" data-name="${item.entry_2495_name || ""}">${item.entry_2495_num+'' || "-"}</td>            
+  //           </tr>
+  //       `
+  // }
   $('.key-list tbody').html(str?str:emptyBox())
   /*bindScoreDetail(hisId)*/
   // 跳转至详情页
@@ -200,10 +226,44 @@ function getDeptList(){
 
   })
 }
+//获取页面配置
+
+function getPageSet(){
+  const dateStatrt = getPickerDate($("#datepicker"),1)
+  const dateEnd = getPickerDate($("#datepicker2"),2)
+  const start = new Date(dateStatrt).getTime()
+  const end = new Date(dateEnd).getTime()
+  if(start > end){
+    $.alerModal({"message":'开始时间不能大于结束时间~',type:"tip",time:'1000',isFather: true, fatherWrapper: $("#mainBox", parent.document)});
+    return
+  }
+  const param = {
+    "name": deptName,
+    "asc":data_asc,     //升序
+    "desc":data_desc,       //降序
+    "startDate":dateStatrt.replace(/\//g,'-'),
+    "endDate":dateEnd.replace(/\//g,'-')
+  }
+  startDateParam = dateStatrt
+  endDateParam = dateEnd
+  post(api.unModifyMRStatistics,param).then(res =>{
+    if(res.data.code == '0'){
+      const data = res.data.data||[];
+      renderTabTitle(data)   //渲染Table表头
+    }else{
+      $.alerModal({"message":res.data.msg,type:"tip",time:'1000',isFather: true, fatherWrapper: $("#mainBox", parent.document)});
+    }
+  }).catch((e) =>{
+
+  })
+}
+getPageSet()
 
 // 渲染table表头
 function renderTabTitle(data){
-  data = data.columns 
+  
+  data = data.columns; 
+  // console.log(data,'1111111');
   let str = `
   <th class="moduleName" style="width: 65px;">序号</th>`
   for(let i = 0; i < data.length; i++){
@@ -215,6 +275,7 @@ function renderTabTitle(data){
       }
   }
   $(".tabTitle").html(str)
+  bindOrder()
 }
 
 function rendeDeptList(deptList){
@@ -260,21 +321,23 @@ $(document).on("click", function(){
   $(".selectDept .arrow").attr("src",iconDown)
 })
 // 上升下降筛选
-$("th[code]").on("click",function(e){
-  const code=$(this).attr("code");
-  if(data_asc==code){
-    data_desc=code;
-    data_asc="";
-    $("th[code]").removeClass("asc desc");
-    $(this).addClass("desc");
-  }else{
-    data_desc="";
-    data_asc=code;
-    $("th[code]").removeClass("asc desc");
-    $(this).addClass("asc");
-  }
-  getTabData(1);
-});
+function bindOrder(){
+  $("th[code]").off("click").on("click",function(e){
+    const code=$(this).attr("code");
+    if(data_asc==code){
+      data_desc=code;
+      data_asc="";
+      $("th[code]").removeClass("asc desc");
+      $(this).addClass("desc");
+    }else{
+      data_desc="";
+      data_asc=code;
+      $("th[code]").removeClass("asc desc");
+      $(this).addClass("asc");
+    }
+    getTabData(1);
+  });
+}
 
 
 //分页渲染
@@ -338,6 +401,11 @@ function renderPagination(totalPage,activePage,totalNum){
 
 }
 
+$(".patientNumInp").on("input", function(e){
+  const val = $(this).val().trim()
+  deptName = val
+})
+
 $(function() {
   const  iconCalenBlue= require("./../images/icon_calen_blue.png")
   const  iconCalenGrey= require("./../images/icon_calen_grey.png")

src/js/utils.js

@@ -3,7 +3,7 @@ const $ = require("jquery");
 const axios = require("axios")
 var Utils = require('./rePromise');
 require('./scrollBar.js');
-const baseUrl = "http://192.168.2.236:5858"
+const baseUrl = "http://192.168.2.241:5858"
 //页面映射
 const pageMap={
   'YH-KZT':'console.html',