模糊匹配

src/css/partDetailControl.less

@@ -133,6 +133,7 @@
     
     .filterDropList{
         position: absolute;
+        top: 34px !important;
         right: 0;
         max-height: 200px;
         overflow-y: auto;

src/css/qcListCopy.less

@@ -185,6 +185,7 @@ h2{
 .filterDropList{
     position: absolute;
     right: 0;
+    top: 34px !important;
     max-height: 200px;
     overflow-y: auto;
     background: #fff;

src/css/qcListCopyUnqualified.less

@@ -185,6 +185,7 @@ h2{
 .filterDropList{
     position: absolute;
     right: 0;
+    top: 34px !important;
     max-height: 200px;
     overflow-y: auto;
     background: #fff;

src/css/uncorrectedCopy.less

@@ -157,6 +157,7 @@
   .filterDropList{
     position: absolute;
     right: 0;
+    top: 34px !important;
     max-height: 200px;
     overflow-y: auto;
     background: #fff;

src/html/partDetailControl.html

@@ -25,7 +25,8 @@
             <div class="filterBox clearfix">
                 <span class="filterItem typeFilter">
                     <span>科室名称：</span>
-                    <input class="patientNumInp" style="width: 148px;" type="text" placeholder="请输入科室名称">
+                    <input type="text" class="selectDept canEditDept" value="全部">
+                    <ul class="deptList filterDropList"></ul>
                 </span>
                 <!-- <span class="filterItem typeFilter deptListWrap">
                     <span>合格率：</span>

src/html/qcListCopy.html

@@ -20,10 +20,7 @@
                 <div class="clearfix">
                     <span class="filterItem typeFilter deptListWrap">
                         <span>科室：</span>
-                        <span class="selectDept">
-                            全部
-                        </span>
-
+                        <input type="text" class="selectDept canEditDept" value="全部">
                         <ul class="deptList filterDropList"></ul>
                     </span>
                     <span class="filterItem typeFilter clearfix" >

src/html/qcListCopyUnqualified.html

@@ -20,9 +20,8 @@
                 <div class="clearfix">
                     <span class="filterItem typeFilter deptListWrap">
                         <span>科室：</span>
-                        <span class="selectDept">
-                            全部
-                        </span>
+                        <input type="text" class="selectDept canEditDept" value="全部">
+                        <ul class="deptList filterDropList"></ul>
 
                         <ul class="deptList filterDropList"></ul>
                     </span>

src/html/uncorrectedCasesStatistics.html

@@ -28,7 +28,6 @@
             </span> -->
             <span class="filterItem typeFilter">
                 <span>科室名称：</span>
-                <!-- <input class="patientNumInp" style="width: 148px;" type="text" placeholder="请输入科室名称"> -->
                 <input type="text" class="selectDept canEditDept" value="全部">
                 <ul class="deptList filterDropList"></ul>
             </span>

src/html/uncorrectedCopy.html

@@ -28,7 +28,8 @@
             </span> -->
             <span class="filterItem typeFilter">
                 <span>科室名称：</span>
-                <input class="patientNumInp" style="width: 148px;" type="text" placeholder="请输入科室名称">
+                <input type="text" class="selectDept canEditDept" value="全部">
+                <ul class="deptList filterDropList"></ul>
             </span>
             <span class="filterItem typeFilter clearfix dataSelectLight">
                     <span class="fl dateTime">出院日期：</span>

src/js/checkControl.js

@@ -67,6 +67,7 @@ $(".abnormalClear").click(function(){
     setDatePicker($("#datepicker"),$("#datepicker2"),"default")
     $(".patientNumInp").val("")
     $("th[code]").removeClass("desc asc");
+    $(".selectDept").attr({'title':"全部",'data-id':''}).val("全部")
     behospitalCode =behospitalCodeTemp= ""
     getTabData(1)
 })
@@ -136,7 +137,7 @@ function getTabData(activePage){
     const param = {
         "level": deptId||"",
         "name": behospitalCode||"",
-        "deptName": deptName||"",
+        "deptName": deptName=="全部"?"":deptName||"",
         "asc":data_asc,     //升序
         "desc":data_desc,       //降序
         "type": 0, //1-本月，2-本年,0-自定义时间（现在所有都是自定义时间，都会传开始日期和结束日期）
@@ -605,6 +606,7 @@ $(function() {
         const param = {
         "level": deptId||"",
         "name": behospitalCode||"",
+        "deptName": deptName=="全部"?"":deptName||"",
         "asc":data_asc,     //升序
         "desc":data_desc,       //降序
         "type": statisticsType||2, //1-本月，2-本年

src/js/deptScoreDetailControl.js

@@ -67,7 +67,7 @@ $(".abnormalClear").click(function(){
     behospitalCode=behospitalCodeTemp = ""
     deptId =deptIdTemp= ""
     deptName =deptNameTemp= ""
-    $(".selectDept").attr({'title':"全部",'data-id':''}).html("全部").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
+    $(".selectDept").attr({'title':"全部",'data-id':''}).val("全部")
     $(".patientNumInp").val("")
     getTabData(1)
 })
@@ -141,7 +141,7 @@ function getTabData(activePage){
         "desc": data_desc,
         "name": behospitalCode||"",
         "deptClass": deptId||'',
-        "deptName": deptName||'',
+        "deptName": deptName=="全部"?"":deptName||"",
         "type": 0, //1-本月，2-本年,0-自定义时间（现在 都是自定义时间，都会传具体时间进去）
         "startDate":dateStatrt,
         "endDate":dateEnd
@@ -682,7 +682,7 @@ $(function() {
         "desc": data_desc,
         "name": behospitalCode||"",
         "deptClass": deptId||'',
-        "deptName": deptName||'',
+        "deptName": deptName=="全部"?"":deptName||"",
         "type": statisticsType||2, //1-本月，2-本年
         "startDate":startDateParam,
         "isPlacefile":isPlacefile,

src/js/keyItemFlawControl.js

@@ -48,9 +48,7 @@ $(".abnormalClear").click(function(){
   deptName="";
   deptNameTemp="";
   setDatePicker($("#datepicker"),$("#datepicker2"),"default")
-  $('.selectDept ').html('全部')
-  $(".deptList").css("display", "none")
-  $(".selectDept").append(`<img class="arrow" src=${iconDown} alt="下拉">`);
+  $(".selectDept").attr({'title':"全部",'data-id':''}).val("全部")
   $("th[code]").removeClass("asc desc")
   //behospitalCode =behospitalCodeTemp= ""
   getTabData(1)
@@ -89,7 +87,7 @@ function getTabData(activePage){
   const param = {
     current: 1,
     size: 15,
-    "deptName": deptName,
+    "deptName": deptName=="全部"?"":deptName||"",
     "asc":data_asc,     //升序
     "desc":data_desc,       //降序
     //"type": 0, //1-本月，2-本年,0-自定义时间（现在所有都是自定义时间，都会传开始日期和结束日期）
@@ -340,7 +338,7 @@ $(function() {
       }
       const param = {
         "isPlacefile":isPlacefile,
-        "deptName": deptName,
+        "deptName": deptName=="全部"?"":deptName||"",
         "asc":data_asc,     //升序
         "desc":data_desc,       //降序
         "startDate":startDateParam.replace(/\//g,'-'),

src/js/partDetailControl.js

@@ -17,7 +17,7 @@ $(".selectDept").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
 listenScroll()
 let isPlacefile = getCookie('isPlacefile')||1
 
-let tabList = [], name = "", behospitalCode="", behosDateStart="", level="",behosDateEnd="", scoreSum = 0,statisticsType="",
+let tabList = [], name = "",deptName="",deptNameTemp="", behospitalCode="", behosDateStart="", level="",behosDateEnd="", scoreSum = 0,statisticsType="",
   nameTemp = "", behospitalCodeTemp="",levelTemp="", deptId="",deptIdTemp="", doctorName="", doctorNum="",doctorNameTemp="",doctorNumTemp="",
   data_desc="deptName",data_asc="";
   let srcUrl = $("#contentIframe",parent.document).attr("src")
@@ -64,6 +64,10 @@ $(".abnormalClear").click(function(){
     $(".patientNumInp").val("")
     $("th[code]").removeClass("desc asc");
     behospitalCode =behospitalCodeTemp= ""
+    deptName = deptNameTemp = ""
+    level = levelTemp = ""
+    deptId = deptIdTemp = ""
+    $(".selectDept").attr({'title':"全部",'data-id':''}).val("全部")
     getTabData(1)
 })
 $(".partTitle a").click(function(){
@@ -133,6 +137,7 @@ function getTabData(activePage){
     const param = {
         "level": deptId||"",
         "name": behospitalCode||"",
+        "deptName": deptName=="全部"?"":deptName||"",
         "asc":data_asc,     //升序
         "desc":data_desc,       //降序
         "type": 0, //1-本月，2-本年,0-自定义时间（现在所有都是自定义时间，都会传开始日期和结束日期）
@@ -168,6 +173,8 @@ $(".filter").on("click", function(e){
     behospitalCode = behospitalCodeTemp
     level = levelTemp
     deptId = deptIdTemp
+    deptName = deptNameTemp
+    console.log(deptName)
     getTabData(1)
 })
 function renderTab(data,hisId,activePage){
@@ -368,43 +375,59 @@ function bindLeveldSelect(){
 
 //全选绑定
 
-$('.selectDept').on("click", function(e){
+$('.selectDept').on("focus", function(e){
     e.stopPropagation()
-    $(".levelList ").css("display","none")
-    $(".selectLevel .arrow").attr("src",iconDown)
-    const showList =  $(".deptList ").css("display")
-    if(showList == "none" ||!showList){
-        $(".deptList ").css("display","block")
-        $(".selectDept .arrow").attr("src",iconUp)
-    }else{
-        $(".deptList ").css("display", "none")
-        $(".selectDept .arrow").attr("src",iconDown)
-    }
+    $(".deptList ").css("display","block")
 })
+$('.selectDept').on("blur", function(e){
+    $(".deptList ").css("display", "none")
+    $(".selectDept .arrow").attr("src",iconDown)
+  })
+  $('.selectDept').on("input", function(e){
+    let val = $(this).val().trim()
+    deptName = deptNameTemp = val
+    getDeptList(deptName)
+  })
+//获取科室列表
+getDeptList()
+function getDeptList(val){
+    post(api.getDeptList,{inputStr:val=="全部"?"":val||""}).then(res =>{
+        if(res.data.code == '0'){
+           const deptList = res.data.data||[]
+           rendeDeptList(deptList)
+        }else{
+            rendeDeptList([])
+        }
+    }).catch((e) =>{
 
+    })
+}
 
 function rendeDeptList(deptList){
-    let str = `<li class="deptItem " data-id=" " data-name="全部">全部</li>`
+    if(deptList.length == 0){
+      $('.deptList').html("")
+      return
+    }
+    let str = `<li class="deptItem " data-id="" data-name="全部">全部</li>`
     for(let i = 0; i < deptList.length; i++){
         str += `<li class="deptItem ellipsis" title=${deptList[i].deptName} data-id=${deptList[i].deptId} data-name=${deptList[i].deptName}> ${deptList[i].deptName}</li>`
     }
     $('.deptList').html(str)
+    bindDeptSelect()
 }
-bindDeptSelect()
 //科室选择
 function bindDeptSelect(){
-    $('.deptItem').on("click",function(){
+    $('.deptItem').on("mousedown",function(){
         const deptItemName = $(this).attr("data-name")
         const deptItemId = $(this).attr("data-id")
+        deptNameTemp=deptItemName=="全部"?"":deptItemName;
         deptIdTemp =deptItemId
         if(deptItemName.length > 10){
-            $('.selectDept').html(deptItemName.substring(0,8)+'...')
+            $('.selectDept').val(deptItemName.substring(0,8)+'...')
         }else{
-            $('.selectDept').html(deptItemName)
+            $('.selectDept').val(deptItemName)
         }
         $('.selectDept ').attr('title',deptItemName)
-        $(".selectDept").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
-
         $(".deptList").css("display", "none")
     })
 }
@@ -553,12 +576,6 @@ function renderPagination(totalPage,activePage,totalNum){
     
 }
 
-$(document).on("click", function(){
-    $(".levelList ").css("display", "none")
-    $(".deptList").css("display", "none")
-    $(".selectDept .arrow").attr("src",iconDown)
-})
-
 
 $(function() {
     const  iconCalenBlue= require("./../images/icon_calen_blue.png")
@@ -584,6 +601,7 @@ $(function() {
         "isPlacefile":isPlacefile,
         "level": deptId||"",
         "name": behospitalCode||"",
+        "deptName": deptName=="全部"?"":deptName||"",
         "asc":data_asc,     //升序
         "desc":data_desc,       //降序
         "type": statisticsType||2, //1-本月，2-本年

src/js/qcListCopy.js

@@ -78,13 +78,12 @@ if(deptIdPram&&deptNamePram){
     deptIdTemp = deptIdPram = deptIdPram
     deptName = deptNameTemp = deptNamePram
     if(deptNamePram.length > 10){
-        $('.selectDept').html(deptNamePram.substring(0,8)+'...')
+        $('.selectDept').val(deptNamePram.substring(0,8)+'...')
     }else{
-        $('.selectDept').html(deptNamePram)
+        $('.selectDept').val(deptNamePram)
     }
     $('.selectDept ').attr('title',deptNamePram)
     $(".deptList").css("display", "none")
-    $(".selectDept").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
 }
 if(from==2){
     $(".export").css('display','none')
@@ -93,7 +92,7 @@ if(from==2){
     deptName=deptListDept[0]&&deptListDept[0].deptName;
     deptNameTemp=deptListDept[0]&&deptListDept[0].deptName;
     deptIdTemp=deptListDept[0]&&deptListDept[0].deptId;
-    $('.selectDept').html(deptName)
+    $('.selectDept').val(deptName)
 }else if(from==3){
   $(".partTitle .titlePic ").html(`<a href="keyItemFlawControl.html">关键条目缺陷占比 / </a>病历列表`)
 }else if(from==4){
@@ -197,7 +196,8 @@ function getTabData(activePage){
         behospitalCode: behospitalCode,
         patName: name, //病人姓名
         level:level,//病历等级
-        behDeptName: deptName == "全部" ? "":deptName,
+        behDeptName: deptName == "全部" ? "":deptName||"",
+        deptName: deptName == "全部" ? "":deptName||"",
         ascs:data_asc,     //升序
         descs:data_desc,       //降序
         startDate: behosDateStart.replace(/\//g,'-'), //出院日期--开始时间
@@ -405,21 +405,19 @@ $(".abnormalClear").on("click", function(e){
         dateFormat:"yy/mm/dd"
     }).datepicker( "setDate","");
     if(from == 2){
-        $('.selectDept ').html(deptListDept[0].deptName)
+        $('.selectDept ').val(deptListDept[0].deptName)
     } else if (from == 4 || from == 9){
         if(deptNamePram.length > 10){
-            $('.selectDept').html(deptNamePram.substring(0,8)+'...')
+            $('.selectDept').val(deptNamePram.substring(0,8)+'...')
         }else{
-            $('.selectDept').html(deptNamePram)
+            $('.selectDept').val(deptNamePram)
         }
         $('.selectDept ').attr('title',deptNamePram)
         $(".deptList").css("display", "none")
-        $(".selectDept").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
     }else{
         $('.selectDept ').html('全部')
     }
     $(".deptList").css("display", "none")
-    $(".selectDept").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
     // $('.selectDept ').addClass('unSelect')
     $('.selectLevel').html('全部')
     $(".levelList").css("display", "none")
@@ -678,7 +676,7 @@ function bindOperaAll(){
     })
 }
 
-$('.selectDept').on("click", function(e){
+$('.selectDept').on("focus", function(e){
     e.stopPropagation()
     $(".levelList ").css("display","none")
     $(".selectLevel .arrow").attr("src",iconDown)
@@ -686,32 +684,69 @@ $('.selectDept').on("click", function(e){
     $(".fpSelectCheck .arrow").attr("src",iconDown)
     $(".qcCheckList ").css("display", "none")
     $(".qcSelectCheck .arrow").attr("src",iconDown)
-    const showList =  $(".deptList ").css("display")
-    if(showList == "none" ||!showList){
-        $(".deptList ").css("display","block")
-        $(".selectDept .arrow").attr("src",iconUp)
-    }else{
-        $(".deptList ").css("display", "none")
-        $(".selectDept .arrow").attr("src",iconDown)
-    }
+    $(".deptList ").css("display","block")
+})
+$('.selectDept').on("blur", function(e){
+  $(".deptList ").css("display", "none")
+  $(".selectDept .arrow").attr("src",iconDown)
+})
+$('.selectDept').on("input", function(e){
+  let val = $(this).val().trim()
+  deptName = deptNameTemp = val
+  getDeptList(deptName)
 })
 
 //获取科室列表
 getDeptList()
-function getDeptList(){
+function getDeptList(val){
     if(from == 2){
         rendeDeptList(deptListDept) 
         return
     }
-    post(api.getDeptList,{inputStr:""}).then(res =>{
+    post(api.getDeptList,{inputStr:val=="全部"?"":val||""}).then(res =>{
         if(res.data.code == '0'){
-           const  deptList = res.data.data
+           const  deptList = res.data.data||[]
            rendeDeptList(deptList)
-        }else{}
+        }else{
+            rendeDeptList([])
+        }
     }).catch((e) =>{
 
     })
 }
+function rendeDeptList(deptList){
+    if(deptList.length == 0){
+      $('.deptList').html("")
+      return
+    }
+    let str = `<li class="deptItem ellipsis" data-id=" " data-name="全部">全部</li>`;
+    if(from == 2){
+        str = ''
+    }
+    for(let i = 0; i < deptList.length; i++){
+        str += `<li class="deptItem ellipsis" title=${deptList[i].deptName} data-id=${deptList[i].deptId} data-name=${deptList[i].deptName}> ${deptList[i].deptName}</li>`
+    }
+    $('.deptList').html(str)
+    bindDeptSelect()
+}
+//科室选择
+function bindDeptSelect(){
+    $('.deptItem').on("mousedown",function(){
+        const deptItemName = $(this).attr("data-name")
+        const deptItemId = $(this).attr("data-id")
+        deptIdTemp =deptItemId
+        deptNameTemp=deptItemName==="全部"?"":deptItemName;
+        if(deptItemName.length > 10){
+            $('.selectDept').val(deptItemName.substring(0,8)+'...')
+        }else{
+            $('.selectDept').val(deptItemName)
+        }
+        $('.selectDept ').attr('title',deptItemName)
+        $(".deptList").css("display", "none")
+        $('.selectDept').removeClass('unSelect')
+    })
+}
+
 
 //获取页面配置
 
@@ -779,35 +814,7 @@ function bindSetCol(){
 }
 
 
-function rendeDeptList(deptList){
-    let str = `<li class="deptItem ellipsis" data-id=" " data-name="全部">全部</li>`;
-    if(from == 2){
-        str = ''
-    }
-    for(let i = 0; i < deptList.length; i++){
-        str += `<li class="deptItem ellipsis" title=${deptList[i].deptName} data-id=${deptList[i].deptId} data-name=${deptList[i].deptName}> ${deptList[i].deptName}</li>`
-    }
-    $('.deptList').html(str)
-    bindDeptSelect()
-}
-//科室选择
-function bindDeptSelect(){
-    $('.deptItem').on("click",function(){
-        const deptItemName = $(this).attr("data-name")
-        const deptItemId = $(this).attr("data-id")
-        deptIdTemp =deptItemId
-        deptNameTemp = deptItemName
-        if(deptItemName.length > 10){
-            $('.selectDept').html(deptItemName.substring(0,8)+'...')
-        }else{
-            $('.selectDept').html(deptItemName)
-        }
-        $('.selectDept ').attr('title',deptItemName)
-        $(".selectDept").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
-        $(".deptList").css("display", "none")
-        $('.selectDept').removeClass('unSelect')
-    })
-}
+
 function loading(){
     const str = `
     <div class="loadingBox">
@@ -1266,7 +1273,6 @@ function renderPagination(totalPage,activePage,totalNum){
 
 $(document).on("click", function(){
     $(".levelList ").css("display", "none")
-    $(".deptList").css("display", "none")
     $(".fpCheckList").css("display", "none")
     $(".qcCheckList").css("display", "none")
     $(".selectDept .arrow").attr("src",iconDown)
@@ -1296,7 +1302,8 @@ $(function($){
             behospitalCode: behospitalCode,
             patName: name, //病人姓名
             level:level,//病历等级
-            behDeptName: deptName,
+            deptName: deptName == "全部" ? "":deptName||"",
+            behDeptName: deptName == "全部" ? "":deptName||"",
             ascs:data_asc,     //升序
             descs:data_desc,       //降序
             ruleType:ruleType,

src/js/qcListCopyUnqualified.js

@@ -79,9 +79,9 @@ if(deptIdPram&&deptNamePram){
     deptIdTemp = deptIdPram = deptIdPram
     deptName = deptNameTemp = deptNamePram
     if(deptNamePram.length > 10){
-        $('.selectDept').html(deptNamePram.substring(0,8)+'...')
+        $('.selectDept').val(deptNamePram.substring(0,8)+'...')
     }else{
-        $('.selectDept').html(deptNamePram)
+        $('.selectDept').val(deptNamePram)
     }
     $('.selectDept ').attr('title',deptNamePram)
     $(".deptList").css("display", "none")
@@ -147,7 +147,8 @@ function getTabData(activePage){
         behospitalCode: behospitalCode,
         patName: name, //病人姓名
         level:level,//病历等级
-        behDeptName: deptName == "全部" ? "":deptName,
+        behDeptName: deptName=="全部"?"":deptName||"",
+        deptName: deptName=="全部"?"":deptName||"",
         ascs:data_asc,     //升序
         descs:data_desc,       //降序
         startDate: behosDateStart.replace(/\//g,'-'), //出院日期--开始时间
@@ -356,18 +357,17 @@ $(".abnormalClear").on("click", function(e){
         dateFormat:"yy/mm/dd"
     }).datepicker( "setDate","");
     if(from == 2){
-        $('.selectDept ').html(deptListDept[0].deptName)
+        $('.selectDept ').val(deptListDept[0].deptName)
     } else if (from == 4 || from == 9){
         if(deptNamePram.length > 10){
-            $('.selectDept').html(deptNamePram.substring(0,8)+'...')
+            $('.selectDept').val(deptNamePram.substring(0,8)+'...')
         }else{
-            $('.selectDept').html(deptNamePram)
+            $('.selectDept').val(deptNamePram)
         }
         $('.selectDept ').attr('title',deptNamePram)
         $(".deptList").css("display", "none")
-        $(".selectDept").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
     }else{
-        $('.selectDept ').html('全部')
+        $(".selectDept").attr({'title':"全部",'data-id':''}).val("全部")
     }
     $(".deptList").css("display", "none")
     $(".selectDept").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
@@ -609,40 +609,6 @@ function bindOperaAll(){
     })
 }
 
-$('.selectDept').on("click", function(e){
-    e.stopPropagation()
-    $(".levelList ").css("display","none")
-    $(".selectLevel .arrow").attr("src",iconDown)
-    $(".fpCheckList ").css("display", "none")
-    $(".fpSelectCheck .arrow").attr("src",iconDown)
-    $(".qcCheckList ").css("display", "none")
-    $(".qcSelectCheck .arrow").attr("src",iconDown)
-    const showList =  $(".deptList ").css("display")
-    if(showList == "none" ||!showList){
-        $(".deptList ").css("display","block")
-        $(".selectDept .arrow").attr("src",iconUp)
-    }else{
-        $(".deptList ").css("display", "none")
-        $(".selectDept .arrow").attr("src",iconDown)
-    }
-})
-
-//获取科室列表
-getDeptList()
-function getDeptList(){
-    if(from == 2){
-        rendeDeptList(deptListDept) 
-        return
-    }
-    post(api.getDeptList,{inputStr:""}).then(res =>{
-        if(res.data.code == '0'){
-           const  deptList = res.data.data
-           rendeDeptList(deptList)
-        }else{}
-    }).catch((e) =>{
-
-    })
-}
 
 //获取页面配置
 
@@ -709,8 +675,51 @@ function bindSetCol(){
     })
 }
 
+  
+$('.selectDept').on("focus", function(e){
+    e.stopPropagation()
+    $(".levelList ").css("display","none")
+    $(".selectLevel .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")
+})
+
+$('.selectDept').on("blur", function(e){
+    $(".deptList ").css("display", "none")
+    $(".selectDept .arrow").attr("src",iconDown)
+})
+$('.selectDept').on("input", function(e){
+    let val = $(this).val().trim()
+    deptName = deptNameTemp = val
+    getDeptList(deptName)
+})
 
+//获取科室列表
+getDeptList()
+function getDeptList(val){
+    if(from == 2){
+        rendeDeptList(deptListDept) 
+        return
+    }
+    post(api.getDeptList,{inputStr:val=="全部"?"":val||""}).then(res =>{
+        if(res.data.code == '0'){
+           const deptList = res.data.data||[]
+           rendeDeptList(deptList)
+        }else{
+            rendeDeptList([])
+        }
+    }).catch((e) =>{
+
+    })
+}
 function rendeDeptList(deptList){
+    if(deptList.length == 0){
+      $('.deptList').html("")
+      return
+    }
     let str = `<li class="deptItem ellipsis" data-id=" " data-name="全部">全部</li>`;
     if(from == 2){
         str = ''
@@ -723,18 +732,17 @@ function rendeDeptList(deptList){
 }
 //科室选择
 function bindDeptSelect(){
-    $('.deptItem').on("click",function(){
+    $('.deptItem').on("mousedown",function(){
         const deptItemName = $(this).attr("data-name")
         const deptItemId = $(this).attr("data-id")
         deptIdTemp =deptItemId
-        deptNameTemp = deptItemName
+        deptNameTemp=deptItemName==="全部"?"":deptItemName;
         if(deptItemName.length > 10){
-            $('.selectDept').html(deptItemName.substring(0,8)+'...')
+            $('.selectDept').val(deptItemName.substring(0,8)+'...')
         }else{
-            $('.selectDept').html(deptItemName)
+            $('.selectDept').val(deptItemName)
         }
         $('.selectDept ').attr('title',deptItemName)
-        $(".selectDept").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
         $(".deptList").css("display", "none")
         $('.selectDept').removeClass('unSelect')
     })
@@ -1198,7 +1206,6 @@ function renderPagination(totalPage,activePage,totalNum){
 
 $(document).on("click", function(){
     $(".levelList ").css("display", "none")
-    $(".deptList").css("display", "none")
     $(".fpCheckList").css("display", "none")
     $(".qcCheckList").css("display", "none")
     $(".selectDept .arrow").attr("src",iconDown)
@@ -1228,7 +1235,8 @@ $(function($){
             behospitalCode: behospitalCode,
             patName: name, //病人姓名
             level:level,//病历等级
-            behDeptName: deptName,
+            behDeptName: deptName=="全部"?"":deptName||"",
+            deptName: deptName=="全部"?"":deptName||"",
             ascs:data_asc,     //升序
             descs:data_desc,       //降序
             ruleType:ruleType,

src/js/qcListOutHospital.js

@@ -147,8 +147,8 @@ function getTabData(activePage){
         behospitalCode: behospitalCode,
         patName: name, //病人姓名
         level:level,//病历等级
-        // behDeptName: deptName == "全部" ? "":deptName,
-        deptName: deptName == "全部" ? "":deptName,
+        behDeptName: deptName == "全部" ? "":deptName||"",
+        deptName: deptName == "全部" ? "":deptName||"",
         ascs:data_asc,     //升序
         descs:data_desc,       //降序
         startDate: behosDateStart.replace(/\//g,'-'), //出院日期--开始时间
@@ -302,7 +302,8 @@ $(".abnormalClear").on("click", function(e){
     $('.fpCheckPeople').val('')
     $('.qcCheckPeople').val('')
     $('.qcCheckMain').val('')
-    // $('#datepicker').val('')
+    $(".selectDept").attr({'title':"全部",'data-id':''}).val("全部")
+  // $('#datepicker').val('')
     // $('#datepicker2').val('')
     //默认日期为本年
     let year = new Date().getFullYear()
@@ -1275,8 +1276,8 @@ $(function($){
             behospitalCode: behospitalCode,
             patName: name, //病人姓名
             level:level,//病历等级
-            // behDeptName: deptName == "全部" ? "":deptName,
-            deptName: deptName == "全部" ? "":deptName,
+            behDeptName: deptName == "全部" ? "":deptName||"",
+            deptName: deptName == "全部" ? "":deptName||"",
             ascs:data_asc,     //升序
             descs:data_desc,       //降序
             startDate: behosDateStart.replace(/\//g,'-'), //出院日期--开始时间

src/js/uncorrectedCasesStatistics.js

@@ -19,7 +19,6 @@ from = getUrlArgObjectNew("from",srcUrl)||""
 lineType = getUrlArgObjectNew("lineType",srcUrl)||""
 let startDateParam = getUrlArgObjectNew("startDateParam",srcUrl)||""
 let endDateParam = getUrlArgObjectNew("endDateParam",srcUrl)||""
-$(".selectDept").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
 /*if(lineType){
   $("th[code="+data_desc+"]").addClass("desc");
 }*/
@@ -48,10 +47,8 @@ $(".abnormalClear").click(function(){
   deptName="";
   deptNameTemp="";
   setDatePicker($("#datepicker"),$("#datepicker2"),"default")
-  $('.selectDept ').html('全部')
+  $(".selectDept").attr({'title':"全部",'data-id':''}).val("全部")
   $('.patientNumInp').val('')
-  $(".deptList").css("display", "none")
-  $(".selectDept").append(`<img class="arrow" src=${iconDown} alt="下拉">`);
   $("th[code]").removeClass("asc desc")
   //behospitalCode =behospitalCodeTemp= ""
   getTabData(1)
@@ -88,8 +85,8 @@ function getTabData(activePage){
   const param = {
     // current: 1,
     // size: 15,
-    // "deptName": deptName,
-    "name": deptName,
+    "deptName": deptName=="全部"?"":deptName||"",
+    "name": deptName=="全部"?"":deptName||"",
     "asc":data_asc,     //升序
     "desc":data_desc,       //降序
     //"type": 0, //1-本月，2-本年,0-自定义时间（现在所有都是自定义时间，都会传开始日期和结束日期）
@@ -123,7 +120,7 @@ function getTabData(activePage){
 getTabData(1)
 
 $(".filter").on("click", function(e){
-  // deptName = deptNameTemp;
+  deptName = deptNameTemp;
   behospitalCode = behospitalCodeTemp;
   getTabData(1)
 })
@@ -202,19 +199,20 @@ function renderTab(data,hisId,activePage){
   // initScroll("partDetailControl","YX",1)
 }
 
-$('.selectDept').on("click", function(e){
+
+$('.selectDept').on("focus", function(e){
   e.stopPropagation()
-  $(".selectLevel .arrow").attr("src",iconDown)
-  const showList =  $(".deptList ").css("display")
-  if(showList == "none" ||!showList){
-    $(".deptList ").css("display","block")
-    $(".selectDept .arrow").attr("src",iconUp)
-  }else{
-    $(".deptList ").css("display", "none")
-    $(".selectDept .arrow").attr("src",iconDown)
-  }
+  $(".deptList ").css("display","block")
+})
+$('.selectDept').on("blur", function(e){
+  $(".deptList ").css("display", "none")
+  $(".selectDept .arrow").attr("src",iconDown)
+})
+$('.selectDept').on("input", function(e){
+  let val = $(this).val().trim()
+  deptName = deptNameTemp = val
+  getDeptList(deptName)
 })
-
 //获取科室列表
 getDeptList()
 function getDeptList(val){
@@ -250,12 +248,11 @@ function bindDeptSelect(){
     deptIdTemp =deptItemId;
     deptNameTemp=deptItemName==="全部"?"":deptItemName;
     if(deptItemName.length > 10){
-      $('.selectDept').html(deptItemName.substring(0,8)+'...')
+      $('.selectDept').val(deptItemName.substring(0,8)+'...')
     }else{
-      $('.selectDept').html(deptItemName)
+      $('.selectDept').val(deptItemName)
     }
     $('.selectDept ').attr('title',deptItemName)
-    $(".selectDept").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
     $(".deptList").css("display", "none")
     $('.selectDept').removeClass('unSelect')
   })
@@ -324,10 +321,7 @@ function loading(){
 function hideLoading(){
   $("#mainBox .loadingBox", parent.document).remove()
 }
-$(document).on("click", function(){
-  $(".deptList").css("display", "none");
-  $(".selectDept .arrow").attr("src",iconDown)
-})
+
 // 上升下降筛选
 function bindOrder(){
   $("th[code]").off("click").on("click",function(e){
@@ -435,7 +429,8 @@ $(function() {
           return
       }
       const param = {
-        name: deptName,
+        name: deptName=="全部"?"":deptName||"",
+        deptName: deptName=="全部"?"":deptName||"",
         asc:data_asc,     //升序
         desc:data_desc,       //降序
         startDate:startDateParam,

src/js/uncorrectedCopy.js

@@ -54,10 +54,8 @@ $(".abnormalClear").click(function(){
   deptName="";
   deptNameTemp="";
   setDatePicker($("#datepicker"),$("#datepicker2"),"default")
-  $('.selectDept ').html('全部')
+  $(".selectDept").attr({'title':"全部",'data-id':''}).val("全部")
   $('.patientNumInp').val('')
-  $(".deptList").css("display", "none")
-  $(".selectDept").append(`<img class="arrow" src=${iconDown} alt="下拉">`);
   $("th[code]").removeClass("asc desc")
   //behospitalCode =behospitalCodeTemp= ""
   getTabData(1)
@@ -94,7 +92,8 @@ function getTabData(activePage){
   const param = {
     current: activePage,
     size: 15,
-    "name": deptName,
+    "name": deptName=="全部"?"":deptName||"",
+    "deptName": deptName=="全部"?"":deptName||"",
     // "asc":data_asc,     //升序
     // "desc":data_desc,       //降序
     "startDate":dateStatrt.replace(/\//g,'-'),
@@ -127,7 +126,7 @@ function getTabData(activePage){
 
 
 $(".filter").on("click", function(e){
-  // deptName = deptNameTemp;
+  deptName = deptNameTemp;
   behospitalCode = behospitalCodeTemp;
   getTabData(1)
 })
@@ -179,31 +178,6 @@ function renderTab(data,hisId,activePage){
   // initScroll("partDetailControl","YX",1)
 }
 
-$('.selectDept').on("click", function(e){
-  e.stopPropagation()
-  $(".selectLevel .arrow").attr("src",iconDown)
-  const showList =  $(".deptList ").css("display")
-  if(showList == "none" ||!showList){
-    $(".deptList ").css("display","block")
-    $(".selectDept .arrow").attr("src",iconUp)
-  }else{
-    $(".deptList ").css("display", "none")
-    $(".selectDept .arrow").attr("src",iconDown)
-  }
-})
-
-//获取科室列表
-getDeptList()
-function getDeptList(){
-  post(api.getDeptList,{inputStr:""}).then(res =>{
-    if(res.data.code == '0'){
-      const  deptList = res.data.data
-      rendeDeptList(deptList)
-    }else{}
-  }).catch((e) =>{
-
-  })
-}
 
 // 渲染table表头
 function renderTabTitle(data){
@@ -232,8 +206,47 @@ function orderTitleLis(data){
     orderKey.push(key)
   }
 }
+//获取科室列表
+getDeptList()
+function getDeptList(val){
+    post(api.getDeptList,{inputStr:val=="全部"?"":val||""}).then(res =>{
+        if(res.data.code == '0'){
+           const deptList = res.data.data||[]
+           rendeDeptList(deptList)
+        }else{
+            rendeDeptList([])
+        }
+    }).catch((e) =>{
 
+    })
+}
+
+$('.selectDept').on("focus", function(e){
+  e.stopPropagation()
+  $(".selectLevel .arrow").attr("src",iconDown)
+  const showList =  $(".deptList ").css("display")
+  if(showList == "none" ||!showList){
+    $(".deptList ").css("display","block")
+    $(".selectDept .arrow").attr("src",iconUp)
+  }else{
+    $(".deptList ").css("display", "none")
+    $(".selectDept .arrow").attr("src",iconDown)
+  }
+})
+$('.selectDept').on("blur", function(e){
+  $(".deptList ").css("display", "none")
+  $(".selectDept .arrow").attr("src",iconDown)
+})
+$('.selectDept').on("input", function(e){
+  let val = $(this).val().trim()
+  deptName = deptNameTemp = val
+  getDeptList(deptName)
+})
 function rendeDeptList(deptList){
+  if(deptList.length == 0){
+    $('.deptList').html("")
+    return
+  }
   let str = `<li class="deptItem ellipsis" data-id=" " data-name="全部">全部</li>`;
   for(let i = 0; i < deptList.length; i++){
     str += `<li class="deptItem ellipsis" title=${deptList[i].deptName} data-id=${deptList[i].deptId} data-name=${deptList[i].deptName}> ${deptList[i].deptName}</li>`
@@ -243,18 +256,17 @@ function rendeDeptList(deptList){
 }
 //科室选择
 function bindDeptSelect(){
-  $('.deptItem').on("click",function(){
+  $('.deptItem').on("mousedown",function(){
     const deptItemName = $(this).attr("data-name")
     const deptItemId = $(this).attr("data-id")
     deptIdTemp =deptItemId;
     deptNameTemp=deptItemName==="全部"?"":deptItemName;
     if(deptItemName.length > 10){
-      $('.selectDept').html(deptItemName.substring(0,8)+'...')
+      $('.selectDept').val(deptItemName.substring(0,8)+'...')
     }else{
-      $('.selectDept').html(deptItemName)
+      $('.selectDept').val(deptItemName)
     }
     $('.selectDept ').attr('title',deptItemName)
-    $(".selectDept").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
     $(".deptList").css("display", "none")
     $('.selectDept').removeClass('unSelect')
   })
@@ -271,10 +283,7 @@ function loading(){
 function hideLoading(){
   $("#mainBox .loadingBox", parent.document).remove()
 }
-$(document).on("click", function(){
-  $(".deptList").css("display", "none");
-  $(".selectDept .arrow").attr("src",iconDown)
-})
+
 // 上升下降筛选
 function bindOrder(){
   $("th[code]").off("click").on("click",function(e){
@@ -356,10 +365,6 @@ function renderPagination(totalPage,activePage,totalNum){
 
 }
 
-$(".patientNumInp").on("input", function(e){
-  const val = $(this).val().trim()
-  deptName = val
-})
 
 $(function() {
   const  iconCalenBlue= require("./../images/icon_calen_blue.png")
@@ -382,7 +387,8 @@ $(function() {
           return
       }
       const param = {
-        name: deptName,
+        name: deptName=="全部"?"":deptName||"",
+        deptName: deptName=="全部"?"":deptName||"",
         // asc:data_asc,     //升序
         // desc:data_desc,       //降序
         startDate:startDateParam.replace(/\//g,'-'),