Browse Source

Merge branch 'lcq' into test

# Conflicts:
#	src/js/uncorrectedCasesStatistics.js
morphone1995 4 years ago
parent
commit
51d5947894

+ 5 - 0
src/css/index.less

@@ -887,6 +887,11 @@
       color: #fff;
       margin-left: 20px;
     }
+    .defaultColSet{
+      position: relative;
+      left: 50px;
+      cursor: pointer;
+    }
   }
   .mask {
     position: fixed;

+ 35 - 0
src/css/qcList.less

@@ -342,6 +342,41 @@ h2{
 .activePage{
     color: @activeColor;
 }
+.tipIcon{
+  color: #777;
+  cursor: pointer;
+  display: inline-block;
+  margin-left: 6px;
+  margin-right: 2px;
+}
+.toolTipIcon{
+    width: 18px;
+    position: relative;
+    top: 3px;
+}
+
+.tooltip{
+    visibility: hidden;
+    position: relative;
+    padding: 7px 10px;
+    border-radius: 4px;
+    margin: 100px auto;
+    background-color: #4D4D4D;
+    text-align: center;
+    color: #fff;
+    font-size: 14px;
+}
+.tooltip:before{
+    content: '';
+    display: block;
+    position: absolute;
+    bottom: 9px;
+    left: -12px;
+    border-bottom: 6px solid transparent;
+    border-top: 6px solid transparent;
+    border-left: 6px solid transparent;
+    border-right: 6px solid #4D4D4D;
+}
 
 
 

+ 35 - 0
src/css/qcListCopy.less

@@ -359,6 +359,41 @@ h2{
 .activePage{
     color: @activeColor;
 }
+.tipIcon{
+  color: #777;
+  cursor: pointer;
+  display: inline-block;
+  margin-left: 6px;
+  margin-right: 2px;
+}
+.toolTipIcon{
+    width: 18px;
+    position: relative;
+    top: 3px;
+}
+
+.tooltip{
+    visibility: hidden;
+    position: relative;
+    padding: 7px 10px;
+    border-radius: 4px;
+    margin: 100px auto;
+    background-color: #4D4D4D;
+    text-align: center;
+    color: #fff;
+    font-size: 14px;
+}
+.tooltip:before{
+    content: '';
+    display: block;
+    position: absolute;
+    bottom: 9px;
+    left: -12px;
+    border-bottom: 6px solid transparent;
+    border-top: 6px solid transparent;
+    border-left: 6px solid transparent;
+    border-right: 6px solid #4D4D4D;
+}
 
 
 

+ 36 - 1
src/css/qcListDept.less

@@ -398,4 +398,39 @@ input::-webkit-inner-spin-button {
  
 input[type="number"] {
     -moz-appearance: textfield;
-}
+}
+.tipIcon{
+  color: #777;
+  cursor: pointer;
+  display: inline-block;
+  margin-left: 6px;
+  margin-right: 2px;
+}
+.toolTipIcon{
+    width: 18px;
+    position: relative;
+    top: 3px;
+}
+
+.tooltip{
+    visibility: hidden;
+    position: relative;
+    padding: 7px 10px;
+    border-radius: 4px;
+    margin: 100px auto;
+    background-color: #4D4D4D;
+    text-align: center;
+    color: #fff;
+    font-size: 14px;
+}
+.tooltip:before{
+    content: '';
+    display: block;
+    position: absolute;
+    bottom: 9px;
+    left: -12px;
+    border-bottom: 6px solid transparent;
+    border-top: 6px solid transparent;
+    border-left: 6px solid transparent;
+    border-right: 6px solid #4D4D4D;
+}

+ 36 - 0
src/css/qcListDocteam.less

@@ -396,4 +396,40 @@ input::-webkit-inner-spin-button {
  
 input[type="number"] {
     -moz-appearance: textfield;
+}
+
+.tipIcon{
+  color: #777;
+  cursor: pointer;
+  display: inline-block;
+  margin-left: 6px;
+  margin-right: 2px;
+}
+.toolTipIcon{
+    width: 18px;
+    position: relative;
+    top: 3px;
+}
+
+.tooltip{
+    visibility: hidden;
+    position: relative;
+    padding: 7px 10px;
+    border-radius: 4px;
+    margin: 100px auto;
+    background-color: #4D4D4D;
+    text-align: center;
+    color: #fff;
+    font-size: 14px;
+}
+.tooltip:before{
+    content: '';
+    display: block;
+    position: absolute;
+    bottom: 9px;
+    left: -12px;
+    border-bottom: 6px solid transparent;
+    border-top: 6px solid transparent;
+    border-left: 6px solid transparent;
+    border-right: 6px solid #4D4D4D;
 }

+ 37 - 0
src/css/qcListOutHospital.less

@@ -368,6 +368,43 @@ h2{
 }
 
 
+.tipIcon{
+  color: #777;
+  cursor: pointer;
+  display: inline-block;
+  margin-left: 6px;
+  margin-right: 2px;
+}
+.toolTipIcon{
+    width: 18px;
+    position: relative;
+    top: 3px;
+}
+
+.tooltip{
+    visibility: hidden;
+    position: relative;
+    padding: 7px 10px;
+    border-radius: 4px;
+    margin: 100px auto;
+    background-color: #4D4D4D;
+    text-align: center;
+    color: #fff;
+    font-size: 14px;
+}
+.tooltip:before{
+    content: '';
+    display: block;
+    position: absolute;
+    bottom: 9px;
+    left: -12px;
+    border-bottom: 6px solid transparent;
+    border-top: 6px solid transparent;
+    border-left: 6px solid transparent;
+    border-right: 6px solid #4D4D4D;
+}
+
+
 
 
 

+ 37 - 1
src/css/qcListPerson.less

@@ -400,4 +400,40 @@ input::-webkit-inner-spin-button {
  
 input[type="number"] {
     -moz-appearance: textfield;
-}
+}
+
+.tipIcon{
+  color: #777;
+  cursor: pointer;
+  display: inline-block;
+  margin-left: 6px;
+  margin-right: 2px;
+}
+.toolTipIcon{
+    width: 18px;
+    position: relative;
+    top: 3px;
+}
+
+.tooltip{
+    visibility: hidden;
+    position: relative;
+    padding: 7px 10px;
+    border-radius: 4px;
+    margin: 100px auto;
+    background-color: #4D4D4D;
+    text-align: center;
+    color: #fff;
+    font-size: 14px;
+}
+.tooltip:before{
+    content: '';
+    display: block;
+    position: absolute;
+    bottom: 9px;
+    left: -12px;
+    border-bottom: 6px solid transparent;
+    border-top: 6px solid transparent;
+    border-left: 6px solid transparent;
+    border-right: 6px solid #4D4D4D;
+}

+ 35 - 0
src/css/uccDetail.less

@@ -360,6 +360,41 @@ h2{
     color: @activeColor;
 }
 
+.tipIcon{
+  color: #777;
+  cursor: pointer;
+  display: inline-block;
+  margin-left: 6px;
+  margin-right: 2px;
+}
+.toolTipIcon{
+    width: 18px;
+    position: relative;
+    top: 3px;
+}
+
+.tooltip{
+    visibility: hidden;
+    position: relative;
+    padding: 7px 10px;
+    border-radius: 4px;
+    margin: 100px auto;
+    background-color: #4D4D4D;
+    text-align: center;
+    color: #fff;
+    font-size: 14px;
+}
+.tooltip:before{
+    content: '';
+    display: block;
+    position: absolute;
+    bottom: 9px;
+    left: -12px;
+    border-bottom: 6px solid transparent;
+    border-top: 6px solid transparent;
+    border-left: 6px solid transparent;
+    border-right: 6px solid #4D4D4D;
+}
 
 
 

+ 2 - 0
src/html/readmission.html

@@ -115,6 +115,8 @@
                       <th class="beHospitalId textCenter">主诊断</th>
                       <th class="beHospitalId textCenter">入院日期</th>
                       <th class="beHospitalId textCenter">出院日期</th>
+                      <th class="beHospitalId textCenter">住院天数</th>
+                      <th class="beHospitalId textCenter">住院花费(元)</th>
                       <!-- <th class="beHospitalId textCenter">入院日期</th> -->
                       <th class="beHospitalId textCenter">间隔天数</th>
                     </tr>

BIN
src/images/toolTip.png


+ 6 - 0
src/js/api.js

@@ -98,6 +98,10 @@ const api = {
     unModifyMRStatistics: '/console/unModifyMRStatistics',  //未整改病历统计
     unModifyMRPage: '/console/unModifyMRPage', //未整改病历质控评分页(内页)
     reHos31DaysPage: '/console/reHos31DaysPage', //31天再入院人数(内页)
+    qcCheckMRPage: '/console/qcCheckMRPage', //质控核查质控评分页(内页)
+    hmImproveMRPage: '/console/hmImproveMRPage',  //病案首页改善率质控评分页(内页)
+    getDefaultPageSet: '/sys/user/pageset/getDefaultPageSet', //获取默认列设置
+
 
 
     //导出接口
@@ -115,6 +119,8 @@ const api = {
     unModifyMRPageExport:'/console/export/unModifyMRPageExport',//未整改病历详情页导出
     unModifyMRStatisticsExport:'/console/export/unModifyMRStatisticsExport', //未整改病历统计导出
     reHos31DaysPageExport:'/console/export/reHos31DaysPageExport', //31天再入院统计导出
+    qcCheckMRPageExport:'/console/export/qcCheckMRPageExport',  //质控核查质控评分页导出
+    hmImproveMRPageExport:'/console/export/hmImproveMRPageExport',//病案首页改善率质控评分页导出
 
 
     casesEntryStatisticsById:'/console/casesEntryStatisticsById', //入院记录24小时未完成

+ 24 - 9
src/js/checkControl.js

@@ -176,23 +176,38 @@ function renderTab(data,hisId,activePage){
             <tr  data-index=${i}>
                 <td class="textCenter">${(activePage-1)*15 + i+1}</td>
                 <td>${item.deptName || "-"}</td>
-                <td>${item.mrNum +''|| "-"}</td>
-                <td>${item.checkedNum+'' || "-"}</td>
-                <td>${item.improveNum+'' || "-"}</td>
+                <td class="goHomeDetail" dept-id="${item.deptId || ""}" dept-name="${item.deptName || ""}" data-check="0">${item.mrNum +''|| "-"}</td>
+                <td class="goHomeDetail" dept-id="${item.deptId || ""}" dept-name="${item.deptName || ""}" data-check="1">${item.checkedNum+'' || "-"}</td>
+                <td class="goHomeDetail" dept-id="${item.deptId || ""}" dept-name="${item.deptName || ""}" data-improve="1">${item.improveNum+'' || "-"}</td>
                 <td>${item.improvePercentStr || "-"}</td>
-                <td>${item.improveToPassNum+'' || "-"}</td>
+                <td class="goHomeDetail" dept-id="${item.deptId || ""}" dept-name="${item.deptName || ""}" data-improve="2">${item.improveToPassNum+'' || "-"}</td>
                 <td>${item.improveToPassPercentStr || "-"}</td>
-                <td>${item.improveToFullNum +''|| "-"}</td>
+                <td class="goHomeDetail" dept-id="${item.deptId || ""}" dept-name="${item.deptName || ""}" data-improve="3">${item.improveToFullNum +''|| "-"}</td>
                 <td>${item.improveToFullPercentStr || "-"}</td>
             </tr>
         `
     }
     $('.tbody').html(str?str:emptyBox())
     bindScoreDetail(hisId)
-    $(".goHomeDetail").click(function(){
-        let deptName = $(this).attr("data-dept")
-        let ruleType = $(this).attr("data-ruleType")
-        $(parent.document).find("#contentIframe").attr("src","quexianDetailControlHome.html?deptName="+deptName+"&from=1&casesId=243"+"&shijian=3"+"&ruleType="+ruleType+"&startDateParam="+startDateParam+"&endDateParam="+endDateParam)
+    $(".goHomeDetail").click(function () {
+        let id = $(this).attr("dept-id");
+        let casesName = $(this).attr("data-name");
+        let casesId = $(this).attr("data-id");
+        let name = $(this).attr("dept-name");
+        let checkStatus = $(this).attr("data-check");
+        let improveType = $(this).attr("data-improve");
+        name = name === "全院" ? "全部" : name;
+        if (checkStatus === '1') {
+            // 核查数量跳转
+            $(parent.document).find("#contentIframe").attr("src", "qcListCopy.html?from=7&deptName=" + name + "&deptId=" + id + "&casesEntryId=" + casesId + "&defectName=" + casesName + "&startDate=" + startDateParam + "&endDate=" + endDateParam)
+            // return 
+        } else if(checkStatus === '0'){
+            // 质控总数跳转
+            $(parent.document).find("#contentIframe").attr("src", "qcListCopy.html?from=8&deptName=" + name + "&deptId=" + id + "&casesEntryId=" + casesId + "&defectName=" + casesName + "&startDate=" + startDateParam + "&endDate=" + endDateParam )
+        }else{
+            $(parent.document).find("#contentIframe").attr("src", "qcListCopy.html?from=6&deptName=" + name + "&deptId=" + id + "&casesEntryId=" + casesId + "&defectName=" + casesName + "&startDate=" + startDateParam + "&endDate=" + endDateParam + "&improveType=" + improveType)
+        }
+
     })
 
     // initScroll("partDetailControl","YX",1)

+ 39 - 2
src/js/qcList.js

@@ -590,11 +590,14 @@ function renderTabTitle(data){
             })}">${item.name}</th>`
         }
     }
+    // <span class="setCol"><img class="iconSetting" src=${require('./../images/setting.png')} alt="关闭" />列设置</span>
     let operStr=`<td colspan="${showNum+2}" style="background: #fff">
         <div class="tabFoot">
             <span class="scoreOpera" data-selectAll=false><img class="iconCheck" src="${iconUnCheck}" alt="checkbox">全选</span>
             <span class="recordScoreBtn">评分</span>
-            <span class="setCol"><img class="iconSetting" src=${require('./../images/setting.png')} alt="关闭" />列设置</span>
+            <span class="setCol">列设置</span>
+            <span class="tipIcon"><img class="toolTipIcon" src=${require('./../images/toolTip.png')} alt="关闭" /></span>    
+            <span class="tooltip">可设置列的隐藏、显示及排序</span>
         </div>
     </td>`
     $(".tabOpera").html(operStr)
@@ -604,12 +607,25 @@ function renderTabTitle(data){
     bindRecordScoreBtn()
     bindSetCol()
     bindOrder()
+    bindToolTip()
+}
+function bindToolTip() {
+    $('.tipIcon').off("hover").hover(function () {
+        $('.tooltip').css('visibility', "visible")
+    }, function () {
+        $('.tooltip').css('visibility', "hidden")
+    })
 }
 
 function bindSetCol(){
     $(".setCol").off("click").on("click", function(){
         renderColSet(pageSetCopy)
     })
+    $('.setCol').off("hover").hover(function () {
+        $('.setCol').css('color', '#00A1FF')
+    }, function () {
+        $('.setCol').css('color', '#777777')
+    })
 }
 
 function rendeDeptList(deptList){
@@ -742,7 +758,7 @@ function renderColSet(list){
             <div class='cloInfobox'>
                 <div class='cloInfoTitle'><span class='cloInfoTitleTxt'>列显示设置</span> <img class="iconClose" src=${require('./../images/icon_close_default.png')} alt="关闭" /></div>
                 <div class='cloInfo'></div>
-                <div class='btnBox'> <span class='cancalColSet'>取消</span> <span class='saveColSet'>保存设置</span></div>
+                <div class='btnBox'> <span class='defaultColSet'>恢复默认</span> <span class='cancalColSet'>取消</span> <span class='saveColSet'>保存设置</span></div>
             </div>
         </div>`
     let infoStr = `<div class='colTabTitle' ><span class='colOpera toggleSelectColAll' data-select=${allSelect}>${allSelect  ? `<img  src=${iconCheck} />`:`<img src=${iconUnCheck} />`}全选</span><span  class='colName'>列名</span></div><div class='colTabInfoBox' >`
@@ -773,6 +789,7 @@ function renderColSet(list){
     bindSelectCol()
     bindColOrder()
     bindSaveColSet()
+    bindDefaultColset()
     bindCloseColSet()
     bindImgEnter()
 }
@@ -827,6 +844,26 @@ function bindCloseColSet(){
         closeColSet()
     })
 }
+function bindDefaultColset() {
+    $('.defaultColSet', parent.document).off("hover").hover(function () {
+        $(this).css('color', '#00A1FF')
+    }, function () {
+        $(this).css('color', '#777777')
+    })
+    $('.defaultColSet', parent.document).off("click").on('click', function () {
+        return post(api.getDefaultPageSet, { pageType: 1 }).then(res => {
+            if (res.data.code == '0') {               
+                pageSet = res.data.data
+                pageSetCopy = JSON.parse(JSON.stringify(pageSet))
+                renderColSet(pageSetCopy)            
+            } else { }
+        }).catch((e) => {
+
+        })
+        // closeColSet()
+    })
+
+}
 function bindSaveColSet(){
     $(".saveColSet", parent.document ).off("click").on("click", function(){
         let showNumSet = 0

+ 126 - 20
src/js/qcListCopy.js

@@ -25,18 +25,19 @@ let srcUrl = $("#contentIframe",parent.document).attr("src")
 let statisticsType = getUrlArgObjectNew("dateType",srcUrl)||getUrlArgObjectNew("shijian",srcUrl) || "3"
 let chengdu = getUrlArgObjectNew("chengdu",srcUrl)||""
 let deptIdPram = getUrlArgObjectNew("deptId",srcUrl)||""
-let deptNamePram = getUrlArgObjectNew("deptName",srcUrl)||""
-let docName = getUrlArgObjectNew("docName",srcUrl)||""
-let startDateParam = getUrlArgObjectNew("startDate",srcUrl)||""
-let endDateParam = getUrlArgObjectNew("endDate",srcUrl)||""
-let from = getUrlArgObjectNew("from",srcUrl)||""
+let deptNamePram = getUrlArgObjectNew("deptName",srcUrl)||"";
+let docName = getUrlArgObjectNew("docName",srcUrl)||"";
+let startDateParam = getUrlArgObjectNew("startDate",srcUrl)||"";
+let endDateParam = getUrlArgObjectNew("endDate",srcUrl)||"";
+let from = getUrlArgObjectNew("from",srcUrl)||"";
 let defectName = getUrlArgObjectNew("defectName",srcUrl)||"";
 let casesEntryId = getUrlArgObjectNew("casesEntryId",srcUrl)|| "";
 let casesId = getUrlArgObjectNew("casesId",srcUrl)|| "";
-let  ruleType = getUrlArgObjectNew("ruleType",srcUrl)||""
-let isSingleReject = getUrlArgObjectNew("isSingleReject",srcUrl)||""
-let fromDays = getUrlArgObjectNew("fromDays", srcUrl) || ""
-let deptListDept = JSON.parse(getCookie("deptList"))||[]
+let  ruleType = getUrlArgObjectNew("ruleType",srcUrl)||"";
+let isSingleReject = getUrlArgObjectNew("isSingleReject",srcUrl)||"";
+let fromDays = getUrlArgObjectNew("fromDays", srcUrl) || "";
+let deptListDept = JSON.parse(getCookie("deptList"))||[];
+let improveType = getUrlArgObjectNew("improveType", srcUrl) || '';
 
 let currentPage;
 $(".selectLevel").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
@@ -85,24 +86,42 @@ if(deptIdPram&&deptNamePram){
 }
 if(from==2){
     $(".export").css('display','none')
-    $(".partTitle .titlePic ").html(`<a class="consoleD" href="deptConsole.html">控制台(科室) / </a><a class="consoleP" href="singleVeto.html?from=1">条目缺陷占比 / </a>缺陷详情`)
+    $(".partTitle .titlePic ").html(`<a class="consoleD" href="deptConsole.html">控制台(科室) / </a><a class="consoleP" href="singleVeto.html?from=1">条目缺陷占比 / </a>缺陷列表`)
     deptId=deptListDept[0]&&deptListDept[0].deptId; 
     deptName=deptListDept[0]&&deptListDept[0].deptName;
     deptNameTemp=deptListDept[0]&&deptListDept[0].deptName;
     deptIdTemp=deptListDept[0]&&deptListDept[0].deptId;
     $('.selectDept').html(deptName)
 }else if(from==3){
-  $(".partTitle .titlePic ").html(`<a href="keyItemFlawControl.html">关键条目缺陷占比 / </a>缺陷详情`)
+  $(".partTitle .titlePic ").html(`<a href="keyItemFlawControl.html">关键条目缺陷占比 / </a>病历列表`)
 }else if(from==4){
     // $(".qcFiliterItem").css("display","none")
     // 控制台 / 病案首页合格率占比 / 缺陷详情
     // $(".partTitle .titlePic ").html(`<a class="consoleD" href="console.html">控制台 / </a><a class="consoleP" href="singleVeto.html?from=1">条目缺陷占比 / </a><a class="defectDetail" href="quexianDetailControlHome.html">缺陷详情 / </a>病历详情`)
-    $(".partTitle .titlePic ").html(`<a class="consoleD" href="console.html">控制台 / </a><a class="consoleP" href="partDetailControl.html?from=1">病案首页合格率占比 / </a><a class="defectDetail" href="quexianDetailControlHome.html">缺陷详情 / </a>病历详情`)
+    $(".partTitle .titlePic ").html(`<a class="consoleD" href="console.html">控制台 / </a><a class="consoleP" href="partDetailControl.html?from=1">病案首页合格率占比 / </a><a class="defectDetail" href="quexianDetailControlHome.html">缺陷列表 / </a>病历列表`)
     $(".defectDetail").on("click",function(){
         $(parent.document).find("#contentIframe").attr("src","quexianDetailControlHome.html?deptName="+`${deptNamePram=="全部" ?"全院":deptNamePram}`+"&deptId="+deptIdPram+"&from=1&casesId=243"+"&shijian=3"+"&ruleType="+ruleType+"&startDateParam="+startDateParam+"&endDateParam="+endDateParam) 
     })
+}else if(from==9){
+    // 来自 各科室缺陷占比的跳转
+    $(".partTitle .titlePic ").html(`<a class="consoleD" href="console.html">控制台 / </a><a class="consoleP" href="deptScoreDetailControl.html?from=1">各科室缺陷占比 / </a><a class="defectDetail" href="quexianDetailControl.html">缺陷列表 / </a>病历列表`)
+    $(".defectDetail").on("click", function () {
+        $(parent.document).find("#contentIframe").attr("src", "quexianDetailControl.html?deptName=" + `${deptNamePram == "全部" ? "全院" : deptNamePram}` + "&deptId=" + deptIdPram + "&from=1&" + "&shijian=3"  + "&startDateParam=" + startDateParam + "&endDateParam=" + endDateParam)
+    })
+} else if (from == 8 || from == 7) {
+    // 来自 质控核查统计的跳转
+    $(".partTitle .titlePic ").html(`<a class="consoleD" href="console.html">控制台 / </a><a class="consoleP" href="checkControl.html?from=1">质控核查统计 / </a>病历列表`)
+    $(".defectDetail").on("click", function () {
+        $(parent.document).find("#contentIframe").attr("src", "checkControl.html?deptName=" + `${deptNamePram == "全部" ? "全院" : deptNamePram}` + "&deptId=" + deptIdPram + "&from=1&" + "&shijian=3" + "&startDateParam=" + startDateParam + "&endDateParam=" + endDateParam)
+    })
+} else if (from == 6) {
+    // 来自 质控核查统计的跳转 ---改善数量的跳转
+    $(".partTitle .titlePic ").html(`<a class="consoleD" href="console.html">控制台 / </a><a class="consoleP" href="checkControl.html?from=1">质控核查统计 / </a>病历列表`)
+    $(".defectDetail").on("click", function () {
+        $(parent.document).find("#contentIframe").attr("src", "checkControl.html?deptName=" + `${deptNamePram == "全部" ? "全院" : deptNamePram}` + "&deptId=" + deptIdPram + "&from=1&" + "&shijian=3" + "&startDateParam=" + startDateParam + "&endDateParam=" + endDateParam)
+    })
 }else{
-    $(".partTitle .titlePic ").html(`<a class="consoleD" href="console.html">控制台 / </a><a class="consoleP" href="singleVeto.html?from=1">条目缺陷占比 / </a>缺陷详情`)
+    $(".partTitle .titlePic ").html(`<a class="consoleD" href="console.html">控制台 / </a><a class="consoleP" href="singleVeto.html?from=1">条目缺陷占比 / </a>病历列表`)
 }
 $(".partTitle .consoleD").click(function(){
     //初始菜单选中   
@@ -138,6 +157,30 @@ $("#filterToggler").click(function(){
     }
     return false;
 }
+// 初始化请求列表接口
+function formatPostUrl(type) {
+    if(type==='2'){
+        return api.qcResultShortByDeptPage
+    } else if (type === '7' || type === '8'){
+        return api.qcCheckMRPage
+    } else if (type === '6') {
+        return api.hmImproveMRPage
+    }else{
+        return api.qcResultDefectList
+    }
+}
+// 初始化导出接口
+function formatExportUrl(type) {
+    if (type === '7' || type === '8') {
+        return api.qcCheckMRPageExport
+    } else if (type === '6') {
+        return api.hmImproveMRPageExport
+    }else {
+        // 默认导出接口
+        return api.qcResultShortPageExport
+    }
+}
+
 function getTabData(activePage){
     // 判断是否是 住院超过31日病人数   
     let beHosGT31Days = null
@@ -147,7 +190,7 @@ function getTabData(activePage){
     if (casesEntryId === 'undefined') {
         casesEntryId = ""
     }
-    const param = {
+    let param = {
         current:activePage,
         behospitalCode: behospitalCode,
         patName: name, //病人姓名
@@ -175,7 +218,18 @@ function getTabData(activePage){
         mrTimeStart: fpCheckDateStart.replace(/\//g,'-'), //首页核查起始时间
         mrTimeEnd: fpCheckDateEnd.replace(/\//g,'-'), //首页核查截止时间
     }
-    return post(from==2?api.qcResultShortByDeptPage:api.qcResultDefectList,param).then(res =>{
+    if (from == 9) {
+        param = { ...param, behDeptName: deptNamePram}
+    }
+    if (from == 7) {
+        param = { ...param, checkStatus: 1 }
+    }
+    if (from == 6) {
+        param = { ...param, improveType }
+    }
+
+    let url = formatPostUrl(from)
+    return post(url,param).then(res =>{
         if(res.data.code == '0'){
             const data = res.data.data;
             tabList = data.records;
@@ -673,11 +727,14 @@ function renderTabTitle(data){
             str += `<th class="textCenter ${item.val} ${item.val ==defaultOrder ? 'desc':''}" code="${item.val}">${item.name}</th>`
         }
     }
+    //    <span class="setCol"><img class="iconSetting" src=${require('./../images/setting.png')} alt="关闭" />列设置</span>
     let operStr=`<td colspan="${showNum+2}" style="background: #fff">
         <div class="tabFoot">
             <span class="scoreOpera" data-selectAll=false><img class="iconCheck" src="${iconUnCheck}" alt="checkbox">全选</span>
             <span class="recordScoreBtn">评分</span>
-            <span class="setCol"><img class="iconSetting" src=${require('./../images/setting.png')} alt="关闭" />列设置</span>
+            <span class="setCol">列设置</span>
+            <span class="tipIcon"><img class="toolTipIcon" src=${require('./../images/toolTip.png')} alt="关闭" /></span>    
+            <span class="tooltip">可设置列的隐藏、显示及排序</span>
         </div>
     </td>`
     $(".tabOpera").html(operStr)
@@ -687,14 +744,27 @@ function renderTabTitle(data){
     bindRecordScoreBtn()
     bindSetCol()
     bindOrder()
+    bindToolTip()
+}
+function bindToolTip() {
+    $('.tipIcon').off("hover").hover(function () {
+        $('.tooltip').css('visibility', "visible")
+    }, function () {
+        $('.tooltip').css('visibility', "hidden")
+    })
 }
-
 function bindSetCol(){
     $(".setCol").off("click").on("click", function(){
         renderColSet(pageSetCopy)
     })
+    $('.setCol').off("hover").hover(function () {
+        $('.setCol').css('color', '#00A1FF')
+    }, function () {
+        $('.setCol').css('color', '#777777')
+    })
 }
 
+
 function rendeDeptList(deptList){
     let str = `<li class="deptItem ellipsis" data-id=" " data-name="全部">全部</li>`;
     if(from == 2){
@@ -826,7 +896,7 @@ function renderColSet(list){
             <div class='cloInfobox'>
                 <div class='cloInfoTitle'><span class='cloInfoTitleTxt'>列显示设置</span> <img class="iconClose" src=${require('./../images/icon_close_default.png')} alt="关闭" /></div>
                 <div class='cloInfo'></div>
-                <div class='btnBox'> <span class='cancalColSet'>取消</span> <span class='saveColSet'>保存设置</span></div>
+                <div class='btnBox'><span class='defaultColSet'>恢复默认</span> <span class='cancalColSet'>取消</span> <span class='saveColSet'>保存设置</span></div>
             </div>
         </div>`
     let infoStr = `<div class='colTabTitle' ><span class='colOpera toggleSelectColAll' data-select=${allSelect}>${allSelect  ? `<img  src=${iconCheck} />`:`<img src=${iconUnCheck} />`}全选</span><span  class='colName'>列名</span></div><div class='colTabInfoBox' >`
@@ -857,10 +927,32 @@ function renderColSet(list){
     bindSelectCol()
     bindColOrder()
     bindSaveColSet()
+    bindDefaultColset()
     bindCloseColSet()
     bindImgEnter()
 }
 
+function bindDefaultColset() {
+    $('.defaultColSet', parent.document).off("hover").hover(function () {
+        $(this).css('color', '#00A1FF')
+    }, function () {
+        $(this).css('color', '#777777')
+    })
+    $('.defaultColSet', parent.document).off("click").on('click', function () {
+        return post(api.getDefaultPageSet, { pageType: 1 }).then(res => {
+            if (res.data.code == '0') {
+                pageSet = res.data.data
+                pageSetCopy = JSON.parse(JSON.stringify(pageSet))
+                renderColSet(pageSetCopy)
+            } else { }
+        }).catch((e) => {
+
+        })
+        // closeColSet()
+    })
+
+}
+
 function bindImgEnter(){
     $(".pageSetUpBox img",parent.document).off("mouseenter").on("mouseenter",function(){
         $(this).attr('src', goUpB)
@@ -1178,7 +1270,7 @@ $(function($){
         if (fromDays && fromDays === "1") {
             beHosGT31Days = 1
         }
-        const param = {
+        let param = {
             behospitalCode: behospitalCode,
             patName: name, //病人姓名
             level:level,//病历等级
@@ -1205,8 +1297,22 @@ $(function($){
             mrTimeStart: fpCheckDateStart.replace(/\//g,'-'), //首页核查起始时间
             mrTimeEnd: fpCheckDateEnd.replace(/\//g,'-'), //首页核查截止时间
         }
-        expJson(api.qcResultShortPageExport,param).then(res =>{
+        let exportURL = formatExportUrl(from)
+        // console.log(exportURL,'exportURL导出接口');
+        if (from == 9) {
+            param = { ...param, behDeptName: deptNamePram }
+        }
+        if (from == 7) {
+            param = { ...param, checkStatus: 1 }
+        }
+        if (from == 6) {
+            param = { ...param, improveType }
+        }
+        expJson(exportURL,param).then(res =>{
             downloadExportedData(res.data, $(".partTitle").text()+".xls")
         })
+        // expJson(api.qcResultShortPageExport,param).then(res =>{
+        //     downloadExportedData(res.data, $(".partTitle").text()+".xls")
+        // })
     })
 });

+ 39 - 2
src/js/qcListDept.js

@@ -612,7 +612,9 @@ function renderTabTitle(data){
         <div class="tabFoot">
             <span class="scoreOpera" data-selectAll=false><img class="iconCheck" src="${iconUnCheck}" alt="checkbox">全选</span>
             <span class="recordScoreBtn">评分</span>
-            <span class="setCol"><img class="iconSetting" src=${require('./../images/setting.png')} alt="关闭" />列设置</span>
+            <span class="setCol">列设置</span>
+            <span class="tipIcon"><img class="toolTipIcon" src=${require('./../images/toolTip.png')} alt="关闭" /></span>    
+            <span class="tooltip">可设置列的隐藏、显示及排序</span>
         </div>
     </td>`
     $(".tabOpera").html(operStr)
@@ -622,12 +624,25 @@ function renderTabTitle(data){
     bindRecordScoreBtn()
     bindSetCol()
     bindOrder()
+    bindToolTip()
+}
+function bindToolTip() {
+    $('.tipIcon').off("hover").hover(function () {
+        $('.tooltip').css('visibility', "visible")
+    }, function () {
+        $('.tooltip').css('visibility', "hidden")
+    })
 }
 
 function bindSetCol(){
     $(".setCol").off("click").on("click", function(){
         renderColSet(pageSetCopy)
     })
+    $('.setCol').off("hover").hover(function () {
+        $('.setCol').css('color', '#00A1FF')
+    }, function () {
+        $('.setCol').css('color', '#777777')
+    })
 }
 
 
@@ -733,7 +748,7 @@ function renderColSet(list){
             <div class='cloInfobox'>
                 <div class='cloInfoTitle'><span class='cloInfoTitleTxt'>列显示设置</span> <img class="iconClose" src=${require('./../images/icon_close_default.png')} alt="关闭" /></div>
                 <div class='cloInfo'></div>
-                <div class='btnBox'> <span class='cancalColSet'>取消</span> <span class='saveColSet'>保存设置</span></div>
+                <div class='btnBox'><span class='defaultColSet'>恢复默认</span> <span class='cancalColSet'>取消</span> <span class='saveColSet'>保存设置</span></div>
             </div>
         </div>`
     let infoStr = `<div class='colTabTitle' ><span class='colOpera toggleSelectColAll' data-select=${allSelect}>${allSelect  ? `<img  src=${iconCheck} />`:`<img src=${iconUnCheck} />`}全选</span><span  class='colName'>列名</span></div><div class='colTabInfoBox' >`
@@ -764,10 +779,32 @@ function renderColSet(list){
     bindSelectCol()
     bindColOrder()
     bindSaveColSet()
+    bindDefaultColset()
     bindCloseColSet()
     bindImgEnter()
 }
 
+function bindDefaultColset() {
+    $('.defaultColSet', parent.document).off("hover").hover(function () {
+        $(this).css('color', '#00A1FF')
+    }, function () {
+        $(this).css('color', '#777777')
+    })
+    $('.defaultColSet', parent.document).off("click").on('click', function () {
+        return post(api.getDefaultPageSet, { pageType: 1 }).then(res => {
+            if (res.data.code == '0') {
+                pageSet = res.data.data
+                pageSetCopy = JSON.parse(JSON.stringify(pageSet))
+                renderColSet(pageSetCopy)
+            } else { }
+        }).catch((e) => {
+
+        })
+        // closeColSet()
+    })
+
+}
+
 function bindImgEnter(){
     $(".pageSetUpBox img",parent.document).off("mouseenter").on("mouseenter",function(){
         $(this).attr('src', goUpB)

+ 39 - 2
src/js/qcListDocteam.js

@@ -561,7 +561,9 @@ function renderTabTitle(data){
         <div class="tabFoot">
             <span class="scoreOpera" data-selectAll=false><img class="iconCheck" src="${iconUnCheck}" alt="checkbox">全选</span>
             <span class="recordScoreBtn">评分</span>
-            <span class="setCol"><img class="iconSetting" src=${require('./../images/setting.png')} alt="关闭" />列设置</span>
+            <span class="setCol">列设置</span>
+            <span class="tipIcon"><img class="toolTipIcon" src=${require('./../images/toolTip.png')} alt="关闭" /></span>    
+            <span class="tooltip">可设置列的隐藏、显示及排序</span>
         </div>
     </td>`
     $(".tabOpera").html(operStr)
@@ -571,12 +573,26 @@ function renderTabTitle(data){
     bindRecordScoreBtn()
     bindSetCol()
     bindOrder()
+    bindToolTip()
+}
+
+function bindToolTip() {
+    $('.tipIcon').off("hover").hover(function () {
+        $('.tooltip').css('visibility', "visible")
+    }, function () {
+        $('.tooltip').css('visibility', "hidden")
+    })
 }
 
 function bindSetCol(){
     $(".setCol").off("click").on("click", function(){
         renderColSet(pageSetCopy)
     })
+    $('.setCol').off("hover").hover(function () {
+        $('.setCol').css('color', '#00A1FF')
+    }, function () {
+        $('.setCol').css('color', '#777777')
+    })
 }
 
 function loading(){
@@ -656,7 +672,7 @@ function renderColSet(list){
             <div class='cloInfobox'>
                 <div class='cloInfoTitle'><span class='cloInfoTitleTxt'>列显示设置</span> <img class="iconClose" src=${require('./../images/icon_close_default.png')} alt="关闭" /></div>
                 <div class='cloInfo'></div>
-                <div class='btnBox'> <span class='cancalColSet'>取消</span> <span class='saveColSet'>保存设置</span></div>
+                <div class='btnBox'><span class='defaultColSet'>恢复默认</span> <span class='cancalColSet'>取消</span> <span class='saveColSet'>保存设置</span></div>
             </div>
         </div>`
     let infoStr = `<div class='colTabTitle' ><span class='colOpera toggleSelectColAll' data-select=${allSelect}>${allSelect  ? `<img  src=${iconCheck} />`:`<img src=${iconUnCheck} />`}全选</span><span  class='colName'>列名</span></div><div class='colTabInfoBox' >`
@@ -687,9 +703,30 @@ function renderColSet(list){
     bindSelectCol()
     bindColOrder()
     bindSaveColSet()
+    bindDefaultColset()
     bindCloseColSet()
     bindImgEnter()
 }
+function bindDefaultColset() {
+    $('.defaultColSet', parent.document).off("hover").hover(function () {
+        $(this).css('color', '#00A1FF')
+    }, function () {
+        $(this).css('color', '#777777')
+    })
+    $('.defaultColSet', parent.document).off("click").on('click', function () {
+        return post(api.getDefaultPageSet, { pageType: 1 }).then(res => {
+            if (res.data.code == '0') {
+                pageSet = res.data.data
+                pageSetCopy = JSON.parse(JSON.stringify(pageSet))
+                renderColSet(pageSetCopy)
+            } else { }
+        }).catch((e) => {
+
+        })
+        // closeColSet()
+    })
+
+}
 
 function bindImgEnter(){
     $(".pageSetUpBox img",parent.document).off("mouseenter").on("mouseenter",function(){

+ 39 - 2
src/js/qcListOutHospital.js

@@ -701,7 +701,9 @@ function renderTabTitle(data){
         <div class="tabFoot">
             <span class="scoreOpera" data-selectAll=false><img class="iconCheck" src="${iconUnCheck}" alt="checkbox">全选</span>
             <span class="recordScoreBtn">评分</span>
-            <span class="setCol"><img class="iconSetting" src=${require('./../images/setting.png')} alt="关闭" />列设置</span>
+            <span class="setCol">列设置</span>
+            <span class="tipIcon"><img class="toolTipIcon" src=${require('./../images/toolTip.png')} alt="关闭" /></span>    
+            <span class="tooltip">可设置列的隐藏、显示及排序</span>
         </div>
     </td>`
     $(".tabOpera").html(operStr)
@@ -711,12 +713,25 @@ function renderTabTitle(data){
     bindRecordScoreBtn()
     bindSetCol()
     bindOrder()
+    bindToolTip()
+}
+function bindToolTip() {
+    $('.tipIcon').off("hover").hover(function () {
+        $('.tooltip').css('visibility', "visible")
+    }, function () {
+        $('.tooltip').css('visibility', "hidden")
+    })
 }
 
 function bindSetCol(){
     $(".setCol").off("click").on("click", function(){
         renderColSet(pageSetCopy)
     })
+    $('.setCol').off("hover").hover(function () {
+        $('.setCol').css('color', '#00A1FF')
+    }, function () {
+        $('.setCol').css('color', '#777777')
+    })
 }
 
 function rendeDeptList(deptList){
@@ -850,7 +865,7 @@ function renderColSet(list){
             <div class='cloInfobox'>
                 <div class='cloInfoTitle'><span class='cloInfoTitleTxt'>列显示设置</span> <img class="iconClose" src=${require('./../images/icon_close_default.png')} alt="关闭" /></div>
                 <div class='cloInfo'></div>
-                <div class='btnBox'> <span class='cancalColSet'>取消</span> <span class='saveColSet'>保存设置</span></div>
+                <div class='btnBox'> <span class='defaultColSet'>恢复默认</span><span class='cancalColSet'>取消</span> <span class='saveColSet'>保存设置</span></div>
             </div>
         </div>`
     let infoStr = `<div class='colTabTitle' ><span class='colOpera toggleSelectColAll' data-select=${allSelect}>${allSelect  ? `<img  src=${iconCheck} />`:`<img src=${iconUnCheck} />`}全选</span><span  class='colName'>列名</span></div><div class='colTabInfoBox' >`
@@ -881,10 +896,32 @@ function renderColSet(list){
     bindSelectCol()
     bindColOrder()
     bindSaveColSet()
+    bindDefaultColset()
     bindCloseColSet()
     bindImgEnter()
 }
 
+function bindDefaultColset() {
+    $('.defaultColSet', parent.document).off("hover").hover(function () {
+        $(this).css('color', '#00A1FF')
+    }, function () {
+        $(this).css('color', '#777777')
+    })
+    $('.defaultColSet', parent.document).off("click").on('click', function () {
+        return post(api.getDefaultPageSet, { pageType: 1 }).then(res => {
+            if (res.data.code == '0') {
+                pageSet = res.data.data
+                pageSetCopy = JSON.parse(JSON.stringify(pageSet))
+                renderColSet(pageSetCopy)
+            } else { }
+        }).catch((e) => {
+
+        })
+        // closeColSet()
+    })
+
+}
+
 function bindImgEnter(){
     $(".pageSetUpBox img",parent.document).off("mouseenter").on("mouseenter",function(){
         $(this).attr('src', goUpB)

+ 38 - 2
src/js/qcListPerson.js

@@ -613,7 +613,9 @@ function renderTabTitle(data){
         <div class="tabFoot">
             <span class="scoreOpera" data-selectAll=false><img class="iconCheck" src="${iconUnCheck}" alt="checkbox">全选</span>
             <span class="recordScoreBtn">评分</span>
-            <span class="setCol"><img class="iconSetting" src=${require('./../images/setting.png')} alt="关闭" />列设置</span>
+            <span class="setCol">列设置</span>
+            <span class="tipIcon"><img class="toolTipIcon" src=${require('./../images/toolTip.png')} alt="关闭" /></span>    
+            <span class="tooltip">可设置列的隐藏、显示及排序</span>
         </div>
     </td>`
     $(".tabOpera").html(operStr)
@@ -623,12 +625,25 @@ function renderTabTitle(data){
     bindRecordScoreBtn()
     bindSetCol()
     bindOrder()
+    bindToolTip()
+}
+function bindToolTip() {
+    $('.tipIcon').off("hover").hover(function () {
+        $('.tooltip').css('visibility', "visible")
+    }, function () {
+        $('.tooltip').css('visibility', "hidden")
+    })
 }
 
 function bindSetCol(){
     $(".setCol").off("click").on("click", function(){
         renderColSet(pageSetCopy)
     })
+    $('.setCol').off("hover").hover(function () {
+        $('.setCol').css('color', '#00A1FF')
+    }, function () {
+        $('.setCol').css('color', '#777777')
+    })
 }
 
 
@@ -734,7 +749,7 @@ function renderColSet(list){
             <div class='cloInfobox'>
                 <div class='cloInfoTitle'><span class='cloInfoTitleTxt'>列显示设置</span> <img class="iconClose" src=${require('./../images/icon_close_default.png')} alt="关闭" /></div>
                 <div class='cloInfo'></div>
-                <div class='btnBox'> <span class='cancalColSet'>取消</span> <span class='saveColSet'>保存设置</span></div>
+                <div class='btnBox'><span class='defaultColSet'>恢复默认</span> <span class='cancalColSet'>取消</span> <span class='saveColSet'>保存设置</span></div>
             </div>
         </div>`
     let infoStr = `<div class='colTabTitle' ><span class='colOpera toggleSelectColAll' data-select=${allSelect}>${allSelect  ? `<img  src=${iconCheck} />`:`<img src=${iconUnCheck} />`}全选</span><span  class='colName'>列名</span></div><div class='colTabInfoBox' >`
@@ -763,9 +778,30 @@ function renderColSet(list){
     bindSelectCol()
     bindColOrder()
     bindSaveColSet()
+    bindDefaultColset()
     bindCloseColSet()
     bindImgEnter()
 }
+function bindDefaultColset() {
+    $('.defaultColSet', parent.document).off("hover").hover(function () {
+        $(this).css('color', '#00A1FF')
+    }, function () {
+        $(this).css('color', '#777777')
+    })
+    $('.defaultColSet', parent.document).off("click").on('click', function () {
+        return post(api.getDefaultPageSet, { pageType: 1 }).then(res => {
+            if (res.data.code == '0') {
+                pageSet = res.data.data
+                pageSetCopy = JSON.parse(JSON.stringify(pageSet))
+                renderColSet(pageSetCopy)
+            } else { }
+        }).catch((e) => {
+
+        })
+        // closeColSet()
+    })
+
+}
 
 function bindImgEnter(){
     $(".pageSetUpBox img",parent.document).off("mouseenter").on("mouseenter",function(){

+ 11 - 3
src/js/quexianDetailControl.js

@@ -55,7 +55,7 @@ $(function(){
     }
     $(".selectDepts").html(deptName)
     // if(from == 1){
-        $(".partTitle .titlePic ").html(`<a class="consoleD" href="console.html">控制台 / </a><a class="consoleP" href="deptScoreDetailControl.html">各科室缺陷占比 / </a>缺陷详情`)
+        $(".partTitle .titlePic ").html(`<a class="consoleD" href="console.html">控制台 / </a><a class="consoleP" href="deptScoreDetailControl.html">各科室缺陷占比 / </a>缺陷列表`)
         $(".partTitle .consoleD").click(function(){
             $(".menu .page",parent.document).removeClass("active").eq(0).addClass("active");
             $(".container",parent.document).addClass("console-cont");
@@ -303,7 +303,7 @@ function renderTab(data,activePage){
                 <td  class="textCenter">${(activePage-1)*15 + i+1}</td>
                 <td class="textCenter">${item.casesName}</td>
                 <td>${item.name}</td>
-                <td class="textCenter">${item.num}</td>
+                <td class="textCenter goHomeDetail" data-id="${item.casesId}" data-ruleType="${item.ruleType}">${item.num}</td>
                 <td  class="textCenter">${item.percentStr}</td>
             </tr>
         `
@@ -311,6 +311,14 @@ function renderTab(data,activePage){
     $('.tbody').html(str?str:emptyBox())
     bindEdit(data,activePage)
     // initScroll("quexianDetailControl","Y",1)
+    $(".goHomeDetail").click(function () {
+        let ruleType = $(this).attr("data-ruleType")
+        let index = $(this).parent().attr("data-index")
+        let casesId = $(this).attr("data-id")
+        let defectName = data[index].name
+        $(parent.document).find("#contentIframe").attr("src", "qcListCopy.html?deptName=" + deptName + "&deptId=" + deptId + "&from=9&casesId=" + casesId + "&shijian=3" + "&ruleType=" + ruleType + "&startDate=" + startDateParam + "&endDate=" + endDateParam + "&defectName=" + defectName)
+        // $(parent.document).find("#contentIframe").attr("src", "uccDetail.html?from=3&deptName=" + name + "&deptId=" + id + "&casesEntryId=" + casesId + "&defectName=" + casesName + "&startDate=" + startDateParam + "&endDate=" + endDateParam)
+    })
 }
 
 function bindEdit(data,activePage){
@@ -590,7 +598,7 @@ $(function() {
             "endDate":endDateParam
         }
         expJson(api.entryCountGroupByEntryExport,param).then(res =>{
-            downloadExportedData(res.data, "各科室缺陷占比 / 缺陷详情.xls")
+            downloadExportedData(res.data, "各科室缺陷占比 / 缺陷列表.xls")
         })
     })
 });

+ 3 - 3
src/js/quexianDetailControlHome.js

@@ -59,13 +59,13 @@ $(function(){
         setDatePicker($("#datepicker"),$("#datepicker2"),"default")
     }
     if(from == 1){
-        $(".partTitle .titlePic ").html(`<a class="consoleD" href="console.html">控制台 / </a><a class="consoleP" href="partDetailControl.html">病案首页合格率占比 / </a>缺陷详情`)
+        $(".partTitle .titlePic ").html(`<a class="consoleD" href="console.html">控制台 / </a><a class="consoleP" href="partDetailControl.html">病案首页合格率占比 / </a>缺陷列表`)
         $(".partTitle .consoleD").click(function(){
             $(".menu .page",parent.document).removeClass("active").eq(0).addClass("active");
             $(".container",parent.document).addClass("console-cont");
         })
     }else{
-        $(".partTitle .titlePic ").html(`<a class="consoleD" href="console.html">控制台 / </a><a class="consoleP" href="deptScoreDetailControl.html">各科室缺陷占比 / </a>缺陷详情`)
+        $(".partTitle .titlePic ").html(`<a class="consoleD" href="console.html">控制台 / </a><a class="consoleP" href="deptScoreDetailControl.html">各科室缺陷占比 / </a>缺陷列表`)
         $(".partTitle .consoleD").click(function(){
             $(".menu .page",parent.document).removeClass("active").eq(0).addClass("active");
             $(".container",parent.document).addClass("console-cont");
@@ -600,7 +600,7 @@ $(function() {
             "endDate":endDateParam
         }
         expJson(api.entryCountGroupByEntryExport,param).then(res =>{
-            downloadExportedData(res.data, "病案首页合格率占比 / 缺陷详情.xls")
+            downloadExportedData(res.data, "病案首页合格率占比 / 缺陷列表.xls")
         })
     })
 });

+ 5 - 0
src/js/readmission.js

@@ -169,6 +169,7 @@ function renderTab(data,hisId,activePage){
     let dataCopy = {copy: true, ...data[i]}
     newData =  [...newData,data[i],dataCopy]    
   }
+  console.log(newData,'========newData========');
   let str = ``
   for(let i = 0; i < newData.length; i++){
       const item = newData[i]
@@ -186,6 +187,8 @@ function renderTab(data,hisId,activePage){
           <td class="textCenter" rowspan="2">${item.diagnose || "-"}</td> 
           <td class="textCenter">${item.details[0].behospitalDate || "-"}</td> 
           <td class="textCenter">${item.details[0].leaveHospitalDate || "-"}</td> 
+          <td class="textCenter">${item.details[0].behospitalDayNum || "-"}</td> 
+          <td class="textCenter">${item.details[0].totleFee || "-"}</td> 
           <td class="textCenter" rowspan="2">${item.diffDays || "-"}</td> 
           </tr>
         `
@@ -203,6 +206,8 @@ function renderTab(data,hisId,activePage){
           <td class="textCenter delete">${item.diagnose || "-"}</td> 
           <td class="textCenter">${item.details[1].behospitalDate || "-"}</td> 
           <td class="textCenter">${item.details[1].leaveHospitalDate || "-"}</td> 
+          <td class="textCenter">${item.details[1].behospitalDayNum || "-"}</td> 
+          <td class="textCenter">${item.details[1].totleFee || "-"}</td> 
           <td class="textCenter delete">${item.diffDays || "-"}</td> 
           </tr>
         `

+ 41 - 2
src/js/uccDetail.js

@@ -642,11 +642,14 @@ function renderTabTitle(data){
             str += `<th class="textCenter ${item.val} ${item.val ==defaultOrder ? 'desc':''}" code="${item.val}">${item.name}</th>`
         }
     }
+    // <span class="setCol"><img class="iconSetting" src=${require('./../images/setting.png')} alt="关闭" />列设置</span>
     let operStr=`<td colspan="${showNum+2}" style="background: #fff">
         <div class="tabFoot">
             <span class="scoreOpera" data-selectAll=false><img class="iconCheck" src="${iconUnCheck}" alt="checkbox">全选</span>
             <span class="recordScoreBtn">评分</span>
-            <span class="setCol"><img class="iconSetting" src=${require('./../images/setting.png')} alt="关闭" />列设置</span>
+            <span class="setCol">列设置</span>
+            <span class="tipIcon"><img class="toolTipIcon" src=${require('./../images/toolTip.png')} alt="关闭" /></span>    
+            <span class="tooltip">可设置列的隐藏、显示及排序</span>
         </div>
     </td>`
     $(".tabOpera").html(operStr)
@@ -656,12 +659,26 @@ function renderTabTitle(data){
     bindRecordScoreBtn()
     bindSetCol()
     bindOrder()
+    bindToolTip()
 }
 
+function bindToolTip() {
+    $('.tipIcon').off("hover").hover(function(){
+        $('.tooltip').css('visibility',"visible")
+    },function(){
+        $('.tooltip').css('visibility', "hidden")
+    })
+}
+ 
 function bindSetCol(){
     $(".setCol").off("click").on("click", function(){
         renderColSet(pageSetCopy)
     })
+    $('.setCol').off("hover").hover(function () {
+        $('.setCol').css('color','#00A1FF')
+    }, function () {
+        $('.setCol').css('color', '#777777')
+    })
 }
 
 function rendeDeptList(deptList){
@@ -795,7 +812,7 @@ function renderColSet(list){
             <div class='cloInfobox'>
                 <div class='cloInfoTitle'><span class='cloInfoTitleTxt'>列显示设置</span> <img class="iconClose" src=${require('./../images/icon_close_default.png')} alt="关闭" /></div>
                 <div class='cloInfo'></div>
-                <div class='btnBox'> <span class='cancalColSet'>取消</span> <span class='saveColSet'>保存设置</span></div>
+                <div class='btnBox'><span class='defaultColSet'>恢复默认</span> <span class='cancalColSet'>取消</span> <span class='saveColSet'>保存设置</span></div>
             </div>
         </div>`
     let infoStr = `<div class='colTabTitle' ><span class='colOpera toggleSelectColAll' data-select=${allSelect}>${allSelect  ? `<img  src=${iconCheck} />`:`<img src=${iconUnCheck} />`}全选</span><span  class='colName'>列名</span></div><div class='colTabInfoBox' >`
@@ -826,10 +843,32 @@ function renderColSet(list){
     bindSelectCol()
     bindColOrder()
     bindSaveColSet()
+    bindDefaultColset()
     bindCloseColSet()
     bindImgEnter()
 }
 
+function bindDefaultColset() {
+    $('.defaultColSet', parent.document).off("hover").hover(function () {
+        $(this).css('color', '#00A1FF')
+    }, function () {
+        $(this).css('color', '#777777')
+    })
+    $('.defaultColSet', parent.document).off("click").on('click', function () {
+        return post(api.getDefaultPageSet, { pageType: 1 }).then(res => {
+            if (res.data.code == '0') {
+                pageSet = res.data.data
+                pageSetCopy = JSON.parse(JSON.stringify(pageSet))
+                renderColSet(pageSetCopy)
+            } else { }
+        }).catch((e) => {
+
+        })
+        // closeColSet()
+    })
+
+}
+
 function bindImgEnter(){
     $(".pageSetUpBox img",parent.document).off("mouseenter").on("mouseenter",function(){
         $(this).attr('src', goUpB)

+ 28 - 28
src/js/uncorrectedCasesStatistics.js

@@ -226,35 +226,35 @@ 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) =>{
+// 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表头