Browse Source

生成核查任务接口对接

zhouna 4 years ago
parent
commit
7b787771de

+ 13 - 3
src/css/creatCheckTask.less

@@ -67,9 +67,19 @@ h2{
     .moduleNumber{
         text-align: center;
     }
-    .scoreOperaItem{
-        width: 50px;
+    .operaItem{
         cursor: pointer;
+        img{
+            width: 15px;
+            height: 15px;
+        }
+    }
+    .taskCancel{
+        color: #00A1FF;
+    }
+    .disable{
+        color: #ccc;
+        cursor: unset;
     }
     .tabTitle   {
         background: #EFF0F9 !important;
@@ -421,7 +431,7 @@ h2{
         position: relative;
         top: 15px;
         left: 20px;
-        margin-bottom: 10px;
+        margin-bottom: 32px;
         cursor: pointer;
         float: left;
     }

+ 2 - 2
src/html/allotCheckTask.html

@@ -17,8 +17,8 @@
                 <div class="tabs">
                     <ul>
                         <li class="tab"><button class="active" data-code="0">科室任务</button></li>
-                        <li class="tab"><button data-code="1">质控科任务</button></li>
-                        <li class="tab"><button data-code="2">院级任务</button></li>
+                        <li class="tab"><button data-code="2">质控科任务</button></li>
+                        <li class="tab"><button data-code="1">院级任务</button></li>
                     </ul>
                 </div>
                 <div class="tableBox clearfix">

+ 30 - 27
src/html/creatCheckTask.html

@@ -17,14 +17,14 @@
                 <div class="clearfix">
                      <span class="filterItem typeFilter clearfix" >
                         <span class="fl">出院日期:</span>
-                        <span class="datapickerBox fl"><input type="text" placeholder="请选择时间" id="datepicker" autocomplete="off"/></span>
+                        <span class="datapickerBox fl"><input type="text" code="startDate" placeholder="请选择时间" id="datepicker" autocomplete="off"/></span>
                         <span  class="divide fl">-</span>
-                        <span class="datapickerBox fl"><input type="text" placeholder="请选择时间" id="datepicker2"  autocomplete="off"/></span>
+                        <span class="datapickerBox fl"><input type="text" code="endDate" placeholder="请选择时间" id="datepicker2"  autocomplete="off"/></span>
                     </span>
                     <span class="filterItem">
                         <span>生成状态:</span>
                         <span class="selectStatus">
-                            <i>全部</i>
+                            <i>未生成</i>
                             <img class="arrow" src="./../images/arrow_down.png" alt="下拉">
                         </span>
                         <ul class="statusList filterDropList">
@@ -34,30 +34,32 @@
                     </span>
                     <span class="filterItem typeFilter">
                         <span>病人姓名:</span>
-                        <input class="patientName" type="text" placeholder="病人姓名">
+                        <input class="patientName" code="name" type="text" placeholder="病人姓名">
                     </span>
                     <span class="filterItem typeFilter">
                         <span>病人住院序号:</span>
-                        <input class="patientNumInp" type="text" placeholder="病人住院序号">
+                        <input class="patientNumInp" code="behospitalCode" type="text" placeholder="病人住院序号">
                     </span>
                      <span class="filterItem typeFilter deptListWrap">
                         <span>科室:</span>
-                        <input type="text" class="selectDept canEditDept" value="全部">
-                         <img class="arrow" src="./../images/arrow_down.png" alt="下拉">
+                        <span class="selectDept">
+                            <i>全部</i>
+                            <img class="arrow" src="./../images/arrow_down.png" alt="下拉">
+                        </span>
                         <ul class="deptList filterDropList"></ul>
                     </span>
                     <span class="filterItem typeFilter">
                         <span>住院天数:</span>
-                        <input class="mini-inp dayMin" type="text"> -
-                        <input class="mini-inp dayMax" type="text"> 天
+                        <input class="mini-inp dayMin" code="sDay" type="text"> -
+                        <input class="mini-inp dayMax" code="lDay" type="text"> 天
                     </span>
                     <span class="filterItem typeFilter">
                         <span>医生:</span>
-                        <input class="doctorInp" type="text" placeholder="医生">
+                        <input class="doctorInp" code="doctorName" type="text" placeholder="医生">
                     </span>
                     <span class="filterItem typeFilter">
                         <span>主诊断:</span>
-                        <input class="mainDiag" type="text" placeholder="主诊断">
+                        <input class="mainDiag" code="diagnose" type="text" placeholder="主诊断">
                     </span>
                      <span class="filterItem">
                         <span>病历等级:</span>
@@ -81,9 +83,9 @@
             <div class="tabBox">
                 <div class="tabs">
                     <ul>
-                        <li class="tab"><button class="active" data-code="1">科室任务</button></li>
+                        <li class="tab"><button class="active" data-code="0">科室任务</button></li>
                         <li class="tab"><button data-code="2">质控科任务</button></li>
-                        <li class="tab"><button data-code="3">院级任务</button></li>
+                        <li class="tab"><button data-code="1">院级任务</button></li>
                     </ul>
                 </div>
                 <button class="creatTask">生成任务</button>
@@ -91,20 +93,21 @@
                 <table class="qctable">
                     <thead>
                     <tr class="tabTitle">
-                        <th class="beHospitalId textCenter" code="behospital_code">病人住院序号</th>
-                        <th class="patientName textCenter" code="name" style="width: 100px;">病人姓名</th>
-                        <th class="patientNo textCenter" code="file_code">病案号</th>
-                        <th class="patientSex textCenter">性别</th>
-                        <th class="patientage textCenter" code="age">年龄</th>
-                        <th class="bedNum textCenter" code="bed_code">科室</th>
-                        <th class="outHospitalDate textCenter desc" code="leave_hospital_date">出院日期</th>
-                        <th class="inHospitalDate textCenter" code="behospital_date">住院天数</th>
-                        <th class="doctorName textCenter" code="doctor_name">主管医生</th>
-                        <th class="recordLevel textCenter" code="level">病历等级</th>
-                        <th class="diagnose textCenter" code="diagnose">主诊断</th>
-                        <th class="doctorName textCenter" code="beh_doctor_name">筛选分值</th>
-                        <th class="doctorName textCenter" code="director_doctor_name">生成状态</th>
-                        <th class="deptName textCenter" code="beh_dept_name">生成日期</th>
+                        <th class="recordScoreOpera textCenter" style="width: 65px;"></th>
+                        <th class="beHospitalId textCenter" valCode="behospitalCode">病人住院序号</th>
+                        <th class="patientName textCenter" valCode="name" style="width: 100px;">病人姓名</th>
+                        <th class="patientNo textCenter" valCode="fileCode">病案号</th>
+                        <th class="patientSex textCenter" valCode="sex">性别</th>
+                        <th class="patientage textCenter" valCode="age">年龄</th>
+                        <th class="bedNum textCenter" valCode="behospitalDept">科室</th>
+                        <th class="outHospitalDate textCenter desc" valCode="leaveHospitalDate">出院日期</th>
+                        <th class="inHospitalDate textCenter" valCode="behospitalDayNum">住院天数</th>
+                        <th class="doctorName textCenter" valCode="attendingDoctor">主管医生</th>
+                        <th class="recordLevel textCenter" valCode="level">病历等级</th>
+                        <th class="diagnose textCenter" valCode="diagnose">主诊断</th>
+                        <th class="doctorName textCenter" valCode="value" code="value">筛选分值</th>
+                        <th class="doctorName textCenter" valCode="creatStatus">生成状态</th>
+                        <th class="deptName textCenter" valCode="gmtCreate">生成日期</th>
                         <th class="recordScoreOpera textCenter" style="width: 65px;">操作</th>
                     </tr>
                     </thead>

+ 13 - 12
src/js/allotCheckTask.js

@@ -7,8 +7,8 @@ require('./../resource/jquery-ui/jquery-ui.min.js');
 require('./../resource/jquery-ui/jquery-ui.min.css');
 const iconCheck= require("./../images/icon_check.png")
 const iconUnCheck = require("./../images/icon_unchecked.png")
-require("./../images/radio.png")
-require("./../images/unRadio.png")
+const iconRadio=require("./../images/radio.png")
+const iconUnRadio=require("./../images/unRadio.png")
 const  iconCalenBlue= require("./../images/icon_calen_blue.png")
 const  iconCalenGrey= require("./../images/icon_calen_grey.png")
 const iconDown= require("./../images/arrow_down.png")
@@ -60,7 +60,7 @@ function getFilterData(){
 }
 
 //获取分配核查任务列表数据
-function getTabData(activePage){
+function getTabData(activePage){console.log(23)
     const filterData = getFilterData();
     const deptList=global_DeptId?[global_DeptId]:undefined;
     const param = {
@@ -182,9 +182,8 @@ function renderCheckerTable(data,noTasksUpdate){
         //   initScroll("qcList","YX",1)
         return;
     }
-    console.log(noTasksUpdate)
     //获取任务列表数据
-    (!noTasksUpdate)&&getTabData(1);
+    if(!noTasksUpdate){getTabData(1);}
 
     const titles = $(".checkerTable .tabTitle th[valCode]");
     for(let i = 0; i < data.length; i++){
@@ -192,7 +191,7 @@ function renderCheckerTable(data,noTasksUpdate){
 
         str += `
             <tr  data-index=${i}>
-                <td class="operaItem checkerRadio textCenter" code="${item.doctorId}" data-name="${item.doctorName}"><i></i></td>
+                <td class="operaItem checkerRadio textCenter" code="${item.doctorId}" data-name="${item.doctorName}"><img src="${iconUnRadio}" alt=""></td>
                 `
             for(let i=0;i<titles.length;i++){
                 code=$(titles[i]).attr('valCode');
@@ -213,19 +212,21 @@ function selectCheckerTb(){
     $(".checkerRadio").click(function(){
         global_CheckerId=$(this).attr("code");
         global_CheckerName=$(this).attr("data-name");
-        $(".checkerRadio i").removeClass("active");
-        $(this).find("i").addClass('active');
+        $(".checkerRadio img").attr('src',iconUnRadio);
+        $(this).find("img").attr('src',iconRadio);
     });
 }
 //选中任务
 function selectTaskTb(){
     $(".taskCheck").unbind("click").click(function(){
         const id=$(this).attr("code");
-        const it =$(this).find("i");
+        const it =$(this).find("img");
         const codes = global_TaskCodes.join(",")+",";
         if(it.is(".active")){
+            $(this).find("img").attr('src',iconUnCheck);
             global_TaskCodes = codes.replace(id+",","").split(",");
         }else{
+            $(this).find("img").attr('src',iconCheck);
             global_TaskCodes.push(id);
         }
         it.toggleClass('active');
@@ -246,7 +247,7 @@ function renderTab(data){
 
         str += `
             <tr  data-index=${i}>
-                <td class="operaItem taskCheck textCenter" code="${item.behospitalCode}"><i></i></td>`;
+                <td class="operaItem taskCheck textCenter" code="${item.behospitalCode}"><img src="${iconUnCheck}" alt=""></td>`;
         for(let i=0;i<titles.length;i++){
             code=$(titles[i]).attr('valCode');
             str +=  `<td class="textCenter"><span data-index=${i}>${ item[code] || "-"}<span></td>`
@@ -319,8 +320,8 @@ $('.selectChecker').on("click", function(e){
 
 //获取科室列表
 getDeptList()
-function getDeptList(val){
-    post(api.getDeptList,{inputStr:val=="全部"?"":val||""}).then(res =>{
+function getDeptList(){
+    post(api.getDeptList,{}).then(res =>{
         if(res.data.code == '0'){
            const  deptList = res.data.data||[]
             rendeDeptList(deptList)

+ 2 - 2
src/js/api.js

@@ -180,8 +180,8 @@ const ywCheckApi = {
     addMedCheckInfo:'/qc/medCheckInfo/addMedCheckInfo',   //核查
     getAllotCheckList:'/qc/medCheckInfo/getCheckList', //分配核查任务列表
     getCheckUserMap:'/qc/medCheckInfo/getCheckUserMap',  //核查人员列表
-    addCheck:'/check/addCheck', //生成核查任务
-    getTaskList:'/check/getUserList', //核查任务列表
+    addCheck:'/qc/medCheckWork/addCheckWork', //生成核查任务
+    getTaskList:'/qc/medCheckWork/getUserList', //核查任务列表
     getTaskByUserId:'/qc/medCheckInfo/getCheckListByUserId',//质控员名下的任务列表
     allotTask:'/qc/medCheckInfo/updateDistributionCheck',//分配或取消任务
 };

+ 73 - 271
src/js/creatCheckTask.js

@@ -1,7 +1,7 @@
 const $ = require('jquery');
 require("../css/creatCheckTask.less");
 require('./modal.js');
-const {api} = require('./api.js')
+const {api,ywCheckApi} = require('./api.js')
 const {post,getCookie,getUrlArgObjectNew,emptyBox,downloadExportedData,expJson,initScroll,listenScroll,exportTimeLimit} = require('./utils.js')
 require('./../resource/jquery-ui/jquery-ui.min.js');
 require('./../resource/jquery-ui/jquery-ui.min.css');
@@ -16,20 +16,10 @@ const arrowLeft= require("./../images/arrow_left.png")
 const arrowRight = require("./../images/arrow_right.png")
 
 listenScroll()
-let pageSet = [], showNum = 0, scrollTop=0;
-let srcUrl = $("#contentIframe",parent.document).attr("src")
-let from = getUrlArgObjectNew("from",srcUrl)||"";
-/*$(".selectLevel").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
-$(".selectDept").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
-$(".selectStatus").append(`<img class="arrow" src=${iconDown} alt="下拉">`)*/
-let tabList = [], name = "", behospitalCode="", behosDateStart="", level="",behosDateEnd="", scoreSum = 0,deptNameTemp="",deptName="",
-  nameTemp = "", behospitalCodeTemp="",levelTemp="",statusTemp="", deptId="",deptIdTemp="", doctorName="", doctorNameTemp="",mainDiag="",mainDiagTemp='',
-  data_desc=["leave_hospital_date"],data_asc=[];
-let activeTabCode = '1';    //激活的tab  code
+let tabList = [],  global_level="",global_status="0", global_deptId="",
+  data_desc=["leaveHospitalDate"],data_asc=[];
+let global_activeTabCode = '1';    //激活的tab  code
 let isPlacefile = getCookie('isPlacefile')||1
-if(isPlacefile != 1){
-    data_desc=["behospital_date"]
-}
 
 //判断有无某一权限
   function hasData(data){
@@ -44,27 +34,22 @@ if(isPlacefile != 1){
     return false;
 }
 function getTabData(activePage){
+    const filterData = getFilterData();
     const param = {
-        taskType:activeTabCode,     //科室/质控科/院级
+        jobType:global_activeTabCode,     //科室/质控科/院级
+        creatStatus:global_status,
         current:activePage,
-        behospitalCode: behospitalCode,
-        deptName: deptName=="全部"?"":deptName||"",
-        name: name, //条目名
-        level:level,//病历等级
-        deptId: deptId.trim(),
+        hospitalId:'',
+        level:global_level,//病历等级
+        department: global_deptId.trim(),
         asc:data_asc,     //升序
         desc:data_desc,       //降序
-        doctorName: doctorName,
-        leaveHosDateStart: isPlacefile==1?behosDateStart:'', //出院日期--开始时间
-        leaveHosDateEnd: isPlacefile==1?behosDateEnd:'', //出院日期--结束时间
-        "behosDateStart": isPlacefile==1?'':behosDateStart, //出院日期--开始时间
-        "behosDateEnd": isPlacefile==1?'':behosDateEnd, //出院日期--结束时间
         size: 15,
-        diagnose: mainDiag,   //病历主诊断................
+        ...filterData
     }
     $('.pagination').html("")
-    $('.tbody').html(emptyBox('努力加载中...','',1))
-    return post(api.qcList,param).then(res =>{
+    $('.tbody').html(emptyBox('努力加载中...','',15))
+    return post(ywCheckApi.getTaskList,param).then(res =>{
         if(res.data.code == '0'){
             const data = res.data.data;
             tabList = data.records;
@@ -85,41 +70,30 @@ function getTabData(activePage){
     })
 }
 
-//getTabData(1)
+getTabData(1)
 
 function renderTab(data,hisId){
-    let str = ``
+    let str = ``,code="";
     let hasSelectAll = true;
     if(data.length===0){
       $('.tbody').html(emptyBox(null,15))
     //   initScroll("qcList","YX",1)
       return;
     }
+    const titles = $(".tabTitle th[valCode]");
     for(let i = 0; i < data.length; i++){
         const item = data[i]
-        if(!item.hasSelect){
-            hasSelectAll = false
-        }
 
-        // <td  class="recordScoreOperaBtn textCenter" style="opacity:${hasData('FUNC000017')?'1':'0.5'}">评分</td>
         str += `
             <tr  data-index=${i}>
-                <td class="scoreOperaItem textCenter">${item.hasSelect ? `<img class="iconCheck" src=${iconCheck} />`:`<img class="iconCheck" src=${iconUnCheck} />`}</td>
-                `
-        for(let j = 0; j < pageSet.length; j++){
-            if(pageSet[j].status == 1){
-                if(pageSet[j].val === "checkStatus" || pageSet[j].val === "mrStatus" ){
-                    str +=  `<td class="${isTextCenter(pageSet[j].val) ? 'textCenter':'textCenter'}"><span data-index=${i} class="${pageSet[j].val=='name'?'patientNameSpan':'' } ">${item[pageSet[j].val] =="1"? "已核查" :item[pageSet[j].val] === 0 ? "未核查":"-"}<span></td>`
-                }else if(pageSet[j].val == 'scoreRes'||pageSet[j].val == 'scoreBn'){
-                    str += `<td class="${isTextCenter(pageSet[j].val) ? 'textCenter':'textCenter'}"><span data-index=${i} class="${pageSet[j].val=='name'?'patientNameSpan':'' } ">${item[pageSet[j].val]===null?'-': item[pageSet[j].val]}<span></td>`
-                }else{
-                    str +=  `<td class="${isTextCenter(pageSet[j].val) ? 'textCenter':'textCenter'}"><span data-index=${i} class="${pageSet[j].val=='name'?'patientNameSpan':'' } ">${item[pageSet[j].val] || "-"}<span></td>`
-                }
-            }
+                <td class="operaItem taskCheck textCenter" code="${item.behospitalCode}"><img src="${iconUnCheck}" alt=""></td>`;
+        for(let i=0;i<titles.length;i++){
+            code=$(titles[i]).attr('valCode');
+            str +=  `<td class="textCenter"><span data-index=${i}>${ item[code] || "-"}<span></td>`
         }
-
-        str += "</tr>"
+        str += `<td class="operaItem textCenter ${item.creatStatus=='0'?'taskCancel':'disable'}" code="${item.behospitalCode}">取消</td></tr>`
     }
+
     if(data.length === 0){
         hasSelectAll = false
     }
@@ -133,19 +107,21 @@ function renderTab(data,hisId){
     $('.tbody').html(str)
 }
 
-function isTextCenter(name){
-    const textCenterList = ['level', 'scoreRes', 'sex','age', 'behospitalDate', 'leaveHospitalDate', 'placefileDate', 'gradeTime','checkStatus','mrStatus','mrTime','chTime','chName','mrName','diagnose','behDoctorName','directorDoctorName','doctorName','name']
-    return textCenterList.findIndex(item=> item==name) > -1
+//列表获取筛选值
+function getFilterData(){
+    const obj = {};
+    $(".filterBox input[code]").map((i,it)=>{
+        obj[$(it).attr("code")]=$(it).val()
+    })
+    return obj;
 }
 
-
 bindStatusSelect()
 //病历等级选择
 function bindStatusSelect(){
     $('.statusItem').on("click",function(){
         const statusItemName = $(this).attr("data-name")
-        const statusItemId = $(this).attr("data-id")
-        statusTemp =statusItemId
+        global_status = $(this).attr("data-id")
         $('.selectStatus i').html(statusItemName)
         $(".statusList").css("display", "none")
         $('.selectStatus').removeClass('unSelect')
@@ -158,11 +134,10 @@ function bindLeveldSelect(){
     $('.levelItem').on("click",function(){
         const levelItemName = $(this).attr("data-name")
         const levelItemItemId = $(this).attr("data-id")
-        levelTemp =levelItemItemId
+        global_level =levelItemItemId
         $('.selectLevel i').html(levelItemName)
         $(".levelList").css("display", "none")
         //$(".selectLevel").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
-        $('.selectLevel').removeClass('unSelect')
     })
 }
 //科室列表
@@ -192,11 +167,9 @@ function rendeDeptList(deptList){
 function bindDeptSelect(){
     $('.deptItem').on("mousedown",function(){
         const deptItemName = $(this).attr("data-name")
-        const deptItemId = $(this).attr("data-id")
-        deptIdTemp =deptItemId
-        deptNameTemp=deptItemName==="全部"?"":deptItemName;
-        $('.selectDept').val(deptItemName)
-        $('.selectDept ').attr('title',deptItemName)
+        global_deptId = $(this).attr("data-id")
+        $('.selectDept i').text(deptItemName)
+        $('.selectDept').attr('title',deptItemName)
         $(".deptList").css("display", "none")
         $('.selectDept').removeClass('unSelect')
     })
@@ -213,6 +186,33 @@ function loading(){
 function hideLoading(){
     $("#mainBox .loadingBox", parent.document).remove()
 }
+function clearFilter(){
+    const days = new Date().getDate()-1;
+    let startDate = "-"+days+"d",endDate=new Date();
+    $(".filterBox input").val("");
+    data_desc=["leaveHospitalDate"];
+    //默认日期为本月
+    $( "#datepicker" ).datepicker({
+        changeMonth: true,
+        changeYear: true,
+        dateFormat:"yy-mm-dd",
+    }).datepicker( "setDate", startDate);
+    $( "#datepicker2" ).datepicker({
+        changeMonth: true,
+        changeYear: true,
+        dateFormat:"yy-mm-dd"
+    }).datepicker( "setDate",endDate);
+    $('.selectDept i').text('全部')
+    $(".deptList").css("display", "none")
+    global_deptId='';
+    $('.selectLevel i').html('全部')
+    $(".levelList").css("display", "none")
+    global_level="";
+    $('.selectStatus i').html('未生成')
+    $(".statusList").css("display", "none")
+    global_status='0'
+    $("th[code]").removeClass("asc desc")
+}
 $(function() {
     $('.datapickerBox').append(`<img class="iconCalen" src=${iconCalenGrey} />`)
     $('.iconCalen').on("mouseenter", function(e){
@@ -229,117 +229,16 @@ $(function() {
     $(parent.document).find(".menu .page[code=YH-ZKHC-SCRW]").addClass("active")
 
     $(".filter").on("click", function(e){
-        behosDateStart = $("#datepicker").val()
-        behosDateEnd = $("#datepicker2").val()
-
-        const behosDateStartTime = new Date(behosDateStart).getTime()
-        const behosDateEndTime = new Date(behosDateEnd).getTime()
-        if(behosDateStartTime > behosDateEndTime){
-            $.alerModal({"message":'出院日期开始时间不能大于结束时间~',type:"tip",time:'1000',isFather: true, fatherWrapper: $("#mainBox", parent.document)});
-            return
-        }
-        if(behosDateStart){
-            behosDateStart = behosDateStart.replace(/\//g,'-') + ' 00:00:00'
-        }
-        if(behosDateEnd){
-            behosDateEnd = behosDateEnd.replace(/\//g,'-') + ' 23:59:59'
-        }
-        name = nameTemp
-        behospitalCode = behospitalCodeTemp
-        level = levelTemp==="全部"?"":levelTemp
-        deptId = deptIdTemp
-        doctorName = doctorNameTemp
-        deptName = deptNameTemp
-        mainDiag = mainDiagTemp
-        if(deptName == ""){
-            $(".selectDept").attr({'title':"全部",'data-id':''}).val("全部")
-        }
         getTabData(1)
     })
     $(".abnormalClear").on("click", function(e){
-        tabList = [];
-        name = "";
-        behospitalCode="";
-        level="";
-        scoreSum = 0;
-        nameTemp = "";
-        deptName = deptNameTemp = ""
-        behospitalCodeTemp="";
-        levelTemp="";
-        deptId="";
-        deptIdTemp="";
-        doctorName="";
-        doctorNameTemp="";
-        mainDiagTemp="";
-        data_desc=["leave_hospital_date"];
-        if(isPlacefile != 1){
-            data_desc=["behospital_date"]
-        }
-        data_asc=[];
-        $('.patientNumInp').val('')
-        $('.patientNameInp').val('')
-        $('.doctorInp').val('')
-        // $('#datepicker').val('')
-        // $('#datepicker2').val('')
-        //默认日期为近一周
-        $( "#datepicker" ).datepicker({
-            changeMonth: true,
-            changeYear: true,
-            dateFormat:"yy/mm/dd",
-        }).datepicker( "setDate", "-6d");
-        $( "#datepicker2" ).datepicker({
-            changeMonth: true,
-            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","");
-        $('.selectDept ').val('全部')
-        $(".deptList").css("display", "none")
-        $(".selectDept").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
-        // $('.selectDept ').addClass('unSelect')
-        $('.selectLevel i').html('全部')
-        $(".levelList").css("display", "none")
-        //$(".selectLevel").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
-        // $('.selectLevel ').addClass('unSelect')
-        $("th[code]").removeClass("asc desc")
-        if(isPlacefile == 1){
-            $(".leaveHospitalDate").addClass(" desc")
-        }else{
-            $(".behospitalDate").addClass(" desc")
-        }
-        behosDateStart = $("#datepicker").val()
-        behosDateEnd = $("#datepicker2").val()
-        if(behosDateStart){
-            behosDateStart = behosDateStart.replace(/\//g,'-') + ' 00:00:00'
-        }
-        if(behosDateEnd){
-            behosDateEnd = behosDateEnd.replace(/\//g,'-') + ' 23:59:59'
-        }
+        clearFilter();
         getTabData(1)
     })
     //切换tab
     $(".tabBox .tabs button").on("click",(e)=>{
        const me = e.target;
-       activeTabCode = $(me).attr("data-code");
+        global_activeTabCode = $(me).attr("data-code");
        $(".tabBox .tabs button").removeClass("active");
        $(me).addClass("active");
        //更新列表并重置筛选条件
@@ -373,45 +272,17 @@ $(function() {
             $(".selectLevel .arrow").attr("src",iconDown)
         }
     })
-    $('.selectDept').on("focus", function(e){
-        e.stopPropagation()
+    //科室选择
+    $('.selectDept').on("click", function(e){
+        e.stopPropagation();
         $(".levelList ").css("display","none")
         $(".selectLevel .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()
-$(".patientNumInp").on("input", function(e){
-    const val = $(this).val().trim();
-    let beCode=behospitalCode;
-    const patrn = /[`~!@#$%^&*()_\-+=<>?:"{}|,.\/;'\\[\]·~!@#¥%……&*()——\-+={}|《》?:“”【】、;‘',。、]/g;
-    beCode=val.replace(patrn,function(x){
-        return "\\"+x;
-    });
-    behospitalCodeTemp = beCode
-});
-$(".patientNameInp").on("input", function(e){
-    const val = $(this).val().trim()
-    nameTemp = val
-})
-$(".doctorInp").on("input", function(e){
-    const val = $(this).val().trim()
-    doctorNameTemp = val
-})
-$(".mainDiag").on("input",function(e){
-    const val = $(this).val().trim()
-    mainDiagTemp = val
-})
-    $.datepicker.regional['zh-CN'] = {
+    //出院日期初始化
+$.datepicker.regional['zh-CN'] = {
     clearText: '清除',
     clearStatus: '清除已选日期',
     closeText: '关闭',
@@ -442,38 +313,19 @@ $(".mainDiag").on("input",function(e){
     firstDay: 1,
     initStatus: '请选择日期',
     isRTL: false};
+    const days = new Date().getDate()-1;
+    let startDate = "-"+days+"d",endDate=new Date();
     $.datepicker.setDefaults($.datepicker.regional['zh-CN']);
-    let startDate = "-6d", endDate=new Date()
     $( "#datepicker" ).datepicker({
         changeMonth: true,
         changeYear: true,
-        dateFormat:"yy/mm/dd",
+        dateFormat:"yy-mm-dd",
     }).datepicker( "setDate", startDate);
     $( "#datepicker2" ).datepicker({
         changeMonth: true,
         changeYear: true,
-        dateFormat:"yy/mm/dd"
+        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","");
    
 });
 
@@ -545,54 +397,4 @@ $(document).on("click", function(){
     $(".selectDept .arrow").attr("src",iconDown)
     $(".selectLevel .arrow").attr("src",iconDown)
     $(".selectStatus .arrow").attr("src",iconDown)
-})
-
-
-
-let radioCheck = 1;
-$((function($){
-    $('.export').click(function(){
-        const behosDateStartTime = new Date(behosDateStart).getTime()
-        const behosDateEndTime = new Date(behosDateEnd).getTime()
-        if(behosDateStartTime > behosDateEndTime){
-            $.alerModal({"message":'开始时间不能大于结束时间~',type:"tip",time:'1000',isFather: true, fatherWrapper: $("#mainBox", parent.document)});
-            return
-        }
-        const param = {
-            "behospitalCode": behospitalCode,
-            "deptName": deptName=="全部"?"":deptName||"",
-            "deptId": deptId.trim(),
-            "radioCheck":radioCheck||1, //1:7天2:90天
-            "doctorName": doctorName,
-            "asc":data_asc,     //升序
-            "desc":data_desc,       //降序
-            "leaveHosDateStart": isPlacefile==1?behosDateStart:'', //出院日期--开始时间
-            "leaveHosDateEnd": isPlacefile==1?behosDateEnd:'', //出院日期--结束时间
-            "behosDateStart": isPlacefile==1?'':behosDateStart, //出院日期--开始时间
-            "behosDateEnd": isPlacefile==1?'':behosDateEnd, //出院日期--结束时间
-            "isPlacefile": isPlacefile,
-            "level": level,
-            "name": name,
-            "diagnose": mainDiag,   //病历主诊断.....................
-        }
-        $.alerModal({type:"radio",time:'1000',isFather: true, fatherWrapper: $("#mainBox", parent.document)});
-        closeRadio()
-        radioSelect()
-        bindSaveColPort(param)
-    })
-})($));
-function bindSaveColPort(param){
-    $(".savePort", parent.document ).off("click").on("click", function(){
-        radioCheck = $(".selectDate input[type='radio']:checked", parent.document).attr("data-select")
-        let time = radioCheck==2?exportTimeLimit.defectTime:exportTimeLimit.normalTime
-        if((new Date(behosDateEnd) - new Date(behosDateStart))/24/60/60/1000 > time){
-            $.alerModal({"message":`最多只能导出${time}天`,type:"tip",time:'1000',isFather: true, fatherWrapper: $("#mainBox", parent.document)});
-            return
-        }
-        param.radioCheck = radioCheck||1
-        expJson(api.exportQcList,param).then(res =>{
-            $(".divModal",parent.document).html("")
-            downloadExportedData(res.data, behosDateStart.slice(0,10).replace(/-/g,"")+"-"+behosDateEnd.slice(0,10).replace(/-/g,"")+"抽查住院病历质量情况.xls")
-        })
-    })
-}
+})