改善率内页

src/css/dataAnalysis/statisticsDetail.less

@@ -31,7 +31,7 @@ h2{
     min-height: calc(100% - 84px);
     // overflow: auto;
     height:  calc(100% - 44px);
-    .selectDefect{        
+    .selectDefect,.selectDept{
         background-color: #EFF1F6;
         min-width: 120px;
         width: auto;

src/html/dataAnalysis/statisticsDetail.html

@@ -19,8 +19,9 @@
                 <div class="clearfix">
                     <span class="filterItem typeFilter deptListWrap">
                         <span>科室：</span>
-                        <input type="text" class="selectDept canEditDept" value="全部">
-                        <ul class="deptList filterDropList"></ul>
+                        <span class="selectDept">全部</span>
+                        <!--<input type="text" class="selectDept canEditDept" value="全部">
+                        <ul class="deptList filterDropList"></ul>-->
                     </span>
                     <span class="filterItem typeFilter clearfix" >
                         <span class="fl">出院日期：</span>
@@ -61,26 +62,6 @@
                         <span>医生工号：</span>
                         <input class="doctorNumInp" type="text" placeholder="请输入医生工号">
                     </span>
-                   
-                    <span class="filterItem filterHide fpFilterItem">
-                        <span>病案首页核查状态：</span>
-                        <span class="fpSelectCheck">全部</span>
-                        <ul class="checkList filterDropList fpCheckList">
-                            <Li class="fpCheckItem" data-name="全部" data-id="">全部</Li>
-                            <Li class="fpCheckItem" data-name="未核查" data-id="0">未核查</Li>
-                            <Li class="fpCheckItem" data-name="已核查" data-id="1">已核查</Li>
-                        </ul>
-                    </span>
-                    <span class="filterItem filterHide doctorFilter fpFilterItem">
-                        <span>病案首页核查人：</span>
-                        <input class="fpCheckPeople" type="text" placeholder=" 请输入核查人">
-                    </span>
-                    <span class="filterItem filterHide typeFilter clearfix" >
-                        <span class="fl">病案首页核查时间：</span>
-                        <span class="datapickerBox fl"><input type="text" placeholder="请选择时间" id="datepickerFp1" autocomplete="off" readonly /></span>
-                        <span  class="divide fl">-</span>
-                        <span class="datapickerBox fl"><input type="text" placeholder="请选择时间" id="datepickerFp2"  autocomplete="off" readonly/></span>
-                    </span>
                     <span class="filterItem qcFiliterItem">
                         <span>病历核查状态：</span>
                         <span class="qcSelectCheck">全部</span>

src/js/api.js

@@ -196,6 +196,7 @@ const api = {
   /*****湘雅三院-统计分析******/
   getEntryDefectImprove:'/qc/analysis/getEntryDefectImprove', //条目缺陷改善率统计
   getEntryDefectImproveByExport:'/qc/analysis/getEntryDefectImproveByExport',   //条目缺陷改善率统计-导出
+  getEntryDefectImproveInner:'/qc/analysis/getEntryDefectImproveInner',//条目缺陷改善率统计内页列表
   getQcClick:'/qc/analysis/getQcClick', //临床质控使用统计
   getQcClickByExport:'/qc/analysis/getQcClickByExport',   //临床质控使用统计-导出
   getQcClickDept:'/qc/analysisDept/getQcClickDept',   //临床质控使用统计（科室）

src/js/dataAnalysis/improveStatistics.js

@@ -21,12 +21,8 @@ let deptName="",deptNameTemp="", behospitalCode="", behospitalCodeTemp="",deptId
   data_desc=["improveleNum"],data_asc=[];
   let srcUrl = $("#contentIframe",parent.document).attr("src")
   from = getUrlArgObjectNew("from",srcUrl)||""
-  lineType = getUrlArgObjectNew("lineType",srcUrl)||""
   let startDateParam = getUrlArgObjectNew("startDateParam",srcUrl)||""
   let endDateParam = getUrlArgObjectNew("endDateParam",srcUrl)||""
-  if(lineType){
-        $("th[code="+data_desc+"]").addClass("desc");
-  }
 
 $(function() {
   const  iconCalenBlue= require("../../images/icon_calen_blue.png")
@@ -178,9 +174,9 @@ function renderTab(data,hisId,activePage){
                 <td >${item.deptName || "-"}</td>
                 <td >${item.casesName || "-"}</td>
                 <td >${item.entryName || "-"}</td>
-                <td><a class="goHomeDetail">${item.totalNum}</a></td>
-                <td><a class="goHomeDetail">${item.handleNum}</a></td>
-                <td><a class="goHomeDetail">${item.improveleNum}</a></td>
+                <td><a class="goHomeDetail" data-type="0">${item.totalNum}</a></td>
+                <td><a class="goHomeDetail" data-type="1">${item.handleNum}</a></td>
+                <td><a class="goHomeDetail" data-type="2">${item.improveleNum}</a></td>
                 <td >${item.handleStr|| "-"}</td>
             </tr>
         `
@@ -191,7 +187,8 @@ function renderTab(data,hisId,activePage){
 	  	let casesName =  $(this).parents("tr").attr("data-casesname")
         let deptName = $(this).parents("tr").attr("data-dept")
         let deptId = $(this).parents("tr").attr("data-deptid")
-        $(parent.document).find("#contentIframe").attr("src", "statisticsDetail.html?deptName=" + deptName + "&deptId=" + deptId + "&casesId=" + casesId+"&defectName="+casesName)
+	  	let typeMark = $(this).attr("data-type")
+        $(parent.document).find("#contentIframe").attr("src", "statisticsDetail.html?deptName=" + deptName + "&deptId=" + deptId + "&casesId=" + casesId+"&defectName="+casesName+"&typeMark="+typeMark)
     })
 }
 function getDeptList(val){

src/js/dataAnalysis/statisticsDetail.js

@@ -29,9 +29,9 @@ let deptNamePram = getUrlArgObjectNew("deptName",srcUrl)||""
 let startDateParam = getUrlArgObjectNew("startDate",srcUrl)||""
 let endDateParam = getUrlArgObjectNew("endDate",srcUrl)||""
 let from = getUrlArgObjectNew("from",srcUrl)||""
+let typeMark= getUrlArgObjectNew("typeMark",srcUrl)||"";       //0-总数量，1-已改善数量，2-待改善数量
 let defectName = getUrlArgObjectNew("defectName",srcUrl)||"";
 let casesId = getUrlArgObjectNew("casesId",srcUrl)||"";
-let isSingleReject = getUrlArgObjectNew("isSingleReject",srcUrl)||""
 let deptListDept = JSON.parse(getCookie("deptList"))||[]
 let isInspection = getUrlArgObjectNew("isInspection", srcUrl) || ""
 let doctorNameUrl = getUrlArgObjectNew("doctorName", srcUrl) || ""
@@ -39,12 +39,10 @@ let currentPage;
 deptNameTemp = docName = doctorNameUrl
 listenScroll()
 $(".selectLevel").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
-$(".fpSelectCheck").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
 $(".qcSelectCheck").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
 let tabList = [], name = "", behospitalCode="", behosDateStart="", level="",behosDateEnd="", scoreSum = 0,
   nameTemp = "", behospitalCodeTemp="",levelTemp="", deptId="",deptIdTemp="", doctorName="", deptName="", deptNameTemp="",doctorNum="",doctorNameTemp="",doctorNumTemp="",
-  fpCheckStatus="",fpCheckStatusTemp="",fpCheckName="",fpCheckNameTemp="",qcCheckMain="",qcCheckMainTemp="",qcCheckName="",qcCheckNameTemp="",qcCheckStatus="",qcCheckStatusTemp="",fpCheckDateStart="",fpCheckDateEnd="",
-  qcCheckDateStart="",qcCheckDateEnd="",data_desc=["leaveHospitalDate"],data_asc=[];
+  qcCheckMain="",qcCheckMainTemp="",qcCheckName="",qcCheckNameTemp="",qcCheckStatus="",qcCheckStatusTemp="", qcCheckDateStart="",qcCheckDateEnd="",data_desc=["leaveHospitalDate"],data_asc=[];
 if(isPlacefile != 1){
     data_desc=["behospitalDate"]
 }
@@ -67,7 +65,7 @@ if(docName){
 if(deptIdPram&&deptNamePram){
     deptIdTemp = deptIdPram = deptIdPram
     deptName = deptNameTemp = deptNamePram
-    $('.selectDept').val(deptNamePram)
+    $('.selectDept').text(deptNamePram)
     $('.selectDept ').attr('title',deptNamePram)
     $(".deptList").css("display", "none")
 }else{
@@ -117,39 +115,32 @@ $("#filterToggler").click(function(){
 }
 function getTabData(activePage){
     const param = {
-        behospitalCode: behospitalCode,
+        behospitalCode: behospitalCode,     //病历号
+	    typeMark:typeMark,     // 0-总数量，1-已改善数量，2-待改善数量
         patName: name, //病人姓名
-        // casesEntryName: casesEntryName,
-        casesEntryId:casesId,
-        behDeptName: deptName == "全部" ? "":deptName||"",
-        deptName: deptName == "全部" ? "":deptName||"",
-        doctorId: doctorNum,
-        hospitalId:getCookie("hospitalid"),
-        // doctorName: doctorName,
-        doctorName: doctorNameUrl,
+	    entryName: defectName,      //缺陷条目名称
+	    entryId:casesId,        //缺陷条目id
+	    deptId: deptId||"",     //科室id
+        deptName: deptName == "全部" ? "":deptName||"",       //科室名称
+        doctorId: doctorNum,    //医生id
+        doctorName: doctorNameUrl,      //医生姓名
         level:level,//病历等级
-        startDate: behosDateStart.replace(/\//g,'-'), //出院日期--开始时间
-        endDate: behosDateEnd.replace(/\//g,'-'), //出院日期--结束时间
-        current:activePage,
-        behospitalCode: behospitalCode,
+        startDate: behosDateStart, //出院日期--开始时间
+        endDate: behosDateEnd, //出院日期--结束时间
+        current:activePage,     //页码
         ascs:data_asc,     //升序
         descs:data_desc,       //降序      
-        size: 15,
-        isReject: isSingleReject,
+        size: 15,       //每页显示条数
         checkStatus: qcCheckStatus?Number(qcCheckStatus):qcCheckStatus, //病历核查状态
-        mrStatus: fpCheckStatus?Number(fpCheckStatus):fpCheckStatus,   //首页核查状态（1：已核查，0：未核查）
         chName: qcCheckName,   //病历核查人员
-        diagnose: qcCheckMain,   
-        mrName: fpCheckName,  //首页核查人员
-        chTimeStart: qcCheckDateStart.replace(/\//g,'-'), //病历核查起始时间
-        chTimeEnd: qcCheckDateEnd.replace(/\//g,'-'), //病历核查截止时间
-        mrTimeStart: fpCheckDateStart.replace(/\//g,'-'), //首页核查起始时间
-        mrTimeEnd: fpCheckDateEnd.replace(/\//g,'-'), //首页核查截止时间
+        diagnose: qcCheckMain,      //主诊断
+        chTimeStart: qcCheckDateStart, //病历核查起始时间
+        chTimeEnd: qcCheckDateEnd, //病历核查截止时间
     }
     $('.pagination').html("")
     $('.tbody').html(emptyBox('努力加载中...','',1))
     // return post(from==2?api.qcResultShortByDeptPage:api.qcResultDefectList,param).then(res =>{
-    return post(api.unModifyMRPage,param).then(res =>{
+    return post(api.getEntryDefectImproveInner,param).then(res =>{
         if(res.data.code == '0'){
             const data = res.data.data;
             tabList = data.records;
@@ -176,16 +167,12 @@ function getTabData(activePage){
 $(".filter").on("click", function(e){
     behosDateStart = $("#datepicker").val()
     behosDateEnd = $("#datepicker2").val()
-    fpCheckDateStart = $("#datepickerFp1").val()
-    fpCheckDateEnd = $("#datepickerFp2").val()
     qcCheckDateStart = $("#datepickerQc1").val()
     qcCheckDateEnd = $("#datepickerQc2").val()
     const behosDateStartTime = new Date(behosDateStart).getTime()
     const behosDateEndTime = new Date(behosDateEnd).getTime()
     const qcCheckDateStartTime = new Date(qcCheckDateStart).getTime()
     const qcCheckDateEndTime = new Date(qcCheckDateEnd).getTime()
-    const fpCheckDateStartTime = new Date(fpCheckDateStart).getTime()
-    const fpCheckDateEndTime = new Date(fpCheckDateEnd).getTime()
 
     if(behosDateStartTime > behosDateEndTime){
         $.alerModal({"message":'出院日期开始时间不能大于结束时间~',type:"tip",time:'1000',isFather: true, fatherWrapper: $("#mainBox", parent.document)});
@@ -195,23 +182,12 @@ $(".filter").on("click", function(e){
         $.alerModal({"message":'病历核查开始时间不能大于结束时间~',type:"tip",time:'1000',isFather: true, fatherWrapper: $("#mainBox", parent.document)});
         return
     }
-
-    if(fpCheckDateStartTime > fpCheckDateEndTime){
-        $.alerModal({"message":'病案首页核查开始时间不能大于结束时间~',type:"tip",time:'1000',isFather: true, fatherWrapper: $("#mainBox", parent.document)});
-        return
-    }
     if(behosDateStart){
         behosDateStart = behosDateStart + ' 00:00:00'
     }
     if(behosDateEnd){
         behosDateEnd = behosDateEnd + ' 23:59:59'
     }
-    if(fpCheckDateStart){
-        fpCheckDateStart = fpCheckDateStart + ' 00:00:00'
-    }
-    if(fpCheckDateEnd){
-        fpCheckDateEnd = fpCheckDateEnd + ' 23:59:59'
-    }
     if(qcCheckDateStart){
         qcCheckDateStart = qcCheckDateStart + ' 00:00:00'
     }
@@ -225,9 +201,7 @@ $(".filter").on("click", function(e){
     deptName = deptNameTemp
     doctorName = doctorNameTemp
     doctorNum = doctorNumTemp
-    fpCheckStatus = fpCheckStatusTemp
     qcCheckStatus = qcCheckStatusTemp
-    fpCheckName = fpCheckNameTemp
     qcCheckName = qcCheckNameTemp
     qcCheckMain = qcCheckMainTemp
     if(deptName == ""){
@@ -250,17 +224,13 @@ $(".abnormalClear").on("click", function(e){
     deptNameTemp=""; 
     deptIdTemp="";  
     doctorName=doctorNameUrl=deptNameTemp=""; 
-    fpCheckName="";
-    qcCheckName="" ;  
+    qcCheckName="" ;
     qcCheckMain="" ;  
     doctorNum=""; 
     doctorNameTemp=""; 
     doctorNumTemp=""; 
-    fpCheckNameTemp="";
-    qcCheckNameTemp=""; 
+    qcCheckNameTemp="";
     qcCheckMainTemp=""; 
-    fpCheckStatus="";
-    fpCheckStatusTemp="";
     qcCheckStatus="";
     qcCheckStatusTemp=""
     data_desc=["leaveHospitalDate"]
@@ -278,7 +248,6 @@ $(".abnormalClear").on("click", function(e){
     $('.patientNameInp').val('')
     $('.doctorInp').val('')
     $('.doctorNumInp').val('')
-    $('.fpCheckPeople').val('')
     $('.qcCheckPeople').val('')
     $('.qcCheckMain').val('')
     // $('#datepicker').val('')
@@ -333,9 +302,6 @@ $(".abnormalClear").on("click", function(e){
     $(".levelList").css("display", "none")
     $(".selectLevel").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
     // $('.selectLevel ').addClass('unSelect')
-    $('.fpSelectCheck').html('全部')
-    $(".fpCheckList").css("display", "none")
-    $(".fpSelectCheck").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
     $('.qcSelectCheck').html('全部')
     $(".qcCheckList").css("display", "none")
     $(".qcSelectCheck").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
@@ -353,8 +319,6 @@ $(".abnormalClear").on("click", function(e){
     if(behosDateEnd){
         behosDateEnd = behosDateEnd + ' 23:59:59'
     }
-    fpCheckDateStart = ""
-    fpCheckDateEnd = ""
     qcCheckDateStart = ""
     qcCheckDateEnd = ""
    
@@ -391,23 +355,6 @@ function renderTab(data,hisId){
                 }
             }
         }
-                // <td >${item.behospitalCode || "-"}</td>
-                // <td>${item.fileCode || "-"}</td>
-                // <td  class="textCenter"><span data-index=${i} class="patientNameSpan">${item.name || "-"}<span></td>
-                // <td  class="textCenter">${item.sex || "-"}</td>
-                // <td  class="textCenter">${item.age || "-"}</td>
-                // <td  class="textCenter">${item.bedCode || "-"}</td>
-                // <td  class="textCenter">${item.behospitalDate&&item.behospitalDate.slice(0,10) || "-"}</td>
-                // <td  class="textCenter">${item.leaveHospitalDate&&item.leaveHospitalDate.slice(0,10)|| "-"}</td>
-                // <td  class="textCenter">${item.diagnose|| "-"}</td>
-                // <td  class="textCenter">${item.behDoctorName   || "-"}</td>
-                // <td  class="textCenter">${item.doctorName || "-"}</td>
-                // <td  class="textCenter">${item.directorDoctorName || "-"}</td>
-                // <td  class="textCenter">${item.behDeptName || "-"}</td>
-                // <td  class="textCenter">${item.level || "-"}</td>
-                // <td  class="textCenter">${item.scoreRes || "-"}</td>
-                // <td  class="textCenter">${item.gradeTime&&item.gradeTime.slice(0,10) || "-"}</td>
-            
         str += "</tr>"
     }
     if(data.length === 0){
@@ -460,8 +407,6 @@ $('.selectLevel').on("click", function(e){
     $(".selectDept .arrow").attr("src",iconDown)
     $(".checkList ").css("display", "none")
     $(".selectCheck .arrow").attr("src",iconDown)
-    $(".fpCheckList ").css("display", "none")
-    $(".fpSelectCheck .arrow").attr("src",iconDown)
     $(".qcSelectCheck .arrow").attr("src",iconDown)
     $(".qcCheckList ").css("display", "none")
     const showList =  $(".levelList ").css("display")
@@ -474,25 +419,6 @@ $('.selectLevel').on("click", function(e){
     }
 })
 
-//选择病案首页核查状态
-$('.fpSelectCheck').on("click", function(e){
-    e.stopPropagation()
-    $(".deptList ").css("display", "none")
-    $(".selectDept .arrow").attr("src",iconDown)
-    $(".levelList ").css("display","none")
-    $(".selectLevel .arrow").attr("src",iconDown)
-    $(".qcSelectCheck .arrow").attr("src",iconDown)
-    $(".qcCheckList ").css("display", "none")
-    const showList =  $(".fpCheckList ").css("display")
-    if(showList == "none" ||!showList){
-        $(".fpCheckList ").css("display","block")
-        $(".fpSelectCheck .arrow").attr("src",iconUp)
-    }else{
-        $(".fpCheckList ").css("display", "none")
-        $(".fpSelectCheck .arrow").attr("src",iconDown)
-    }
-})
-
 //选择病历核查状态
 $('.qcSelectCheck').on("click", function(e){
     e.stopPropagation()
@@ -500,8 +426,6 @@ $('.qcSelectCheck').on("click", function(e){
     $(".selectDept .arrow").attr("src",iconDown)
     $(".levelList ").css("display","none")
     $(".selectLevel .arrow").attr("src",iconDown)
-    $(".fpSelectCheck .arrow").attr("src",iconDown)
-    $(".fpCheckList ").css("display", "none")
     const showList =  $(".qcCheckList ").css("display")
     if(showList == "none" ||!showList){
         $(".qcCheckList ").css("display","block")
@@ -526,20 +450,6 @@ function bindLeveldSelect(){
     })
 }
 
-bindCheckedSelectFp()
-//病案首页核查状态选择
-function bindCheckedSelectFp(){
-    $('.fpCheckItem').on("click",function(){
-        const fpCheckItemName = $(this).attr("data-name")
-        const fpCheckItemItemId = $(this).attr("data-id") || ""
-        fpCheckStatusTemp =fpCheckItemItemId
-        $('.fpSelectCheck').html(fpCheckItemName)
-        $(".fpCheckList").css("display", "none")
-        $(".fpSelectCheck").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
-        $('.fpSelectCheck').removeClass('unSelect')
-    })
-}
-
 bindCheckedSelectQc()
 //病历核查状态选择
 function bindCheckedSelectQc(){
@@ -600,8 +510,6 @@ $('.selectDept').on("focus", function(e){
     $(".selectLevel .arrow").attr("src",iconDown)
     $(".checkList ").css("display", "none")
     $(".selectCheck .arrow").attr("src",iconDown)
-    $(".fpCheckList ").css("display", "none")
-    $(".fpSelectCheck .arrow").attr("src",iconDown)
     $(".qcCheckList ").css("display", "none")
     $(".qcSelectCheck .arrow").attr("src",iconDown)
     $(".deptList ").css("display","block")
@@ -1024,10 +932,6 @@ $("body").on("input",".doctorInp", function(e){
     const val = $(this).val().trim()
     doctorNameTemp = doctorNameUrl = val
 })
-$(".fpCheckPeople").on("input", function(e){
-    const val = $(this).val().trim()
-    fpCheckNameTemp = val
-})
 $(".qcCheckPeople").on("input", function(e){
     const val = $(this).val().trim()
     qcCheckNameTemp = val
@@ -1186,12 +1090,10 @@ function renderPagination(totalPage,activePage,totalNum){
 $(document).on("click", function(){
     $(".levelList ").css("display", "none")
     $(".checkList").css("display", "none")
-    $(".fpCheckList").css("display", "none")
     $(".qcCheckList").css("display", "none")
     $(".selectDept .arrow").attr("src",iconDown)
     $(".selectLevel .arrow").attr("src",iconDown)
     $(".selectCheck .arrow").attr("src",iconDown)
-    $(".fpSelectCheck .arrow").attr("src",iconDown)
     $(".qcSelectCheck .arrow").attr("src",iconDown)
 })
 
@@ -1213,28 +1115,20 @@ $(function($){
             patName: name, //病人姓名
             level:level,//病历等级
             deptName: deptName == "全部" ? "":deptName||"",
-            behDeptName: deptName == "全部" ? "":deptName||"",
             doctorName: doctorName,
             doctorId: doctorNum,    
-            startDate: behosDateStart.replace(/\//g,'-'), //出院日期--开始时间
-            endDate: behosDateEnd.replace(/\//g,'-'), //出院日期--结束时间
+            startDate: behosDateStart, //出院日期--开始时间
+            endDate: behosDateEnd, //出院日期--结束时间
             casesEntryName: casesEntryName, 
             isPlacefile:isPlacefile,          
             casesEntryId:casesId,
-            isReject: isSingleReject,
-            // doctorName: doctorName,
-            doctorId: doctorNum,
             ascs:data_asc,     //升序
             descs:data_desc,       //降序
             checkStatus: qcCheckStatus?Number(qcCheckStatus):qcCheckStatus, //病历核查状态
-            mrStatus: fpCheckStatus?Number(fpCheckStatus):fpCheckStatus,   //首页核查状态（1：已核查，0：未核查）
             chName: qcCheckName,   //病历核查人员
             diagnose: qcCheckMain,   
-            mrName: fpCheckName,  //首页核查人员
-            chTimeStart: qcCheckDateStart.replace(/\//g,'-'), //病历核查起始时间
-            chTimeEnd: qcCheckDateEnd.replace(/\//g,'-'), //病历核查截止时间
-            mrTimeStart: fpCheckDateStart.replace(/\//g,'-'), //首页核查起始时间
-            mrTimeEnd: fpCheckDateEnd.replace(/\//g,'-'), //首页核查截止时间
+            chTimeStart: qcCheckDateStart, //病历核查起始时间
+            chTimeEnd: qcCheckDateEnd, //病历核查截止时间
         }
         if (isInspection) {
             param = { ...param, casesEntryName: ''}