出院人数统计添加筛选条件

src/css/qcListOutHospital.less

@@ -133,7 +133,7 @@ h2{
     width: 100%;
 }
 .toggle-item{
-    display: block;
+    display: none;
 }
 .filter-toggler{
     position: absolute;
@@ -212,7 +212,7 @@ h2{
     width: 150px;
     max-height: 300px;
 }
-.selectLevel,.selectDept,.selectCheck,.selectLeaveHosType{
+.selectLevel,.selectDept,.fpSelectCheck,.qcSelectCheck,.selectLeaveHosType{
     display: inline-block;
     position: relative;
     width:120px;

src/html/qcListOutHospital.html

@@ -49,7 +49,7 @@
                     <span class="filterclear abnormalClear filterclearT">重置</span>
                     <span class="export">导出</span>
                 </div>
-                <a href="javascript:void(0);" class="filter-toggler up" id="filterToggler">收起筛选</a>
+                <a href="javascript:void(0);" class="filter-toggler" id="filterToggler">收起筛选</a>
                 <div class="toggle-item clearfix">
                     <span class="filterItem">
                         <span>病历等级：</span>
@@ -79,15 +79,44 @@
                         <input class="doctorNumInp" type="text" placeholder="请输入医生工号">
                     </span>
                     
-                    <span class="filterItem">
-                        <span>核查状态：</span>
-                        <span class="selectCheck">全部</span>
-                        <ul class="checkList filterDropList">
-                            <Li class="checkItem" data-name="全部" data-id="全部">全部</Li>
-                            <Li class="checkItem" data-name="未核查" data-id="0">未核查</Li>
-                            <Li class="checkItem" data-name="已核查" data-id="1">已核查</Li>
+                    <span class="filterItem 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 doctorFilter fpFilterItem">
+                        <span>病案首页核查人：</span>
+                        <input class="fpCheckPeople" type="text" placeholder="请输入病案首页核查人">
+                    </span>
+                    <span class="filterItem qcFiliterItem">
+                        <span>病历核查状态：</span>
+                        <span class="qcSelectCheck">全部</span>
+                        <ul class="checkList filterDropList qcCheckList">
+                            <Li class="qcCheckItem" data-name="全部" data-id="">全部</Li>
+                            <Li class="qcCheckItem" data-name="未核查" data-id="0">未核查</Li>
+                            <Li class="qcCheckItem" data-name="已核查" data-id="1">已核查</Li>
+                        </ul>
+                    </span>
+                    <span class="filterItem doctorFilter qcFiliterItem">
+                        <span>病历核查人：</span>
+                        <input class="qcCheckPeople" type="text" placeholder="请输入病历核查人">
+                    </span>
+                    <span class="filterItem 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 typeFilter clearfix qcFiliterItem" >
+                        <span class="fl">病历核查时间：</span>
+                        <span class="datapickerBox fl"><input type="text" placeholder="请选择时间" id="datepickerQc1" autocomplete="off" readonly /></span>
+                        <span  class="divide fl">-</span>
+                        <span class="datapickerBox fl"><input type="text" placeholder="请选择时间" id="datepickerQc2"  autocomplete="off" readonly/></span>
+                    </span>
                 </div>
             </div>
             <div class="overAuto">

src/js/qcListOutHospital.js

@@ -38,11 +38,14 @@ let currentPage;
 
 $(".selectLevel").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
 $(".selectDept").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
-$(".selectCheck").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
+$(".fpSelectCheck").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
+$(".qcSelectCheck").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
 $(".selectLeaveHosType").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="",
-  checkStatus="",checkStatusTemp="",leaveHosType="",leaveHosTypeTemp="",data_desc=["leaveHospitalDate"],data_asc=[];
+  nameTemp = "", behospitalCodeTemp="",levelTemp="", deptId="",deptIdTemp="", doctorName="", deptName="", deptNameTemp="",
+  doctorNum="",doctorNameTemp="",doctorNumTemp="",leaveHosType="",leaveHosTypeTemp="",
+  fpCheckStatus="",fpCheckStatusTemp="",fpCheckName="",fpCheckNameTemp="",qcCheckName="",qcCheckNameTemp="",qcCheckStatus="",qcCheckStatusTemp="",fpCheckDateStart="",fpCheckDateEnd="",
+  qcCheckDateStart="",qcCheckDateEnd="",data_desc=["leaveHospitalDate"],data_asc=[];
 if(chengdu){
     levelTemp = chengdu
     level = chengdu
@@ -132,8 +135,15 @@ function getTabData(activePage){
         size: 15,
         doctorName: doctorName,
         doctorId: doctorNum,
-        checkStatus: checkStatus?Number(checkStatus):checkStatus, //核查状态
         leaveHosType: leaveHosType  == "全部" ? "":leaveHosType, //出院人数类型
+        checkStatus: qcCheckStatus?Number(qcCheckStatus):qcCheckStatus, //病历核查状态
+        mrStatus: fpCheckStatus?Number(fpCheckStatus):fpCheckStatus,   //首页核查状态（1：已核查，0：未核查）
+        chName: qcCheckName,   //病历核查人员
+        mrName: fpCheckName,  //首页核查人员
+        chTimeStart: qcCheckDateStart.replace(/\//g,'-'), //病历核查起始时间
+        chTimeEnd: qcCheckDateEnd.replace(/\//g,'-'), //病历核查截止时间
+        mrTimeStart: fpCheckDateStart.replace(/\//g,'-'), //首页核查起始时间
+        mrTimeEnd: fpCheckDateEnd.replace(/\//g,'-'), //首页核查截止时间
     }
     return post(api.leaveHosMRPage,param).then(res =>{
         if(res.data.code == '0'){
@@ -162,10 +172,28 @@ function getTabData(activePage){
 $(".filter").on("click", function(e){
     behosDateStart = $("#datepicker").val()
     behosDateEnd = $("#datepicker2").val()
-    const start = new Date(behosDateStart).getTime()
-    const end = new Date(behosDateEnd).getTime()
-    if(start > end){
-        $.alerModal({"message":'开始时间不能大于结束时间~',type:"tip",time:'1000',isFather: true, fatherWrapper: $("#mainBox", parent.document)});
+    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)});
+        return
+    }
+    if(qcCheckDateStartTime > qcCheckDateEndTime){
+        $.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){
@@ -174,6 +202,18 @@ $(".filter").on("click", function(e){
     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'
+    }
+    if(qcCheckDateEnd){
+        qcCheckDateEnd = qcCheckDateEnd + ' 23:59:59'
+    }
 
     name = nameTemp
     behospitalCode = behospitalCodeTemp
@@ -182,8 +222,11 @@ $(".filter").on("click", function(e){
     deptName = deptNameTemp
     doctorName = doctorNameTemp
     doctorNum = doctorNumTemp
-    checkStatus = checkStatusTemp
     leaveHosType = leaveHosTypeTemp
+    fpCheckStatus = fpCheckStatusTemp
+    qcCheckStatus = qcCheckStatusTemp
+    fpCheckName = fpCheckNameTemp
+    qcCheckName = qcCheckNameTemp
     getTabData(1)
 })
 $(".abnormalClear").on("click", function(e){
@@ -199,12 +242,18 @@ $(".abnormalClear").on("click", function(e){
     deptName=""; 
     deptNameTemp=""; 
     deptIdTemp="";  
-    doctorName=""; 
+    doctorName="";
+    fpCheckName="";
+    qcCheckName="" ;   
     doctorNum=""; 
     doctorNameTemp=""; 
     doctorNumTemp=""; 
-    checkStatus="";
-    checkStatusTemp="";
+    fpCheckNameTemp="";
+    qcCheckNameTemp=""; 
+    fpCheckStatus="";
+    fpCheckStatusTemp="";
+    qcCheckStatus="";
+    qcCheckStatusTemp=""
     leaveHosType="";
     leaveHosTypeTemp="";
     data_desc=["leaveHospitalDate"];
@@ -220,9 +269,11 @@ $(".abnormalClear").on("click", function(e){
     $('.doctorInp').val('')
     $('.doctorNumInp').val('')
     $('.doctorInp').val('')
+    $('.fpCheckPeople').val('')
+    $('.qcCheckPeople').val('')
     // $('#datepicker').val('')
     // $('#datepicker2').val('')
-    //默认日期为近一个月
+    //默认日期为本年
     let year = new Date().getFullYear()
     let month = new Date().getMonth() + 1
     $( "#datepicker" ).datepicker({
@@ -235,6 +286,26 @@ $(".abnormalClear").on("click", function(e){
         changeYear: true,
         dateFormat:"yy/mm/dd"
     }).datepicker( "setDate",new Date());
+    $( "#datepickerFp1" ).datepicker({
+        changeMonth: true,
+        changeYear: true,
+        dateFormat:"yy/mm/dd",
+    }).datepicker( "setDate", "");
+    $( "#datepickerFp2" ).datepicker({
+        changeMonth: true,
+        changeYear: true,
+        dateFormat:"yy/mm/dd"
+    }).datepicker( "setDate","");
+    $( "#datepickerQc1" ).datepicker({
+        changeMonth: true,
+        changeYear: true,
+        dateFormat:"yy/mm/dd",
+    }).datepicker( "setDate", "");
+    $( "#datepickerQc2" ).datepicker({
+        changeMonth: true,
+        changeYear: true,
+        dateFormat:"yy/mm/dd"
+    }).datepicker( "setDate","");
     if(from == 2){
         // console.log('deptListDept',deptListDept)
         // $('.selectDept ').html(deptListDept[0].deptName)
@@ -248,9 +319,12 @@ $(".abnormalClear").on("click", function(e){
     $(".levelList").css("display", "none")
     $(".selectLevel").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
     // $('.selectLevel ').addClass('unSelect')
-    $('.selectCheck').html('全部')
-    $(".checkList").css("display", "none")
-    $(".selectCheck").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
+    $('.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="下拉">`)
     $('.selectLeaveHosType').html('全部')
     $(".leaveHosTypeList").css("display", "none")
     $(".selectLeaveHosType").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
@@ -264,6 +338,10 @@ $(".abnormalClear").on("click", function(e){
     if(behosDateEnd){
         behosDateEnd = behosDateEnd + ' 23:59:59'
     }
+    fpCheckDateStart = ""
+    fpCheckDateEnd = ""
+    qcCheckDateStart = ""
+    qcCheckDateEnd = ""
    
     getTabData(1)
 })
@@ -285,7 +363,7 @@ function renderTab(data,hisId){
                 <td  class="textCenter">${(currentPage-1)*15 + i+1}</td>`
         for(let j = 0; j < pageSet.length; j++){
             if(pageSet[j].status == 1){
-                if(pageSet[j].val === "checkStatus"){
+                if(pageSet[j].val === "checkStatus" || pageSet[j].val === "mrStatus" ){
                     str +=  `<td class="${isTextCenter(pageSet[j].val) ? 'textCenter':''}"><span data-index=${i} class="${pageSet[j].val=='name'?'patientNameSpan':'' } ">${item[pageSet[j].val] =="1"? "已核查" :item[pageSet[j].val] === 0 ? "未核查":"-"}<span></td>`
                 }else{
                     str +=  `<td class="${isTextCenter(pageSet[j].val) ? 'textCenter':''}"><span data-index=${i} class="${pageSet[j].val=='name'?'patientNameSpan':'' } ">${item[pageSet[j].val] || "-"}<span></td>`
@@ -362,6 +440,10 @@ $('.selectLevel').on("click", function(e){
     $(".selectCheck .arrow").attr("src",iconDown)
     $(".leaveHosTypeList").css("display", "none")
     $(".selectLeaveHosType").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
+    $(".fpCheckList ").css("display", "none")
+    $(".fpSelectCheck .arrow").attr("src",iconDown)
+    $(".qcSelectCheck .arrow").attr("src",iconDown)
+    $(".qcCheckList ").css("display", "none")
     const showList =  $(".levelList ").css("display")
     if(showList == "none" ||!showList){
         $(".levelList ").css("display","block")
@@ -372,8 +454,8 @@ $('.selectLevel').on("click", function(e){
     }
 })
 
-//选择核查状态
-$('.selectCheck').on("click", function(e){
+//选择病案首页核查状态
+$('.fpSelectCheck').on("click", function(e){
     e.stopPropagation()
     $(".deptList ").css("display", "none")
     $(".selectDept .arrow").attr("src",iconDown)
@@ -381,13 +463,36 @@ $('.selectCheck').on("click", function(e){
     $(".selectLevel .arrow").attr("src",iconDown)
     $(".leaveHosTypeList").css("display", "none")
     $(".selectLeaveHosType").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
-    const showList =  $(".checkList ").css("display")
+    $(".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()
+    $(".deptList ").css("display", "none")
+    $(".selectDept .arrow").attr("src",iconDown)
+    $(".levelList ").css("display","none")
+    $(".selectLevel .arrow").attr("src",iconDown)
+    $(".leaveHosTypeList").css("display", "none")
+    $(".selectLeaveHosType").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
+    $(".fpSelectCheck .arrow").attr("src",iconDown)
+    $(".fpCheckList ").css("display", "none")
+    const showList =  $(".qcCheckList ").css("display")
     if(showList == "none" ||!showList){
-        $(".checkList ").css("display","block")
-        $(".selectCheck .arrow").attr("src",iconUp)
+        $(".qcCheckList ").css("display","block")
+        $(".qcSelectCheck .arrow").attr("src",iconUp)
     }else{
-        $(".checkList ").css("display", "none")
-        $(".selectCheck .arrow").attr("src",iconDown)
+        $(".qcCheckList ").css("display", "none")
+        $(".qcSelectCheck .arrow").attr("src",iconDown)
     }
 })
 
@@ -439,17 +544,31 @@ function bindleaveHosTypeSelect(){
     })
 }
 
-bindCheckedSelect()
-//核查状态选择
-function bindCheckedSelect(){
-    $('.checkItem').on("click",function(){
-        const checkItemName = $(this).attr("data-name")
-        const checkItemItemId = $(this).attr("data-id")
-        checkStatusTemp =checkItemItemId
-        $('.selectCheck').html(checkItemName)
-        $(".checkList").css("display", "none")
-        $(".selectCheck").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
-        $('.selectCheck').removeClass('unSelect')
+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(){
+    $('.qcCheckItem').on("click",function(){
+        const qcCheckItemName = $(this).attr("data-name")
+        const qcCheckItemItemId = $(this).attr("data-id") || ""
+        qcCheckStatusTemp =qcCheckItemItemId
+        $('.qcSelectCheck').html(qcCheckItemName)
+        $(".qcCheckList").css("display", "none")
+        $(".qcSelectCheck").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
+        $('.qcSelectCheck').removeClass('unSelect')
     })
 }
 
@@ -494,10 +613,13 @@ $('.selectDept').on("click", function(e){
     e.stopPropagation()
     $(".levelList ").css("display","none")
     $(".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)
     $(".leaveHosTypeList").css("display", "none")
     $(".selectLeaveHosType").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
+    
     const showList =  $(".deptList ").css("display")
     if(showList == "none" ||!showList){
         $(".deptList ").css("display","block")
@@ -871,6 +993,14 @@ $(".doctorInp").on("input", function(e){
     const val = $(this).val().trim()
     doctorNameTemp = 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
+})
 $(".doctorNumInp").on("input", function(e){
   const val = $(this).val().trim();
     doctorNumTemp = val
@@ -931,6 +1061,26 @@ $(function() {
         changeYear: true,
         dateFormat:"yy/mm/dd"
     }).datepicker( "setDate",endDate);
+    $( "#datepickerFp1" ).datepicker({
+        changeMonth: true,
+        changeYear: true,
+        dateFormat:"yy/mm/dd"
+    }).datepicker( "setDate","");
+    $( "#datepickerFp2" ).datepicker({
+        changeMonth: true,
+        changeYear: true,
+        dateFormat:"yy/mm/dd"
+    }).datepicker( "setDate","");
+    $( "#datepickerQc1" ).datepicker({
+        changeMonth: true,
+        changeYear: true,
+        dateFormat:"yy/mm/dd"
+    }).datepicker( "setDate","");
+    $( "#datepickerQc2" ).datepicker({
+        changeMonth: true,
+        changeYear: true,
+        dateFormat:"yy/mm/dd"
+    }).datepicker( "setDate","");
     getPageSet().then(res =>{
         $(".filter").click();   //初始查询
     })
@@ -1001,12 +1151,14 @@ function renderPagination(totalPage,activePage,totalNum){
 $(document).on("click", function(){
     $(".levelList ").css("display", "none")
     $(".deptList").css("display", "none")
-    $(".checkList").css("display", "none")
     $(".leaveHosTypeList").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)
     $(".selectLeaveHosType .arrow").attr("src",iconDown)
+    $(".fpSelectCheck .arrow").attr("src",iconDown)
+    $(".qcSelectCheck .arrow").attr("src",iconDown)
 })
 $(function($){
     $('.export').click(function(){
@@ -1031,7 +1183,14 @@ $(function($){
             endDate: behosDateEnd.replace(/\//g,'-'), //出院日期--结束时间
             doctorName: doctorName,
             doctorId: doctorNum,
-            checkStatus: checkStatus?Number(checkStatus):checkStatus, //核查状态
+            checkStatus: qcCheckStatus?Number(qcCheckStatus):qcCheckStatus, //病历核查状态
+            mrStatus: fpCheckStatus?Number(fpCheckStatus):fpCheckStatus,   //首页核查状态（1：已核查，0：未核查）
+            chName: qcCheckName,   //病历核查人员
+            mrName: fpCheckName,  //首页核查人员
+            chTimeStart: qcCheckDateStart.replace(/\//g,'-'), //病历核查起始时间
+            chTimeEnd: qcCheckDateEnd.replace(/\//g,'-'), //病历核查截止时间
+            mrTimeStart: fpCheckDateStart.replace(/\//g,'-'), //首页核查起始时间
+            mrTimeEnd: fpCheckDateEnd.replace(/\//g,'-'), //首页核查截止时间
             leaveHosType: leaveHosType  == "全部" ? "":leaveHosType, //出院人数类型
         }
         expJson(api.leaveHosMrPageExport,param).then(res =>{