瀏覽代碼

时效性报表bug

xtf 10 月之前
父節點
當前提交
ebb3a186b8

文件差異過大導致無法顯示
+ 1198 - 0
src/css/abnormal.css


文件差異過大導致無法顯示
+ 1345 - 0
src/css/reset.css


src/css/uncorrectedCasesStatisticsAdm.css → src/css/uncorrectedCasesStatistics.css


+ 8 - 5
src/css/uncorrectedCasesStatisticsAdm.less

@@ -303,12 +303,13 @@
   }
   }
   .ui-datepicker thead {
   .ui-datepicker thead {
     background-color: #fff;
     background-color: #fff;
-    color: #c3cbd6;
+    color: #c3cbd6 !important;
   }
   }
-  .ui-datepicker td {
+  .ui-datepicker  td {
     padding: 0;
     padding: 0;
     height: auto;
     height: auto;
-    color: #657180;
+    color: white !important;
+    background-color: #fff !important;
   }
   }
   .ui-datepicker td span, .ui-datepicker td a {
   .ui-datepicker td span, .ui-datepicker td a {
     text-align: center;
     text-align: center;
@@ -344,10 +345,12 @@
     color: #657180;
     color: #657180;
   }
   }
   .ui-widget-header {
   .ui-widget-header {
-    background-color: #fff;
-    border: 0 none;
+    background-color: #fff !important;
+    border: none !important;
   }
   }
 
 
