luolei пре 4 година
родитељ
комит
6753d705af

+ 9 - 1
src/css/deptScoreDetail.less

@@ -95,7 +95,6 @@
             margin: 0 10px 0 0;
         }
     }
-    
     .recordScoreOperaBtn{
         cursor: pointer;
         color: @activeColor;
@@ -366,3 +365,12 @@
 .abnormalClear {
     top: 2px !important;
 }
+
+.canEditModule {
+    width: 142px !important;
+    height: 34px !important;
+    line-height: 34px !important;
+}
+.moduleTypeList {
+    top: 35px !important;
+}

+ 0 - 1
src/css/singleVeto.less

@@ -197,7 +197,6 @@
         cursor: pointer;
     }
     .export{
-        display: none;
         width:60px;
         height:34px;
         line-height: 34px;

+ 5 - 4
src/html/deptScoreDetail.html

@@ -23,10 +23,6 @@
         <div class="partTitleT"></div>
         <div class="main-body">
             <div class="filterBox clearfix">
-                <span class="filterItem typeFilter">
-                    <span>医生名称:</span>
-                    <input class="patientNumInp" style="width: 148px;" type="text" placeholder="请输入医生名称">
-                </span>
                 <span class="filterItem typeFilter deptListWrap">
                     <span style="overflow:hidden">科室:</span>
                     <span class="selectDept ellipsis" data-id=" "><i>--</i></span>
@@ -34,6 +30,11 @@
                         
                     </ul>
                 </span>
+                <span class="filterItem">
+                    <span>主管医生:</span>
+                    <input type="text" class="selectModuleType canEditModule" value="全部" />
+                    <ul class="moduleTypeList filterDropList moduleLisWid"></ul>
+                </span>
                 <span class="filterItem typeFilter clearfix dataSelectLight">
                     <span class="fl">出院日期:</span>
                     <span class="datapickerBox fl"><input type="text" placeholder="请选择时间" id="datepicker" autocomplete="off" readonly/></span>

+ 1 - 1
src/html/mukuai.html

@@ -50,7 +50,7 @@
                 <thead>
                     <th class="moduleName" style="width: 65px;">序号</th>
                     <th class="moduleItemName">模块名称</th>
-                    <th class="moduleScore" style="width: 80px;">缺陷占比</th>
+                    <th class="moduleScore desc" style="width: 105px;" code="percent">缺陷占比</th>
                 </thead>
                 <tbody class="tbody">
     

+ 1 - 0
src/js/dept/partDetailControlDept.js

@@ -249,6 +249,7 @@ function renderModuleTypeList(moduleTypeList){
     for(let i = 0; i < moduleTypeList.length; i++){
         str += `<li class="modeTypeItem ellipsis" title=${moduleTypeList[i].name} data-id=${moduleTypeList[i].doctorId} data-name=${moduleTypeList[i].name}> ${moduleTypeList[i].name}</li>`
     }
+    console.log(str)
     $('.moduleTypeList').html(str)
     bindModuleTypeSelect()
 }

+ 1 - 1
src/js/dept/qcListOutHospitalDept.js

@@ -69,7 +69,7 @@ if(docName){
     $('.doctorInp').val(docName)
 }
 if(from==2){
-    $(".partTitle .titlePic ").html(`<a class="consoleD" href="deptConsole.html">控制台(科室) / </a> 缺陷详情`)
+    $(".partTitle .titlePic ").html(`<a class="consoleD" href="deptConsole.html">控制台(科室) / </a> 出院人数统计`)
 }else if(from==3){
 //   $(".partTitle .titlePic ").html(`<a href="keyItemFlawControl.html">关键条目缺陷占比 / </a>缺陷详情`)
 }else{

+ 63 - 2
src/js/deptScoreDetail.js

@@ -72,6 +72,7 @@ $(".abnormalClear").click(function(){
     deptId = deptIdTemp = deptList[0]&&deptList[0].deptName
     curDeptId = deptIdTemp = deptList[0]&&deptList[0].deptId
     behospitalCode=behospitalCodeTemp = ""
+    casesName = casesNameTemp = ''
     setDatePicker($("#datepicker"),$("#datepicker2"),"default")
     $(".patientNumInp").val("")
     $(".selectDept").html(deptId).attr({
@@ -79,6 +80,8 @@ $(".abnormalClear").click(function(){
         "dept-id":curDeptId,
         "title":deptId
     }).append(`<img class="arrow" src=${iconDown} alt="下拉">`)
+    $(".selectModuleType").attr({'title':"全部",'data-id':''}).val("全部")
+    getmoduleTypeList()
     getTabData(1)
 })
 $(".partTitle a").click(function(){
@@ -105,7 +108,8 @@ function getDeptList(flg){
         let tmp = deptList[i]
         str += `<li class="deptItem ellipsis" title="${tmp.deptName}" data-id="${tmp.deptName}" dept-id="${tmp.deptId}" data-name="${tmp.deptName}">${tmp.deptName}</li>`
     }
-    $(".deptScoreDetail .filterDropList").html(str)
+    $(".deptScoreDetail .deptList").html(str)
+    getmoduleTypeList()
 }
 dateChange()
 //所有数据切换日期筛选
@@ -166,7 +170,7 @@ function getTabData(activePage){
         "deptName": deptId||"",
         "desc": "",
         "level": "",
-        "name": behospitalCode||"",
+        "name": casesName||"",
         "type": 0, //1-本月,2-本年,0-自定义时间(现在 都是自定义时间,都会传具体时间进去)
         "startDate":dateStatrt,
         "endDate":dateEnd
@@ -435,6 +439,63 @@ function bindDeptSelect(){
         $(".selectDept").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
 
         $(".deptList").css("display", "none")
+        getmoduleTypeList('',deptItemId)
+    })
+}
+
+//模块类型
+$('.selectModuleType').on("focus", function(e){
+    e.stopPropagation()
+    $(".rejectList ").css("display","none")
+    $(".usedList ").css("display", "none")
+    $(".selectReject .arrow").attr("src",iconDown)
+    $(".selectUsed .arrow").attr("src",iconDown)
+    $(".moduleTypeList ").css("display","block")
+})
+$('.selectModuleType').on("blur", function(e){
+    $(".moduleTypeList ").css("display","none")
+})
+$('.selectModuleType').on("input", function(e){
+    let val = $(this).val().trim()
+    casesName = casesNameTemp = val
+    getmoduleTypeList(val)
+})
+//获取模块类型
+function getmoduleTypeList(val,dept){
+    post(api.getListDoctor,{inputStr:val=="全部"?"":val||"",deptName:dept||deptId}).then(res =>{
+        if(res.data.code == '0'){
+           const moduleTypeList = res.data.data
+           renderModuleTypeList(moduleTypeList)
+        }else{
+            renderModuleTypeList([])
+        }
+    }).catch((e) =>{
+    
+    })
+}
+function renderModuleTypeList(moduleTypeList){
+    if(moduleTypeList.length == 0){
+      $('.moduleTypeList').html("")
+      return
+    }
+    let str = `<li class="modeTypeItem " data-id=" " data-name="全部">全部</li>`
+    for(let i = 0; i < moduleTypeList.length; i++){
+        str += `<li class="modeTypeItem ellipsis" title=${moduleTypeList[i].name} data-id=${moduleTypeList[i].doctorId} data-name=${moduleTypeList[i].name}> ${moduleTypeList[i].name}</li>`
+    }
+    $('.moduleTypeList').html(str)
+    bindModuleTypeSelect()
+}
+
+//模块类型选择
+function bindModuleTypeSelect(){
+    $('.modeTypeItem').on("mousedown",function(){
+        const modeTypeItemName = $(this).attr("data-name")
+        const modeTypeItemId = $(this).attr("data-id")
+        casesIdTemp =modeTypeItemId
+        name = nameTemp = modeTypeItemName
+        casesName=casesNameTemp = modeTypeItemName=="全部"?"":modeTypeItemName;
+        $('.selectModuleType').val(modeTypeItemName).attr("title",modeTypeItemName)
+        $(".moduleTypeList ").css("display", "none")
     })
 }
 function loading(){

+ 26 - 3
src/js/mukuai.js

@@ -12,7 +12,7 @@ const arrowLeft= require("./../images/arrow_left.png")
 const arrowRight = require("./../images/arrow_right.png")
 
 listenScroll('.mukuai')
-let casesId="", name="", isReject ="", isUsed ="",casesIdTemp="", nameTemp="", isRejectTemp ="", isUsedTemp ="",from="",deptIdTemp="",deptItemId="",deptId=""
+let casesId="", name="", isReject ="", isUsed ="",casesIdTemp="", nameTemp="", isRejectTemp ="",data_asc=[], data_desc=['percent'], isUsedTemp ="",from="",deptIdTemp="",deptItemId="",deptId=""
 $(".selectModuleType").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
 $(".selectReject").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
 $(".selectDept").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
@@ -76,6 +76,9 @@ $(function(){
         setDatePicker($("#datepicker"),$("#datepicker2"),"default")
         deptId =deptIdTemp= deptList[0]&&deptList[0].deptName
         name = ""
+        data_asc=[],
+        data_desc=['percent']
+        $("th[code]").removeClass("asc desc").addClass("desc");
         $(".patientNumInp").val("")
         $(".selectDept").html(deptId).attr({
             "data-id":deptId,
@@ -128,13 +131,29 @@ $('.selectDept').on("click", function(e){
         $(".selectDept .arrow").attr("src",iconDown)
     }
 })
-
+//排序
+$("th[code]").on("click",function(e){
+    const code=$(this).attr("code");
+    if(data_asc[0]===code){
+      data_desc=[code];
+      data_asc=[];
+      $("th[code]").removeClass("asc desc");
+      $(this).addClass("desc");
+    }else{
+      data_desc=[];
+      data_asc=[code];
+      $("th[code]").removeClass("asc desc");
+      $(this).addClass("asc");
+    }
+    getTabData(1);
+    // console.log(code)
+});
 //科室处理
 getDeptList()
 function getDeptList(){
     let str = ``
     if(deptList.length<=0)return
-    $(".mukuai .selectDept ").attr("data-id",deptList[0].deptName).find("i").html(deptList[0].deptName)
+    $(".mukuai .selectDept").attr("data-id",deptList[0].deptName).find("i").html(deptList[0].deptName)
     for(let i = 0;i < deptList.length;i++){
         let tmp = deptList[i]
         str += `<li class="deptItem ellipsis" title="${tmp.deptName}" data-id="${tmp.deptName}" data-name="${tmp.deptName}">${tmp.deptName}</li>`
@@ -192,6 +211,8 @@ function getTabData(activePage){
         name: name, //条目名
         deptName: deptId||(deptList.length>0?deptList[0].deptName:''), //科室名
         size: 15,
+        asc:data_asc,     //升序
+        desc: data_desc,       //降序
         "startDate":dateStatrt,
         "endDate":dateEnd
     }
@@ -592,6 +613,8 @@ $(function() {
             deptName: deptId||(deptList.length>0?deptList[0].deptName:''), //科室名
             "startDate":startDateParam,
             "endDate":endDateParam,
+            asc:data_asc,     //升序
+            desc: data_desc,       //降序
             "isPlacefile":isPlacefile
         }
         expJson(api.entryGroupExportByDeptCase,param).then(res =>{

+ 1 - 1
src/js/mukuaiControl.js

@@ -43,7 +43,7 @@ $(function(){
         casesName=casesNameTemp = ""
         data_asc=[],
         data_desc=['percent']
-        $("th[code]").removeClass("asc desc");
+        $("th[code]").removeClass("asc desc").addClass("desc");
         $(".moduleScore").addClass("desc")
         $(".patientNumInp").val("")
         $(".selectModuleType ").val("全部")

+ 1 - 2
src/js/qcListDept.js

@@ -734,8 +734,7 @@ function recordScore(behospitalCode,totalNum,hasToast){
                 hideLoading()
                 scoreSum = 0
                 const activePage = $(".activePage").attr('data-page') || 1
-
-                getTabData(activePage)
+                getTabData(activePage,qcCheckMain)
                 if(hasToast){
                   $.alerModal({"message":'评分成功',type:"tip",time:'1000',isFather: true,win: true, fatherWrapper: $("#mainBox", parent.document)});
                 }

+ 2 - 4
src/js/singleVeto.js

@@ -13,9 +13,7 @@ const arrowRight = require("./../images/arrow_right.png")
 let isPlacefile = getCookie('isPlacefile')||1
 
 const currentPage=$(window.parent.document).find(".menu .page.active").attr("code");
-if(currentPage==="YH-ZKK-TMQXZB_XQ"){
-  $(".export").css("display","inline-block");
-}
+
 
 let casesId="",data_desc=['num'],data_asc=[], name="", isReject ="",deptName="",startDateParam="",endDateParam="", isUsed ="",casesIdTemp="", nameTemp="", isRejectTemp ="",model='', isUsedTemp ="",from="",deptIdTemp="",deptItemId="",deptId="",isSingleReject="", isSingleRejectTemp="",casesName="",casesNameTemp="",paramObj={}
 $(".selectModuleType").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
@@ -648,7 +646,7 @@ $(function() {
       "startDate":startDateParam,
       "endDate":endDateParam
     };
-    expJson(api.exportItemFlaw,param).then(res =>{
+    expJson(from==2?api.entryGroupExportByDeptEntry:api.exportItemFlaw,param).then(res =>{
       downloadExportedData(res.data,"条目缺陷占比.xls")
     })
   })

+ 1 - 1
src/js/utils.js

@@ -173,7 +173,7 @@ const post = function(url, data) {
           setCookie('behosDateEnd', '');
           // wd.location.href = "../login.html";
         } else if (error.status === 500 || error.status === 501 || error.status === 404) {
-          wd.location.href = '../error.html?code=' + error.status;
+          // wd.location.href = '../error.html?code=' + error.status;
         }
         reject(error);
       },