分配任务，差弹窗

src/css/allotCheckTask.less

@@ -22,7 +22,7 @@ h2{
     border: none;
     border-left:10px @disColor solid;
     margin: 54px 0 0;
-    min-width: 1090px;
+    min-width: 1290px;
     min-height: calc(100% - 54px);
     // overflow: auto;
 }
@@ -66,15 +66,30 @@ h2{
     .moduleNumber{
         text-align: center;
     }
-    .scoreOperaItem{
+    .operaItem{
         width: 50px;
         cursor: pointer;
+        i{
+            display: inline-block;
+            width: 14px;
+            height: 14px;
+            background: url("../images/unRadio.png") 17px 9px no-repeat;
+            &.active{
+                background: url("../images/radio.png") #ccc 17px 9px no-repeat;
+            }
+        }
     }
     .tabTitle   {
         background: #EFF0F9 !important;
       }
     
 }
+tbody{
+    .job-num{
+        color: #00A1FF;
+        cursor: pointer;
+    }
+}
 .tabFoot{
     height: 40px;
     background: none;
@@ -114,6 +129,8 @@ h2{
     position: relative;
 }
 .overAuto{
+    padding: 20px;
+    overflow-y: auto;
     &.fl{
         max-width: 40%;
     }
@@ -124,7 +141,6 @@ h2{
             margin-left: 20px;
         }
     }
-    padding: 20px;
 }
 .toggle-item{
 display: none;
@@ -223,7 +239,7 @@ cursor: pointer;
 width: 160px;
 }
 
-.filter,.reset,.export{
+.filter,.reset,.export,.save-btn{
 display: inline-block;
 width:60px;
 height:32px;
@@ -238,6 +254,15 @@ cursor: pointer;
 float: left;
 margin: 0 0px 22px 0;
 }
+.oper{
+    text-align: center;
+    margin:60px auto 20px;
+    .save-btn{
+        width: 139px;
+        float: none;
+    }
+}
+
 .export{
 height:34px;
 background: #fff;
@@ -310,7 +335,7 @@ color: @activeColor;
 cursor: pointer;
 }
 
-.deptItem:hover,.checkItem:hover{
+.deptItem:hover,.checkerItem:hover{
 background-color: #EEF4FF;
 cursor: pointer;
 }

src/html/allotCheckTask.html

@@ -22,7 +22,7 @@
                     </ul>
                 </div>
                 <div class="tableBox clearfix">
-                    <div class="overAuto fl">
+                    <div class="overAuto fl scroll-table">
                         <div class="filterBox">
                             <div class="clearfix">
                                 <span class="filterItem">
@@ -49,9 +49,9 @@
                             <thead>
                             <tr class="tabTitle">
                                 <th class="recordScoreOpera textCenter">操作</th>
-                                <th class="textCenter" code="doctorName">质控员</th>
-                                <th class="textCenter" code="deptName">科室</th>
-                                <th class="textCenter" code="jobNum">任务数</th>
+                                <th class="textCenter" valCode="deptName">科室</th>
+                                <th class="textCenter" valCode="doctorName">质控员</th>
+                                <th class="textCenter" valCode="jobNum">任务数</th>
                             </tr>
                             </thead>
                             <tbody class="tbody">
@@ -60,6 +60,9 @@
                             <tfoot>
                             </tfoot>
                         </table>
+                        <div class="oper">
+                            <button class="save-btn">保存分配</button>
+                        </div>
                     </div>
                     <div class="overAuto fr">
                         <div class="filterBox">
@@ -97,12 +100,12 @@
                             <thead>
                             <tr class="tabTitle">
                                 <th class="recordScoreOpera textCenter" style="width: 65px;">操作</th>
-                                <th class="patientName textCenter" code="name" style="width: 100px;">病人姓名</th>
-                                <th class="beHospitalId textCenter" code="behospital_code">病人住院序号</th>
-                                <th class="deptName textCenter" code="beh_dept_name">科室</th>
-                                <th class="doctorName textCenter" code="doctor_name">主管医生</th>
-                                <th class="outHospitalDate textCenter desc" code="leave_hospital_date">出院日期</th>
-                                <th class="recordScore textCenter" code="score_res">筛选分值</th>
+                                <th class="patientName textCenter" style="width: 100px;">病人姓名</th>
+                                <th class="beHospitalId textCenter">病人住院序号</th>
+                                <th class="deptName textCenter">科室</th>
+                                <th class="doctorName textCenter">主管医生</th>
+                                <th class="outHospitalDate textCenter desc" code="leaveHospitalDate">出院日期</th>
+                                <th class="recordScore textCenter" code="value">筛选分值</th>
                                 <th class="patientNo textCenter" code="file_code">状态</th>
                             </tr>
                             </thead>

src/js/allotCheckTask.js

@@ -2,11 +2,13 @@ const $ = require('jquery');
 require("../css/allotCheckTask.less");
 require('./modal.js');
 const {api,ywCheckApi} = require('./api.js')
-const {post,getCookie,getUrlArgObjectNew,emptyBox,downloadExportedData,expJson,initScroll,listenScroll,exportTimeLimit} = require('./utils.js')
+const {post,getCookie,emptyBox,listenScroll} = require('./utils.js')
 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  iconCalenBlue= require("./../images/icon_calen_blue.png")
 const  iconCalenGrey= require("./../images/icon_calen_grey.png")
 const iconDown= require("./../images/arrow_down.png")
@@ -14,19 +16,13 @@ const iconUp = require("./../images/arrow_up.png")
 const loadingImg = require("./../images/loading.gif")
 const arrowLeft= require("./../images/arrow_left.png")
 const arrowRight = require("./../images/arrow_right.png")
-const goUpG= require("./../images/arrow_up_grey.png")
-const goUpB = require("./../images/arrow_up_blue.png")
-const goDownG= require("./../images/arrow_down_grey.png")
-const goDownB = require("./../images/arrow_down_blue.png")
 listenScroll()
-let pageSet = [],pageSetCopy = [], showNum = 0, scrollTop=0;
-let tabList = [], name = "", behospitalCode="", behosDateStart="", level="",behosDateEnd="", scoreSum = 0,deptNameTemp="",deptName="",
-  nameTemp = "", behospitalCodeTemp="",levelTemp="", deptId="",deptIdTemp="", doctorName="", doctorNum="",doctorNameTemp="",doctorNumTemp="",
-  data_desc=["leave_hospital_date"],data_asc=[];
+let tabList = [], deptNameTemp="",data_desc=["leaveHospitalDate"],data_asc=[];
+let global_DeptCheckers = {},global_Checkers={4:[],5:[],6:[]},global_CheckerId='',global_DeptId='',global_activeTabCode='0';
 let isPlacefile = getCookie('isPlacefile')||1
-if(isPlacefile != 1){
+/*if(isPlacefile != 1){
     data_desc=["behospital_date"]
-}
+}*/
 $('.datapickerBox').append(`<img class="iconCalen" src=${iconCalenGrey} />`)
 $('.iconCalen').on("mouseenter", function(e){
     $(this).attr("src", iconCalenBlue)
@@ -38,27 +34,21 @@ $('.iconCalen').on("click", function(e){
     $(this).parent().find("input").focus()
 })
 
-$("#filterToggler").click(function(){
-    const text = $(this).text();
-    $(".toggle-item").slideToggle();
-    $(this).text(text==="收起筛选"?"展开筛选":"收起筛选").toggleClass("up");
-});
 //
 $(".menu .page", parent.document).removeClass("active")
 $(parent.document).find(".menu .page[code=YH-ZKHC-FPRW]").addClass("active")
 
-//判断有无某一权限
-  function hasData(data){
-    let trdObj = JSON.parse(getCookie("trdObj"))
-    let lis = trdObj['YH-BLZK-ZKPF']
-    if(!lis){
-      return false
-    }
-    if(lis.indexOf(data)>-1){//有权限
-        return true
-    }
-    return false;
+//高度适应
+function setBoxHeight() {
+    const ht = window.innerHeight;
+    $('.overAuto').height(ht - 200 + 'px');
 }
+setBoxHeight();
+$(window).resize(function() {
+    setBoxHeight();
+});
+
+//病人列表获取筛选值
 function getFilterData(){
     const obj = {};
     $(".overAuto.fr .filterBox input[code]").map((i,it)=>{
@@ -66,18 +56,24 @@ function getFilterData(){
     })
     return obj;
 }
+
+//获取分配核查任务列表数据
 function getTabData(activePage){
     const filterData = getFilterData();
+    const deptList=global_DeptId?[global_DeptId]:undefined;
     const param = {
         current:activePage,
         asc:data_asc,     //升序
         desc:data_desc,       //降序
         size: 15,
-        checkType:0,
-        ...filterData
+        jobType:$(".tabs .active").attr("data-code"),    //0-科室任务 1-院级 2-质控科
+        ...filterData,
+        deptList:deptList,
+        behosDateEnd:undefined,
+        behosDateStart:undefined
     };
-    $('.pagination').html("")
-    $('.tbody').html(emptyBox('努力加载中...','',1))
+    $('.pagination').html("");
+    $('.patientTable .tbody').html(emptyBox('努力加载中...','',8))
     return post(ywCheckApi.getAllotCheckList,param).then(res =>{
         if(res.data.code == '0'){
             const data = res.data.data;
@@ -95,156 +91,144 @@ function getTabData(activePage){
             $.alerModal({"message":res.data.msg,type:"tip",time:'1000',isFather: true, fatherWrapper: $("#mainBox", parent.document)});
         }
     }).catch((e) =>{
-    
+
     })
 }
 
-getTabData(1)
+//切换tab
+$(".tabBox .tabs button").on("click",(e)=>{
+    const me = e.target;
+    global_activeTabCode = $(me).attr("data-code");
+    $(".tabBox .tabs button").removeClass("active");
+    $(me).addClass("active");
+    clearCheckerFilter();
+    clearFilter();
+    //刷新质控员列表
+    getCheckerList();
+    //更新列表并重置筛选条件
+    //$(".abnormalClear").click();
+
+});
 
+//任务筛选
 $(".filter").on("click", function(e){
-    behosDateStart = $("#datepicker3").val()         //出院日期
-    behosDateEnd = $("#datepicker4").val()
+    const behosDateStart = $("#datepicker3").val()         //出院日期
+    const behosDateEnd = $("#datepicker4").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
-    doctorNum = doctorNumTemp
-    deptName = deptNameTemp
-    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="";
-    doctorNum=""; 
-    doctorNameTemp="";
-    doctorNumTemp="";
-    data_desc=["leave_hospital_date"];
-    if(isPlacefile != 1){
+
+function clearCheckerFilter(){
+    $('.selectDept i').text('全部')
+    $(".deptList").css("display", "none")
+    $('.selectChecker i').text('全部')
+    $(".checkerList").css("display", "none")
+    global_DeptId="";
+    global_CheckerId="";
+}
+
+function clearFilter(){
+    $(".overAuto.fr input").val("");
+    data_desc=["leaveHospitalDate"];
+    /*if(isPlacefile != 1){
         data_desc=["behospital_date"]
-    }
+    }*/
     data_asc=[];
-    $('.patientNumInp').val('')
-    $('.patientNameInp').val('')
-    $('.doctorInp').val('')
-    $('.doctorNumInp').val('')
-    // $('#datepicker').val('')
-    // $('#datepicker2').val('')
-    //默认日期为近一周
+
+    //默认日期为本月
+    const days = new Date().getDate()-1;
+    let startDate = "-"+days+"d",endDate=new Date();
     $( "#datepicker" ).datepicker({
         changeMonth: true,
         changeYear: true,
-        dateFormat:"yy/mm/dd",
-    }).datepicker( "setDate", "-6d");
+        dateFormat:"yy-mm-dd",
+    }).datepicker( "setDate", startDate);
     $( "#datepicker2" ).datepicker({
         changeMonth: true,
         changeYear: true,
-        dateFormat:"yy/mm/dd"
-    }).datepicker( "setDate",new Date());
+        dateFormat:"yy-mm-dd"
+    }).datepicker( "setDate",endDate);
     $( "#datepicker3" ).datepicker({
         changeMonth: true,
         changeYear: true,
-        dateFormat:"yy/mm/dd",
-    }).datepicker( "setDate", "");
+        dateFormat:"yy-mm-dd",
+    }).datepicker( "setDate", startDate);
     $( "#datepicker4" ).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').html('全部')
-    $(".levelList").css("display", "none")
-    $(".selectLevel").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
-    // $('.selectLevel ').addClass('unSelect')
+        dateFormat:"yy-mm-dd"
+    }).datepicker( "setDate",endDate);
     $("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'
-    }
+}
+
+//重置
+$(".abnormalClear").on("click", function(e){
+    clearFilter();
     getTabData(1)
 })
 
-function renderCheckerTable(obj){
-    let str = ``,data=[];
-    for(let i in obj){
-        data.push(...obj[i]);
-    }
-    console.log(data)
-    if(data.length===0){
-        $('.tbody').html(emptyBox(null,4))
+function renderCheckerTable(data,noTasksUpdate){
+    let str = ``,code="";
+    if(!data||data.length===0){
+        $('.checkerTable .tbody').html(emptyBox(null,4))
         //   initScroll("qcList","YX",1)
         return;
     }
-    const titles = $(".checkerTable .tabTitle th[code]");
+    //获取任务列表
+    (!noTasksUpdate)&&getTabData(1);
+    const titles = $(".checkerTable .tabTitle th[valCode]");
     for(let i = 0; i < data.length; i++){
         const item = data[i]
 
         str += `
             <tr  data-index=${i}>
-                <td class="scoreOperaItem textCenter" code="${item.doctorId}">${item.hasSelect ? `<img class="iconCheck" src=${iconCheck} />`:`<img class="iconCheck" src=${iconUnCheck} />`}</td>
+                <td class="operaItem textCenter" code="${item.doctorId}" deptId="${item.deptId}"><i></i></td>
                 `
             for(let i=0;i<titles.length;i++){
-                str +=  `<td class="textCenter"><span data-index=${i}>${ item[$(titles).attr('code')] || "-"}<span></td>`
+                code=$(titles[i]).attr('valCode');
+                if(code==="jobNum"){
+                    str +=  `<td class="textCenter"><a class="job-num" data-index=${i}>${ item[code]}<a></td>`
+                }else{
+                    str +=  `<td class="textCenter"><span data-index=${i}>${ item[code]}<span></td>`
+                }
             }
         str += "</tr>"
     }
     $('.checkerTable .tbody').html(str)
+    selectCheckerTb()
 }
+
+function selectCheckerTb(){
+    $(".operaItem").click(function(){
+        global_CheckerId=$(this).attr("code");
+        $(".operaItem i").removeClass("active");
+        $(this).find("i").addClass('active');
+    });
+}
+
 function renderTab(data){
-    let str = ``
+    let str = ``,code=""
     if(data.length===0){
-      $('.tbody').html(emptyBox(null,8))
+      $('.patientTable .tbody').html(emptyBox(null,8))
     //   initScroll("qcList","YX",1)
       return;
     }
-    const titles = $(".patientTable .tabTitle th[code]");
+    const titles = $(".patientTable .tabTitle th[valCode]");
     for(let i = 0; i < data.length; i++){
         const item = data[i]
 
         str += `
             <tr  data-index=${i}>
-                <td class="scoreOperaItem textCenter" code="${item.doctorId}">${item.hasSelect ? `<img class="iconCheck" src=${iconCheck} />`:`<img class="iconCheck" src=${iconUnCheck} />`}</td>
+                <td class="operaItem textCenter" code="${item.doctorId}>${item.hasSelect ? `<img class="iconCheck" src=${iconCheck} />`:`<img class="iconCheck" src=${iconUnCheck} />`}</td>
                 `
         for(let i=0;i<titles.length;i++){
-            str +=  `<td class="textCenter"><span data-index=${i}>${ item[$(titles).attr('code')] || "-"}<span></td>`
+            code=$(titles).attr('valCode');
+            str +=  `<td class="textCenter"><span data-index=${i}>${ item[code] || "-"}<span></td>`
         }
         str += "</tr>"
     }
@@ -252,13 +236,8 @@ function renderTab(data){
     $('.patientTable .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
-}
-
 //选择病历等级
-$('.selectLevel').on("click", function(e){
+/*$('.selectLevel').on("click", function(e){
     e.stopPropagation()
     $(".deptList ").css("display", "none")
     $(".selectDept .arrow").attr("src",iconDown)
@@ -286,15 +265,21 @@ function bindLeveldSelect(){
         $(".selectLevel").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
         $('.selectLevel').removeClass('unSelect')
     })
-}
-
+}*/
+//科室选择
 $('.selectDept').on("click", function(e){
     e.stopPropagation()
-    $(".levelList ").css("display","none")
-    $(".selectLevel .arrow").attr("src",iconDown)
     $(".checkerList ").css("display", "none")
     $(".selectChecker .arrow").attr("src",iconDown)
     $(".deptList ").css("display","block")
+
+})
+//质控员选择
+$('.selectChecker').on("click", function(e){
+    e.stopPropagation()
+    $(".deptList ").css("display", "none")
+    $(".selectChecker .arrow").attr("src",iconDown)
+    $(".checkerList").css("display","block")
 })
 
 //获取科室列表
@@ -303,8 +288,8 @@ function getDeptList(val){
     post(api.getDeptList,{inputStr:val=="全部"?"":val||""}).then(res =>{
         if(res.data.code == '0'){
            const  deptList = res.data.data||[]
-            rendeDropList(deptList,'dept')
-        }else{rendeDropList([],'dept')}
+            rendeDeptList(deptList)
+        }else{rendeDeptList([])}
     }).catch((e) =>{
 
     })
@@ -312,40 +297,84 @@ function getDeptList(val){
 
 //核查人员列表
 getCheckerList()
-function getCheckerList(val){
-    post(ywCheckApi.getCheckUserMap,{inputStr:val=="全部"?"":val||""}).then(res =>{
+function getCheckerList(){
+    post(ywCheckApi.getCheckUserMap,{}).then(res =>{
         if(res.data.code == '0'){
-            const list = res.data.data||[];
-            rendeDropList(list,'checker')
-            renderCheckerTable(list)
-        }else{rendeDropList([],'checker')}
+            const list = res.data.data||{};
+            formatDeptChecker(list);
+        }else{rendeCheckerList([])}
     }).catch((e) =>{
 
     })
 }
-function rendeDropList(list,code){
+
+//科室筛选质控员
+function formatDeptChecker(list){
+    const k=+global_activeTabCode +4;
+    const allCheckArrs = list[k];
+    allCheckArrs.map((it)=>{
+        global_DeptCheckers[it.deptId]=it.deptcheckUsers;
+        global_Checkers[k].push(...it.deptcheckUsers);
+    });
+    rendeCheckerList(global_Checkers[k]);
+    renderCheckerTable(global_Checkers[k]);
+}
+//渲染科室列表
+function rendeDeptList(list){
     if(list.length == 0){
-      $('.'+code+"List").html("")
+      $(".deptList").html("")
       return
     }
     let str = `<li class="deptItem ellipsis" data-id=" " data-name="全部">全部</li>`;
     for(let i = 0; i < list.length; i++){
-        str += `<li class="deptItem ellipsis" title=${list[i][code+'Name']} data-id=${list[i][code+'Id']} data-name=${list[i].deptName}> ${list[i].deptName}</li>`
+        str += `<li class="deptItem ellipsis" title=${list[i]['deptName']} data-id=${list[i]['deptId']} data-name=${list[i].deptName}> ${list[i].deptName}</li>`
     }
-    $('.'+code+"List").html(str)
+    $(".deptList").html(str)
     bindDeptSelect()
 }
+//质控员列表渲染
+function rendeCheckerList(list){
+    if(list.length == 0){
+        $(".checkerList").html("")
+        return
+    }
+    let str = `<li class="checkerItem ellipsis" data-id=" " data-name="全部">全部</li>`;
+    for(let i = 0; i < list.length; i++){
+        str += `<li class="checkerItem ellipsis" data-id=${list[i]['doctorId']} data-name=${list[i].doctorName}> ${list[i].doctorName}</li>`
+    }
+    $(".checkerList").html(str)
+    bindCheckerSelect()
+}
 //科室选择
 function bindDeptSelect(){
     $('.deptItem').on("mousedown",function(){
         const deptItemName = $(this).attr("data-name")
-        const deptItemId = $(this).attr("data-id")
-        deptIdTemp =deptItemId
+        global_DeptId = $(this).attr("data-id")
         deptNameTemp=deptItemName==="全部"?"":deptItemName;
-        $('.selectDept').val(deptItemName)
-        $('.selectDept ').attr('title',deptItemName)
+        $('.selectDept i').text(deptItemName)
+        $('.selectDept').attr('title',deptItemName)
         $(".deptList").css("display", "none")
-        $('.selectDept').removeClass('unSelect')
+        //质控员选择清空
+        $('.selectChecker i').text('全部')
+        $('.selectChecker').attr('title','全部')
+        const data = +global_DeptId?global_DeptCheckers[global_DeptId]:global_Checkers[+global_activeTabCode+4];
+        console.log(data,global_DeptId)
+        rendeCheckerList(data||[]);
+        renderCheckerTable(data);
+        getTabData(1);
+    })
+}
+//质控员选择
+function bindCheckerSelect(){
+    $('.checkerItem').on("mousedown",function(){
+        const itemName = $(this).attr("data-name")
+        const itemId = $(this).attr("data-id")
+        $('.selectChecker i').text(itemName)
+        $('.selectChecker').attr('title',itemName)
+        $(".checkerList").css("display", "none")
+        const totalArr = global_DeptId?global_DeptCheckers[global_DeptId]:global_Checkers[+global_activeTabCode+4];
+        const arr = totalArr.find((it)=>itemId===it.doctorId);
+        renderCheckerTable([arr],true);
     })
 }
 function loading(){
@@ -361,23 +390,6 @@ function hideLoading(){
     $("#mainBox .loadingBox", parent.document).remove()
 }
 
-$(".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
-})
 $(function() {
     $.datepicker.regional['zh-CN'] = {
     clearText: '清除',
@@ -411,28 +423,29 @@ $(function() {
     initStatus: '请选择日期',
     isRTL: false};
     $.datepicker.setDefaults($.datepicker.regional['zh-CN']);
-    let startDate = "-6d",endDate=new Date();
+    const days = new Date().getDate()-1;
+    let startDate = "-"+days+"d",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);
     $( "#datepicker3" ).datepicker({
         changeMonth: true,
         changeYear: true,
-        dateFormat:"yy/mm/dd"
-    }).datepicker( "setDate","");
+        dateFormat:"yy-mm-dd",
+    }).datepicker( "setDate",startDate);
     $( "#datepicker4" ).datepicker({
         changeMonth: true,
         changeYear: true,
-        dateFormat:"yy/mm/dd"
-    }).datepicker( "setDate","");
-   
+        dateFormat:"yy-mm-dd",
+    }).datepicker( "setDate",endDate);
+
 });
 
 //分页渲染
@@ -440,7 +453,7 @@ function renderPagination(totalPage,activePage,totalNum){
     let str = `<span class="totalSum">共${totalPage}页/${totalNum}条数据</span><span class="prePage"><img class="arrowPage" src=${arrowLeft} /></span>`
     if(totalPage <= 6){
         for(let i = 1; i <= totalPage; i++){
-          
+
             str += `<span class="pageNum ${'page'+i}" data-page=${i}>${i}</span>`
         }
     }else{
@@ -467,7 +480,7 @@ function renderPagination(totalPage,activePage,totalNum){
             str += `<span class="more" >...</span>`
             str += `<span class="pageNum ${'page'+totalPage}" data-page=${totalPage}>${totalPage}</span>`
         }
-       
+
     }
     str += `<span class="nextPage"><img class="arrowPage" src=${arrowRight} /></span>`
     $('.pagination').html(str)
@@ -493,13 +506,12 @@ function renderPagination(totalPage,activePage,totalNum){
             // renderPagination(totalPage,activePageNow,totalNum)
         }
     })
-    
+
 }
 
 $(document).on("click", function(){
-    $(".levelList ").css("display", "none")
+    $(".deptList ").css("display", "none")
     $(".checkerList").css("display", "none")
     $(".selectDept .arrow").attr("src",iconDown)
-    $(".selectLevel .arrow").attr("src",iconDown)
     $(".selectChecker .arrow").attr("src",iconDown)
 })