+
+
   input::-webkit-outer-spin-button,
   input::-webkit-outer-spin-button,
   input::-webkit-inner-spin-button {
   input::-webkit-inner-spin-button {
     -webkit-appearance: none;
     -webkit-appearance: none;

+ 18 - 1
src/html/uncorrectedCasesStatisticsAdm.html

@@ -6,6 +6,23 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <meta http-equiv="X-UA-Compatible" content="ie=edge">
     <meta http-equiv="X-UA-Compatible" content="ie=edge">
     <title>时效性相关统计(管理员)</title>
     <title>时效性相关统计(管理员)</title>
+    <style>
+        .ui-datepicker-title{
+            background-color: white!important;
+        }
+        .ui-widget-header{
+            background-color: white!important;
+            border: none!important;
+        }
+
+        .ui-state-default{
+            background-color: white!important;
+            border: none!important;
+        }
+        .ui-state-default:hover{
+            background-color: #c4d8fe!important;
+        }
+    </style>
 </head>
 </head>
 
 
 <body>
 <body>
@@ -21,7 +38,7 @@
         <div class="filterBox clearfix">
         <div class="filterBox clearfix">
             <span class="filterItem typeFilter">
             <span class="filterItem typeFilter">
                 <span>规则名称:</span>
                 <span>规则名称:</span>
-                <input type="text" class="selectDept canEditDept" value="全部">
+                <input type="text" class="selectDept canEditDept" value="首次病程未在患者入院8小时内完成(杭州七院标准版)">
                 <ul class="deptList filterDropList"></ul>
                 <ul class="deptList filterDropList"></ul>
             </span>
             </span>
             <span class="filterItem typeFilter clearfix dataSelectLight">
             <span class="filterItem typeFilter clearfix dataSelectLight">

+ 2 - 2
src/js/qcScore.js

@@ -1063,8 +1063,8 @@ $(function () {
     const posClass = position === 1 ? 'text-left' : '';
     const posClass = position === 1 ? 'text-left' : '';
     const boldClass = bold === 1 ? 'text-bold' : '';
     const boldClass = bold === 1 ? 'text-bold' : '';
     const retractClass = retract === 1 ? 'text-indent' : '';
     const retractClass = retract === 1 ? 'text-indent' : '';
-    const lineHml = ('<p class="' + posClass + ' ' + boldClass + ' ' + retractClass + '">' + extractVars(val) + '</p>');
-    const txtHml = ('<p style="display: inline;vertical-align: middle;" class="' + posClass + ' ' + boldClass + ' ' + retractClass + '">' + extractVars(val) + '</p>');
+    const lineHml = ('<p class="' + posClass + ' ' + boldClass + ' ' + retractClass + '" contenteditable="true">'+ extractVars(val) + '</p>');
+    const txtHml = ('<p style="display: inline;vertical-align: middle;" class="' + posClass + ' ' + boldClass + ' ' + retractClass +'" contenteditable="true">' + extractVars(val) + '</p>');
 
 
     let hml = addLine || monoLine ? `<div class="cont ${posClass}" style="width: 100%;" id="anchor${id}">` : `<div class="cont" id="anchor${id}">`;
     let hml = addLine || monoLine ? `<div class="cont ${posClass}" style="width: 100%;" id="anchor${id}">` : `<div class="cont" id="anchor${id}">`;
     hml = hml + `<span class="label">${name}</span>` + (addLine ? lineHml : txtHml) + `</div>`;
     hml = hml + `<span class="label">${name}</span>` + (addLine ? lineHml : txtHml) + `</div>`;

+ 1 - 1
src/js/roleManager.js

@@ -23,7 +23,7 @@ $(function(){
     $(".role .rightMenu").css({"height":$(window).height()-88+'px',"width":$(".filterBox").width()-400+'px'})
     $(".role .rightMenu").css({"height":$(window).height()-88+'px',"width":$(".filterBox").width()-400+'px'})
     $(".saveRoleSet").click(function(){//保存角色设置
     $(".saveRoleSet").click(function(){//保存角色设置
         getParams()
         getParams()
-        $.alerModal({type:"loading"});
+        // $.alerModal({type:"loading"});
         let params = {
         let params = {
             "roleId": curId,
             "roleId": curId,
             "sysMenuSaveVOList": menuIdLis,
             "sysMenuSaveVOList": menuIdLis,

+ 1 - 1
src/js/uncorrectedCasesStatistics.js

@@ -143,7 +143,7 @@ function formatTableData(data){
 function renderTab(data,hisId,activePage){
 function renderTab(data,hisId,activePage){
   let formatColumns = formatTableData(data.columns)
   let formatColumns = formatTableData(data.columns)
   data = data.data;
   data = data.data;
-  console.log(data);
+  console.log(formatColumns);
   
   
   let str = ``
   let str = ``
   for(let i = 0; i < data.length; i++){
   for(let i = 0; i < data.length; i++){

+ 140 - 22
src/js/uncorrectedCasesStatisticsAdm.js

@@ -25,7 +25,8 @@ let endDateParam = getUrlArgObjectNew("endDateParam", srcUrl) || ""
 //setTitleTxt('',from)         //导航栏面包屑
 //setTitleTxt('',from)         //导航栏面包屑
 let isPlacefile = getCookie('isPlacefile') || 1
 let isPlacefile = getCookie('isPlacefile') || 1
 let tableType = 1;
 let tableType = 1;
-let timelinessId;
+let timelinessId = "3241";
+let globaltableData = [];
 listenScroll()
 listenScroll()
 if (statisticsType == 1) {
 if (statisticsType == 1) {
   setDatePicker($("#datepicker"), $("#datepicker2"), 1)
   setDatePicker($("#datepicker"), $("#datepicker2"), 1)
@@ -47,14 +48,14 @@ $(".abnormalClear").click(function () {
   deptIdTemp = "";
   deptIdTemp = "";
   deptName = "";
   deptName = "";
   deptNameTemp = "";
   deptNameTemp = "";
-  casesEntryIds = "";
+  casesEntryId = "";
   setDatePicker($("#datepicker"), $("#datepicker2"), "default")
   setDatePicker($("#datepicker"), $("#datepicker2"), "default")
-  $(".selectDept").attr({ 'title': "全部", 'data-id': '' }).val("全部")
+  $(".selectDept").attr({ 'title': "", 'data-id': '' }).val("")
   $('.patientNumInp').val('')
   $('.patientNumInp').val('')
   $("th[code]").removeClass("asc desc")
   $("th[code]").removeClass("asc desc")
   //behospitalCode =behospitalCodeTemp= ""
   //behospitalCode =behospitalCodeTemp= ""
   getDeptList()
   getDeptList()
-  getTabData(1)  
+  getTabData(1)
 
 
 })
 })
 $(".partTitle a").click(function () {
 $(".partTitle a").click(function () {
@@ -82,7 +83,7 @@ function getTabData(activePage) {
   const dateEnd = getPickerDate($("#datepicker2"), 2)
   const dateEnd = getPickerDate($("#datepicker2"), 2)
   const start = new Date(dateStatrt).getTime()
   const start = new Date(dateStatrt).getTime()
   const end = new Date(dateEnd).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) });
     $.alerModal({ "message": '开始时间不能大于结束时间~', type: "tip", time: '1000', isFather: true, fatherWrapper: $("#mainBox", parent.document) });
     return
     return
   }
   }
@@ -96,7 +97,7 @@ function getTabData(activePage) {
     //"type": 0, //1-本月,2-本年,0-自定义时间(现在所有都是自定义时间,都会传开始日期和结束日期)
     //"type": 0, //1-本月,2-本年,0-自定义时间(现在所有都是自定义时间,都会传开始日期和结束日期)
     "startDate": dateStatrt.replace(/\//g, '-'),
     "startDate": dateStatrt.replace(/\//g, '-'),
     "endDate": dateEnd.replace(/\//g, '-'),
     "endDate": dateEnd.replace(/\//g, '-'),
-    "casesEntryIds":[timelinessId]
+    "casesEntryId": timelinessId,
   }
   }
   startDateParam = dateStatrt
   startDateParam = dateStatrt
   endDateParam = dateEnd
   endDateParam = dateEnd
@@ -110,11 +111,13 @@ function getTabData(activePage) {
   }
   }
   post(url, param).then(res => {
   post(url, param).then(res => {
     if (res.data.code == '0') {
     if (res.data.code == '0') {
-      const data = res.data.data || [];
-      renderTabTitle(data)
-
+      globaltableData = res.data.data || [];
+      globaltableData.data.sort((a, b) => new Date(b.behospitalDate) - new Date(a.behospitalDate));
+      renderTabTitle(globaltableData)
+      renderTab(globaltableData, globaltableData.hospitalId, activePage);
       // if (isfirstRenderTitle === false) { renderTabTitle(data) }  //首次渲染渲染Table表头
       // if (isfirstRenderTitle === false) { renderTabTitle(data) }  //首次渲染渲染Table表头
-      renderTab(data, data.hospitalId, activePage);
+      // globaltableData = data;
+      //  renderTab(data, data.hospitalId, activePage);
       renderPagination(totalPage, Number(activePage), totalNum)
       renderPagination(totalPage, Number(activePage), totalNum)
       if (totalPage > 1) {
       if (totalPage > 1) {
         renderPagination(totalPage, Number(activePage), totalNum)
         renderPagination(totalPage, Number(activePage), totalNum)
@@ -136,7 +139,7 @@ $(".filter").on("click", function (e) {
   deptName = deptNameTemp;
   deptName = deptNameTemp;
   behospitalCode = behospitalCodeTemp;
   behospitalCode = behospitalCodeTemp;
   if (deptName == "") {
   if (deptName == "") {
-    $(".selectDept").attr({ 'title': "全部", 'data-id': '' }).val("全部")
+    $(".selectDept").attr({ 'title': "入院记录未在患者入院24小时内完成(杭州七院标准版)", 'data-id': '' }).val("入院记录未在患者入院24小时内完成(杭州七院标准版)")
   }
   }
   getTabData(1)
   getTabData(1)
 })
 })
@@ -154,6 +157,8 @@ function formatTableData(data) {
 function renderTab(data, hisId, activePage) {
 function renderTab(data, hisId, activePage) {
   let formatColumns = formatTableData(data.columns)
   let formatColumns = formatTableData(data.columns)
   data = data.data;
   data = data.data;
+
+
   // console.log("renderTab", data);
   // console.log("renderTab", data);
 
 
   let str = ``
   let str = ``
@@ -194,7 +199,6 @@ function renderTab(data, hisId, activePage) {
   `
   `
     }
     }
   }
   }
-  console.log("str", str)
   $('.key-list tbody').html(str ? str : emptyBox())
   $('.key-list tbody').html(str ? str : emptyBox())
   /*bindScoreDetail(hisId)*/
   /*bindScoreDetail(hisId)*/
   // 跳转至详情页
   // 跳转至详情页
@@ -231,7 +235,7 @@ $('.selectDept').on("input", function (e) {
 //获取科室列表
 //获取科室列表
 getDeptList()
 getDeptList()
 function getDeptList(val) {
 function getDeptList(val) {
-  post(api.getTimelinessList, { inputStr: val == "全部" ? "" : val || "" }).then(res => {
+  post(api.getTimelinessList, { inputStr: val == "首次病程未在患者入院8小时内完成(杭州七院标准版)" ? "" : val || "" }).then(res => {
     if (res.data.code == '0') {
     if (res.data.code == '0') {
       const deptList = res.data.data || []
       const deptList = res.data.data || []
       // console.log("111111111", deptList);
       // console.log("111111111", deptList);
@@ -269,7 +273,7 @@ function bindDeptSelect() {
     timelinessId = $(this).attr("data-id")
     timelinessId = $(this).attr("data-id")
     // console.log(timelinessId);
     // console.log(timelinessId);
 
 
-    getTabData(1)
+
     const deptItemName = $(this).attr("data-name")
     const deptItemName = $(this).attr("data-name")
     const deptItemId = $(this).attr("data-id")
     const deptItemId = $(this).attr("data-id")
     deptIdTemp = deptItemId;
     deptIdTemp = deptItemId;
@@ -329,7 +333,7 @@ function renderTabTitle(data) {
     if (item.isShow == 1) {
     if (item.isShow == 1) {
       // showNum++
       // showNum++
       // str += `<th class="textCenter ${item.val} ${item.val =='leaveHospitalDate' ? 'desc':''}" code="${item.val}">${item.name}</th>`
       // str += `<th class="textCenter ${item.val} ${item.val =='leaveHospitalDate' ? 'desc':''}" code="${item.val}">${item.name}</th>`
-      str += `<th class="textCenter beHospitalId" code="${item.timelinessId}">${item.columnName}</th>`
+      str += `<th class="textCenter beHospitalId" code="${item.columnName}">${item.columnName}</th>`
     }
     }
   }
   }
   $(".tabTitle").html(str)
   $(".tabTitle").html(str)
@@ -353,19 +357,129 @@ function hideLoading() {
 function bindOrder() {
 function bindOrder() {
   $("th[code]").off("click").on("click", function (e) {
   $("th[code]").off("click").on("click", function (e) {
     const code = $(this).attr("code");
     const code = $(this).attr("code");
+    console.log(code, 'code');
+    let type
     if (data_asc == code) {
     if (data_asc == code) {
       data_desc = code;
       data_desc = code;
       data_asc = "";
       data_asc = "";
       $("th[code]").removeClass("asc desc");
       $("th[code]").removeClass("asc desc");
       $(this).addClass("desc");
       $(this).addClass("desc");
+      type = "desc"
     } else {
     } else {
       data_desc = "";
       data_desc = "";
       data_asc = code;
       data_asc = code;
       $("th[code]").removeClass("asc desc");
       $("th[code]").removeClass("asc desc");
       $(this).addClass("asc");
       $(this).addClass("asc");
+      type = "asc"
+    }
+    // getTabData(1);
+    console.log("数据", globaltableData);
+    switch (code) {
+      case "病人住院序号":
+        // tableSort("patientId",type)
+        globaltableData.data.sort((a, b) => {
+          if (type === "asc") {
+            return new Number(a.behospitalCode) - new Number(b.behospitalCode)
+          } else {
+            return new Number(b.behospitalCode) - new Number(a.behospitalCode)
+          }
+        })
+        break
+      case "病人姓名":
+        globaltableData.data.sort((a, b) => {
+          if (type === "asc") {
+            return a.name.localeCompare(b.name)
+          } else {
+            return b.name.localeCompare(a.name)
+          }
+        })
+        break
+      case "性别":
+        globaltableData.data.sort((a, b) => {
+          if (type === "asc") {
+            return a.sex.localeCompare(b.sex)
+          } else {
+            return b.sex.localeCompare(a.sex)
+          }
+        })
+        break
+      case "病案号":
+        globaltableData.data.sort((a, b) => {
+          if (type === "asc") {
+            return new Number(a.fileCode) - new Number(b.fileCode)
+          } else {
+            return new Number(b.fileCode) - new Number(a.fileCode)
+          }
+        })
+        break
+      case "主管医生":
+        globaltableData.data.sort((a, b) => {
+          if (type === "asc") {
+            return a.doctorName.localeCompare(b.doctorName)
+          } else {
+            return b.doctorName.localeCompare(a.doctorName)
+          }
+        })
+        break
+      case "住院科室":
+        globaltableData.data.sort((a, b) => {
+          if (type === "asc") {
+            return a.behDeptName.localeCompare(b.behDeptName)
+          } else {
+            return b.behDeptName.localeCompare(a.behDeptName)
+          }
+        })
+        break
+      case "规则名称":
+        globaltableData.data.sort((a, b) => {
+          if (type === "asc") {
+            return a.ruleName.localeCompare(b.ruleName)
+          } else {
+            return b.ruleName.localeCompare(a.ruleName)
+          }
+        })
+        break
+      case "入院日期":
+        globaltableData.data.sort((a, b) => {
+          if (type === "asc") {
+            return new Date(a.behospitalDate) - new Date(b.behospitalDate)
+          } else {
+            return new Date(b.behospitalDate) - new Date(a.behospitalDate)
+          }
+        })
+        break
+      case "首次病程创建时间":
+        globaltableData.data.sort((a, b) => {
+          if (type === "asc") {
+            return new Date(a.behospitalGmtCreate) - new Date(b.behospitalGmtCreate)
+          } else {
+            return new Date(b.behospitalGmtCreate) - new Date(a.behospitalGmtCreate)
+          }
+        })
+        break
+      case "是否归档":
+        globaltableData.data.sort((a, b) => {
+          if (type === "asc") {
+            return new Number(a.isPlacefile) - new Number(b.isPlacefile)
+          } else {
+            return new Number(b.isPlacefile) - new Number(a.isPlacefile)
+          }
+        })
+        break
+      case "备注":
+        globaltableData.data.sort((a, b) => {
+          if (type === "asc") {
+            return a.remark.localeCompare(b.remark)
+          } else {
+            return b.remark.localeCompare(a.remark)
+          }
+        })
+      default:
+        return
     }
     }
-    getTabData(1);
+    renderTab(globaltableData, globaltableData.hospitalId, 1);
   });
   });
+  
 }
 }
 
 
 
 
@@ -455,6 +569,8 @@ $(function () {
       $.alerModal({ "message": '开始时间不能大于结束时间~', type: "tip", time: '1000', isFather: true, fatherWrapper: $("#mainBox", parent.document) });
       $.alerModal({ "message": '开始时间不能大于结束时间~', type: "tip", time: '1000', isFather: true, fatherWrapper: $("#mainBox", parent.document) });
       return
       return
     }
     }
+  let limitTime= 3 * 30 * 24 * 60 * 60 * 1000; 
+
     const param = {
     const param = {
 
 
       //"type": 0, //1-本月,2-本年,0-自定义时间(现在所有都是自定义时间,都会传开始日期和结束日期)
       //"type": 0, //1-本月,2-本年,0-自定义时间(现在所有都是自定义时间,都会传开始日期和结束日期)
@@ -462,12 +578,14 @@ $(function () {
       "endDate": end
       "endDate": end
 
 
     }
     }
-    expJson(api.AdmunModifyMRSExportByDept, param).then(res => {
-      downloadExportedData(res.data, "时效性相关统计管理员.xls")
-    })
-
-
-
+    if(start-end<limitTime){
+      $.alerModal({ "message": '最多只能导出90天', type: "tip", time: '1000', isFather: true, fatherWrapper: $("#mainBox", parent.document) });
+      return
+    }else{
+      expJson(api.AdmunModifyMRSExportByDept, param).then(res => {
+        downloadExportedData(res.data, "时效性相关统计管理员.xls")
+      })
+    }
     //  初始渲染TableTitle
     //  初始渲染TableTitle
     // getPageSet().then(res =>{
     // getPageSet().then(res =>{
     //   $(".filter").click();   //初始查询
     //   $(".filter").click();   //初始查询

+ 1 - 1
webpack.config.js

@@ -9,7 +9,7 @@ const webpack = require('webpack');
 const glob = require('glob');
 const glob = require('glob');
 // const proxyHost = "http://192.168.2.236:5858";
 // const proxyHost = "http://192.168.2.236:5858";
 // const proxyHost = "http://192.168.3.184:5859";
 // const proxyHost = "http://192.168.3.184:5859";
-const proxyHost = "http://172.16.8.12:5859"; //正式
+const proxyHost = "http://172.16.8.64:5858"; //正式
 // const proxyHost = "http://www.diagbot.net:5858/"; //测试
 // const proxyHost = "http://www.diagbot.net:5858/"; //测试
 // const proxyHost = "http://192.168.4.222:5858";
 // const proxyHost = "http://192.168.4.222:5858";
 // const proxyHost = "http://192.168.3.117:5858";//铁钢
 // const proxyHost = "http://192.168.3.117:5858";//铁钢