分配任务样式，接口对接未完

src/css/allotCheckTask.less

@@ -18,6 +18,7 @@ h2{
 }
 .main-body{
     .main-body-com;
+    padding:0;
     border: none;
     border-left:10px @disColor solid;
     margin: 54px 0 0;
@@ -31,7 +32,6 @@ h2{
 }
 .qctable{
     .table;
-    min-width: 1090px;
     th,td{
         padding:5px 10px;
     }
@@ -114,271 +114,306 @@ h2{
     position: relative;
 }
 .overAuto{
-    display: table;
-    padding-right: 20px;
-    width: 100%;
+    &.fl{
+        max-width: 40%;
+    }
+    &.fr{
+        max-width: 60%;
+        border-left: 10px #EFF1F6 solid;
+        .filter{
+            margin-left: 20px;
+        }
+    }
+    padding: 20px;
 }
 .toggle-item{
-    display: none;
+display: none;
 }
 .filter-toggler{
-    position: absolute;
-    left: 1048px;
-    top: 8px;
-    color: #777;
-    white-space: nowrap;
-    font-size: 14px;
-    background: url("../images/arrow_up.png") 60px center no-repeat;
-    padding-right: 15px;
-    background-size: 10px 6px;
-    &.up{
-        background: url("../images/arrow_down.png") 60px center no-repeat;
-        background-size: 10px 6px;
-    }
+position: absolute;
+left: 1048px;
+top: 8px;
+color: #777;
+white-space: nowrap;
+font-size: 14px;
+background: url("../images/arrow_up.png") 60px center no-repeat;
+padding-right: 15px;
+background-size: 10px 6px;
+&.up{
+background: url("../images/arrow_down.png") 60px center no-repeat;
+background-size: 10px 6px;
+}
 }
 .filterItem{
-    position: relative;
-    display: inline-block;
-    float: left;
-    height: 40px;
-    line-height: 40px;
-    margin: 0 20px 20px 0;
-    span{
-        display: inline-block;
-        line-height: 32px;
-        position: relative;
-    }
-    input{
-        width:120px;
-        height:32px;
-        border-radius:4px;
-        border: 1px solid #E2E5EF;
-        outline: none;
-        margin-right: 10px;
-        padding: 0 10px;
-        box-sizing: border-box;
+position: relative;
+display: inline-block;
+float: left;
+height: 40px;
+line-height: 40px;
+margin-bottom:20px;
+margin-left: 20px;
+    margin-right: 0!important;
+    &:first-child{
+        margin-left: 0;
     }
-    input:focus{
-        border: 1px solid @activeColor ;
-        outline: 0;
-        -webkit-box-shadow:@activeColor  0px 0px 2px;
-        -moz-box-shadow: @activeColor  0px 0px 2px;
-        box-shadow: @activeColor  0px 0px 2px;
-    }
-}
 
-.filterDropList{
-    position: absolute;
-    right: 0;
-    top: 34px !important;
-    max-height: 200px;
-    overflow-y: auto;
-    background: #fff;
-    display: none;
-    border: 1px solid #e4e7ed;
-    box-shadow: 0 2px 12px 0 #e4e7ed;
-    z-index: 2;
-    li{
-        padding: 0 10px;
-    }
+span{
+display: inline-block;
+line-height: 32px;
+position: relative;
+}
+input{
+width:120px;
+height:32px;
+border-radius:4px;
+border: 1px solid #E2E5EF;
+outline: none;
+margin-right: 10px;
+padding: 0 10px;
+box-sizing: border-box;
+}
+input:focus{
+border: 1px solid @activeColor ;
+outline: 0;
+-webkit-box-shadow:@activeColor  0px 0px 2px;
+-moz-box-shadow: @activeColor  0px 0px 2px;
+box-shadow: @activeColor  0px 0px 2px;
 }
-.deptList{
-    width: 160px;
-    max-height: 400px;
 }
-.levelList,.checkList{
-    width: 120px;
-    // height: 200px;
-    li:hover{
-        background-color: #EEF4FF;
-        cursor: pointer;
-    }
-}
-.selectLevel,.selectDept,.fpSelectCheck,.qcSelectCheck{
-    display: inline-block;
-    position: relative;
-    width:120px;
-    padding: 0 10px;
-    height:32px;
-    border-radius:4px;
-    border: 1px solid #E2E5EF;
-    box-sizing: border-box;
-    cursor: pointer;
+
+.filterDropList{
+position: absolute;
+right: 0;
+top: 34px !important;
+max-height: 200px;
+overflow-y: auto;
+background: #fff;
+display: none;
+border: 1px solid #e4e7ed;
+box-shadow: 0 2px 12px 0 #e4e7ed;
+z-index: 2;
+li{
+padding: 0 10px;
+}
+}
+.deptList,.checkList{
+width: 160px;
+max-height: 400px;
+}
+.deptList,.levelList,.checkList{
+width: 120px;
+// height: 200px;
+li:hover{
+background-color: #EEF4FF;
+cursor: pointer;
+}
+}
+.selectLevel,.selectDept,.selectChecker{
+display: inline-block;
+position: relative;
+width:120px;
+padding: 0 10px;
+height:32px;
+border-radius:4px;
+border: 1px solid #E2E5EF;
+box-sizing: border-box;
+cursor: pointer;
 }
 .selectDept{
-    width: 160px;
+width: 160px;
 }
 
 .filter,.reset,.export{
-    display: inline-block;
-    width:60px;
-    height:32px;
-    background:@activeColor;
-    border-radius:4px;
-    color: #fff;
-    text-align: center;
-    line-height: 32px;
-    position: relative;
-    top: 2px;
-    cursor: pointer;
-    float: left;
-    margin: 0 0px 22px 0;
+display: inline-block;
+width:60px;
+height:32px;
+background:@activeColor;
+border-radius:4px;
+color: #fff;
+text-align: center;
+line-height: 32px;
+position: relative;
+top: 2px;
+cursor: pointer;
+float: left;
+margin: 0 0px 22px 0;
 }
 .export{
-    height:34px;
-    background: #fff;
-    border-radius: 4px;
-    color: #777;
-    border: 1px solid #777;
-    box-sizing: border-box;
-    cursor: pointer;
-    margin-left: 10px;
-    float: left;
-    top: 0px;
+height:34px;
+background: #fff;
+border-radius: 4px;
+color: #777;
+border: 1px solid #777;
+box-sizing: border-box;
+cursor: pointer;
+margin-left: 10px;
+float: left;
+top: 0px;
 }
 .arrow{
-    position: absolute;
-    width: 10px;
-    top: 12px;
-    right: 10px;
+position: absolute;
+width: 10px;
+top: 12px;
+right: 10px;
 }
 .iconCheck{
-    width: 14px;
+width: 14px;
 }
 .fl{
-    float: left;
+float: left;
 }
 .clearfix:after {
-    content: '';
-    height: 0;
-    line-height: 0;
-    display: block;
-    visibility: hidden;
-    clear: both;
+content: '';
+height: 0;
+line-height: 0;
+display: block;
+visibility: hidden;
+clear: both;
 }
 .clearfix{
-    zoom:1
+zoom:1
 }
 .divide{
-    margin: 0 10px;
+margin: 0 10px;
 }
 .datapickerBox{
-    position: relative;
-    display: inline-block;
-    width: 120px;
-    height: 32px;
-    input{
-        position: absolute;
-    }
+position: relative;
+display: inline-block;
+width: 120px;
+height: 32px;
+input{
+position: absolute;
+}
 }
 .setCol{
-    color: #777;
-    cursor: pointer;
-    margin: 0 0 0  50px;
+color: #777;
+cursor: pointer;
+margin: 0 0 0  50px;
 }
 .iconSetting{
-    width: 18px;
-    position: relative;
-    top: 3px;
-    margin: 0 3px 0 0;
+width: 18px;
+position: relative;
+top: 3px;
+margin: 0 3px 0 0;
 }
 .iconCalen{
-    position: absolute;
-    width: 15px;
-    top: 10px;
-    right: 10px;
+position: absolute;
+width: 15px;
+top: 10px;
+right: 10px;
 }
 .textCenter{
-    text-align: center;
+text-align: center;
 }
 .patientNameSpan{
-    color: @activeColor;
-    cursor: pointer;
+color: @activeColor;
+cursor: pointer;
 }
 
-.deptItem:hover{
-    background-color: #EEF4FF;
-    cursor: pointer;
+.deptItem:hover,.checkItem:hover{
+background-color: #EEF4FF;
+cursor: pointer;
 }
 .ellipsis{
-    overflow: hidden;
-    text-overflow:ellipsis;
-    white-space: nowrap;
+overflow: hidden;
+text-overflow:ellipsis;
+white-space: nowrap;
 }
 .unSelect{
-    color: #cfccd6
- }
+color: #cfccd6
+}
 
 
 .pagination{
-    margin: 35px 0 20px 0  ;
-    text-align: right;
+margin: 35px 0 20px 0  ;
+text-align: right;
 }
 .totalSum{
-    font-size:12px;
-    line-height:17px;
-    color: #777777;
-    margin-right: 20px;
+font-size:12px;
+line-height:17px;
+color: #777777;
+margin-right: 20px;
 }
 .pageNum,.prePage,.nextPage, .more{
-    display: inline-block;
-    width: 20px;
-    cursor: pointer;
-    margin: 0 20px 0 0;
-    text-align: center;
-    color: #777;
+display: inline-block;
+width: 20px;
+cursor: pointer;
+margin: 0 20px 0 0;
+text-align: center;
+color: #777;
 }
 .prePage,.nextPage{
-    img{
-        position: relative;
-        top: 0px   ;
-    }
+img{
+position: relative;
+top: 0px   ;
+}
 }
- .more{
-    cursor: not-allowed;
+.more{
+cursor: not-allowed;
 }
 .arrowPage{
-    width: 6px;
+width: 6px;
 }
 .activePage{
-    color: @activeColor;
+color: @activeColor;
 }
 .tipIcon{
-  color: #777;
-  cursor: pointer;
-  display: inline-block;
-  margin-left: 6px;
-  margin-right: 2px;
+color: #777;
+cursor: pointer;
+display: inline-block;
+margin-left: 6px;
+margin-right: 2px;
 }
 .toolTipIcon{
-    width: 18px;
-    position: relative;
-    top: 3px;
+width: 18px;
+position: relative;
+top: 3px;
 }
 
 .tooltip{
-    visibility: hidden;
-    position: relative;
-    padding: 7px 10px;
-    border-radius: 4px;
-    margin: 100px auto;
-    background-color: #4D4D4D;
-    text-align: center;
-    color: #fff;
-    font-size: 14px;
+visibility: hidden;
+position: relative;
+padding: 7px 10px;
+border-radius: 4px;
+margin: 100px auto;
+background-color: #4D4D4D;
+text-align: center;
+color: #fff;
+font-size: 14px;
 }
 .tooltip:before{
-    content: '';
-    display: block;
-    position: absolute;
-    bottom: 9px;
-    left: -12px;
-    border-bottom: 6px solid transparent;
-    border-top: 6px solid transparent;
-    border-left: 6px solid transparent;
-    border-right: 6px solid #4D4D4D;
+content: '';
+display: block;
+position: absolute;
+bottom: 9px;
+left: -12px;
+border-bottom: 6px solid transparent;
+border-top: 6px solid transparent;
+border-left: 6px solid transparent;
+border-right: 6px solid #4D4D4D;
 }
 
+.tabBox {
+    .tabs{
+        padding: 22px 0 4px  20px;
+        border-bottom: 10px #EFF1F6 solid;
+    }
+.tab{
+    display: inline-block;
+    button{
+        cursor: pointer;
+        width: 138px;
+        height: 34px;
+        text-align: center;
+        border-radius: 4px;
+    }
+    .active{
+        color: #00A1FF;
+        background: #E7F1FB;
+        font-weight: bold;
+    }
+}
+}
 
 
 

src/css/creatCheckTask.less

@@ -18,6 +18,7 @@ h2{
 }
 .main-body{
     .main-body-com;
+    padding: 0;
     border: none;
     border-left:10px @disColor solid;
     margin: 54px 0 0;
@@ -112,14 +113,20 @@ h2{
 }
 .filterBox{
     position: relative;
+    padding: 20px 25px 0;
     .mini-inp{
         width: 40px;
     }
 }
 .overAuto{
-    display: table;
-    padding-right: 20px;
-    width: 100%;
+    .fl{
+        width: 40px;
+    }
+    .fr{
+        width: 60%;
+    }
+    padding: 20px;
+
 }
 .toggle-item{
     display: none;
@@ -383,12 +390,24 @@ h2{
 }
 
 .tabBox {
+    .tabs{
+        padding: 22px 0 4px  20px;
+        border-bottom: 10px #EFF1F6 solid;
+        border-top: 10px #EFF1F6 solid;
+    }
     .tab{
         display: inline-block;
-        padding: 5px 10px;
-        cursor: pointer;
+        button{
+            cursor: pointer;
+            width: 138px;
+            height: 34px;
+            text-align: center;
+            border-radius: 4px;
+        }
         .active{
             color: #00A1FF;
+            background: #E7F1FB;
+            font-weight: bold;
         }
     }
     .creatTask{
@@ -400,10 +419,11 @@ h2{
         text-align: center;
         line-height: 32px;
         position: relative;
-        top: 2px;
+        top: 15px;
+        left: 20px;
+        margin-bottom: 10px;
         cursor: pointer;
         float: left;
-        margin: 0 0px 22px 0;
     }
 }
 

src/html/allotCheckTask.html

@@ -13,70 +13,109 @@
     <div class="container qcList">
         <h2>分配核查任务</h2>
         <div class="main-body">
-            <div class="filterBox">
-                <div class="clearfix">
-                    <span class="filterItem typeFilter clearfix" >
-                        <span class="fl">出院日期：</span>
-                        <span class="datapickerBox fl"><input type="text" placeholder="请选择时间" id="datepicker" autocomplete="off" readonly /></span>
-                        <span  class="divide fl">-</span>
-                        <span class="datapickerBox fl"><input type="text" placeholder="请选择时间" id="datepicker2"  autocomplete="off" readonly/></span>
-                    </span>
-                    <span class="filterItem typeFilter clearfix" >
-                        <span class="fl">生成日期：</span>
-                        <span class="datapickerBox fl"><input type="text" placeholder="请选择时间" id="datepicker" autocomplete="off" readonly /></span>
-                        <span  class="divide fl">-</span>
-                        <span class="datapickerBox fl"><input type="text" placeholder="请选择时间" id="datepicker2"  autocomplete="off" readonly/></span>
-                    </span>
-                    <span class="filterItem">
-                        <span>病人姓名：</span>
-                        <input type="text" placeholder="病人姓名">
-                    </span>
-                    <span class="filterItem">
-                        <span>病人住院序号：</span>
-                        <input type="text" placeholder="病人住院序号">
-                    </span>
-                    <span class="filterItem">
-                        <span>医生：</span>
-                        <input type="text" placeholder="医生">
-                    </span>
-                    <span class="filterItem">
-                        <span>病历等级：</span>
-                        <span class="selectLevel">全部</span>
-                        <ul class="levelList filterDropList">
-                            <Li class="levelItem" data-name="全部" data-id="全部">全部</Li>
-                            <Li class="levelItem" data-name="未评分" data-id="未评分">未评分</Li>
-                            <Li class="levelItem" data-name="甲" data-id="甲">甲</Li>
-                            <li class="levelItem" data-name="乙" data-id=乙>乙</li>
-                            <li class="levelItem" data-name="丙" data-id=丙>丙</li>
-                        </ul>
-                    </span>
-                    <span class="filter">查询</span>
-                    <span class="filterclear abnormalClear filterclearT">重置</span>
-                    <!--<span class="export">导出</span>-->
+            <div class="tabBox">
+                <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>
+                    </ul>
                 </div>
-            </div>
-            <div class="overAuto">
-                <table class="qctable">
-                    <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="patientNo textCenter" code="file_code">状态</th>
-                    </tr>
-                    </thead>
-                    <tbody class="tbody">
+                <div class="tableBox clearfix">
+                    <div class="overAuto fl">
+                        <div class="filterBox">
+                            <div class="clearfix">
+                                <span class="filterItem">
+                                    <span>科室：</span>
+                                    <span class="selectDept">
+                                        <i>全部</i>
+                                        <img class="arrow" src="./../images/arrow_down.png" alt="下拉">
+                                    </span>
+                                    <ul class="deptList filterDropList">
+                                    </ul>
+                                </span>
+                                <span class="filterItem">
+                                    <span>质控员：</span>
+                                    <span class="selectChecker">
+                                        <i>全部</i>
+                                        <img class="arrow" src="./../images/arrow_down.png" alt="下拉">
+                                    </span>
+                                    <ul class="checkerList filterDropList">
+                                    </ul>
+                                </span>
+                            </div>
+                        </div>
+                        <table class="qctable checkerTable">
+                            <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>
+                            </tr>
+                            </thead>
+                            <tbody class="tbody">
+
+                            </tbody>
+                            <tfoot>
+                            </tfoot>
+                        </table>
+                    </div>
+                    <div class="overAuto fr">
+                        <div class="filterBox">
+                            <div class="clearfix">
+                                <span class="filterItem typeFilter clearfix" >
+                                    <span class="fl">生成日期：</span>
+                                    <span class="datapickerBox fl"><input type="text" placeholder="请选择时间" code="startTime" id="datepicker" autocomplete="off" readonly /></span>
+                                    <span  class="divide fl">-</span>
+                                    <span class="datapickerBox fl"><input type="text" placeholder="请选择时间" code="endTime" id="datepicker2"  autocomplete="off" readonly/></span>
+                                </span>
+                                <span class="filterItem">
+                                    <span>医生：</span>
+                                    <input code="doctorName" type="text" placeholder="医生">
+                                </span>
+                                <span class="filterItem typeFilter clearfix" >
+                                    <span class="fl">出院日期：</span>
+                                    <span class="datapickerBox fl"><input type="text" code="behosDateStart" placeholder="请选择时间" id="datepicker3" autocomplete="off" readonly /></span>
+                                    <span  class="divide fl">-</span>
+                                    <span class="datapickerBox fl"><input type="text" code="behosDateEnd" placeholder="请选择时间" id="datepicker4"  autocomplete="off" readonly/></span>
+                                </span>
+                                <span class="filterItem">
+                                    <span>病人姓名：</span>
+                                    <input code="name" type="text" placeholder="病人姓名">
+                                </span>
+                                <span class="filterItem">
+                                    <span>病人住院序号：</span>
+                                    <input code="behospitalCode" type="text" placeholder="病人住院序号">
+                                </span>
+                                <span class="filter">查询</span>
+                                <span class="filterclear abnormalClear filterclearT">重置</span>
+                                <!--<span class="export">导出</span>-->
+                            </div>
+                        </div>
+                        <table class="qctable patientTable">
+                            <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="patientNo textCenter" code="file_code">状态</th>
+                            </tr>
+                            </thead>
+                            <tbody class="tbody">
 
-                    </tbody>
-                    <tfoot>
-                    </tfoot>
-                </table>
+                            </tbody>
+                            <tfoot>
+                            </tfoot>
+                        </table>
+                        <div class="pagination"></div>
+                    </div>
+                </div>
             </div>
-            <div class="pagination"></div>
         </div>
 
     </div>

src/js/allotCheckTask.js

@@ -1,7 +1,7 @@
 const $ = require('jquery');
 require("../css/allotCheckTask.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');
@@ -20,47 +20,13 @@ 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 srcUrl = $("#contentIframe",parent.document).attr("src")
-let statisticsType = getUrlArgObjectNew("dateType",srcUrl)||getUrlArgObjectNew("shijian",srcUrl) || ""
-let chengdu = getUrlArgObjectNew("chengdu",srcUrl)||""
-let deptIdPram = getUrlArgObjectNew("deptId",srcUrl)||""
-let deptNamePram = getUrlArgObjectNew("deptName",srcUrl)||""
-let docName = getUrlArgObjectNew("docName",srcUrl)||""
-let startDateParam = getUrlArgObjectNew("startDateParam",srcUrl)||""
-let from = getUrlArgObjectNew("from",srcUrl)||"";
-let endDateParam = getUrlArgObjectNew("endDateParam",srcUrl)||""
-$(".selectLevel").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
-$(".selectDept").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
-$(".fpSelectCheck").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
-$(".qcSelectCheck").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
 let tabList = [], name = "", behospitalCode="", behosDateStart="", level="",behosDateEnd="", scoreSum = 0,deptNameTemp="",deptName="",
   nameTemp = "", behospitalCodeTemp="",levelTemp="", deptId="",deptIdTemp="", doctorName="", doctorNum="",doctorNameTemp="",doctorNumTemp="",
-  fpCheckStatus="",fpCheckStatusTemp="",fpCheckName="",fpCheckNameTemp="",qcCheckName="",qcCheckMain="",qcCheckMainTemp="",qcCheckNameTemp="",qcCheckStatus="",qcCheckStatusTemp="",fpCheckDateStart="",fpCheckDateEnd="",
-  qcCheckDateStart="",qcCheckDateEnd="",data_desc=["leave_hospital_date"],data_asc=[];
+  data_desc=["leave_hospital_date"],data_asc=[];
 let isPlacefile = getCookie('isPlacefile')||1
 if(isPlacefile != 1){
     data_desc=["behospital_date"]
 }
-if(chengdu){
-    levelTemp = chengdu
-    level = chengdu
-    $('.selectLevel').html(chengdu)
-    $(".levelList").css("display", "none")
-    $(".selectLevel").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
-}
-if(docName){
-    doctorNameTemp = docName
-    doctorName = docName
-    $('.doctorInp').val(docName)
-}
-if(deptIdPram&&deptNamePram){
-    deptId = deptIdTemp = deptIdPram
-    deptName = deptNameTemp = deptNamePram
-    $('.selectDept').val(deptNamePram)
-    $('.selectDept ').attr('title',deptNamePram)
-    $(".deptList").css("display", "none")
-    $(".selectDept").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
-}
 $('.datapickerBox').append(`<img class="iconCalen" src=${iconCalenGrey} />`)
 $('.iconCalen').on("mouseenter", function(e){
     $(this).attr("src", iconCalenBlue)
@@ -71,7 +37,6 @@ $('.iconCalen').on("mouseleave", function(e){
 $('.iconCalen').on("click", function(e){
     $(this).parent().find("input").focus()
 })
-$('.recordScoreBtn').css("opacity",hasData('FUNC000017')?'1':'0.5')
 
 $("#filterToggler").click(function(){
     const text = $(this).text();
@@ -94,42 +59,32 @@ $(parent.document).find(".menu .page[code=YH-ZKHC-FPRW]").addClass("active")
     }
     return false;
 }
+function getFilterData(){
+    const obj = {};
+    $(".overAuto.fr .filterBox input[code]").map((i,it)=>{
+        obj[$(it).attr("code")]=$(it).val()
+    })
+    return obj;
+}
 function getTabData(activePage){
+    const filterData = getFilterData();
     const param = {
         current:activePage,
-        behospitalCode: behospitalCode,
-        deptName: deptName=="全部"?"":deptName||"",
-        name: name, //条目名
-        level:level,//病历等级
-        deptId: deptId.trim(),
         asc:data_asc,     //升序
         desc:data_desc,       //降序
-        doctorName: doctorName,
-        doctorCode: doctorNum,
-        leaveHosDateStart: isPlacefile==1?behosDateStart:'', //出院日期--开始时间
-        leaveHosDateEnd: isPlacefile==1?behosDateEnd:'', //出院日期--结束时间
-        "behosDateStart": isPlacefile==1?'':behosDateStart, //出院日期--开始时间
-        "behosDateEnd": isPlacefile==1?'':behosDateEnd, //出院日期--结束时间
         size: 15,
-        statisticsType:statisticsType,
-        checkStatus: qcCheckStatus?Number(qcCheckStatus):qcCheckStatus, //病历核查状态
-        mrStatus: fpCheckStatus?Number(fpCheckStatus):fpCheckStatus,   //首页核查状态（1：已核查，0：未核查）
-        chName: qcCheckName,   //病历核查人员
-        diagnose: qcCheckMain,   //病历主诊断................
-        mrName: fpCheckName,  //首页核查人员
-        chTimeStart: qcCheckDateStart.replace(/\//g,'-'), //病历核查起始时间
-        chTimeEnd: qcCheckDateEnd.replace(/\//g,'-'), //病历核查截止时间
-        mrTimeStart: fpCheckDateStart.replace(/\//g,'-'), //首页核查起始时间
-        mrTimeEnd: fpCheckDateEnd.replace(/\//g,'-'), //首页核查截止时间
-    }
+        checkType:0,
+        ...filterData
+    };
     $('.pagination').html("")
     $('.tbody').html(emptyBox('努力加载中...','',1))
-    return post(api.qcList,param).then(res =>{
+    return post(ywCheckApi.getAllotCheckList,param).then(res =>{
         if(res.data.code == '0'){
             const data = res.data.data;
             tabList = data.records;
             const totalPage = data.pages;
             const totalNum = data.total;
+            renderTab(tabList)
             renderPagination(totalPage,Number(activePage),totalNum)
             if(totalPage > 1){
                 renderPagination(totalPage,Number(activePage),totalNum)
@@ -144,65 +99,31 @@ function getTabData(activePage){
     })
 }
 
-//getTabData(1)
+getTabData(1)
 
 $(".filter").on("click", function(e){
-    behosDateStart = $("#datepicker").val()
-    behosDateEnd = $("#datepicker2").val()
- 
-    
-    fpCheckDateStart = $("#datepickerFp1").val()
-    fpCheckDateEnd = $("#datepickerFp2").val()
-    qcCheckDateStart = $("#datepickerQc1").val()
-    qcCheckDateEnd = $("#datepickerQc2").val()
+    behosDateStart = $("#datepicker3").val()         //出院日期
+    behosDateEnd = $("#datepicker4").val()
     const behosDateStartTime = new Date(behosDateStart).getTime()
     const behosDateEndTime = new Date(behosDateEnd).getTime()
-    const qcCheckDateStartTime = new Date(qcCheckDateStart).getTime()
-    const qcCheckDateEndTime = new Date(qcCheckDateEnd).getTime()
-    const fpCheckDateStartTime = new Date(fpCheckDateStart).getTime()
-    const fpCheckDateEndTime = new Date(fpCheckDateEnd).getTime()
     if(behosDateStartTime > behosDateEndTime){
         $.alerModal({"message":'出院日期开始时间不能大于结束时间~',type:"tip",time:'1000',isFather: true, fatherWrapper: $("#mainBox", parent.document)});
         return
     }
-    if(qcCheckDateStartTime > qcCheckDateEndTime){
-        $.alerModal({"message":'病历核查开始时间不能大于结束时间~',type:"tip",time:'1000',isFather: true, fatherWrapper: $("#mainBox", parent.document)});
-        return
-    }
-    if(fpCheckDateStartTime > fpCheckDateEndTime){
-        $.alerModal({"message":'病案首页核查开始时间不能大于结束时间~',type:"tip",time:'1000',isFather: true, fatherWrapper: $("#mainBox", parent.document)});
-    }
     if(behosDateStart){
         behosDateStart = behosDateStart.replace(/\//g,'-') + ' 00:00:00'
     }
     if(behosDateEnd){
         behosDateEnd = behosDateEnd.replace(/\//g,'-') + ' 23:59:59'
     }
-    if(fpCheckDateStart){
-        fpCheckDateStart = fpCheckDateStart + ' 00:00:00'
-    }
-    if(fpCheckDateEnd){
-        fpCheckDateEnd = fpCheckDateEnd + ' 23:59:59'
-    }
-    if(qcCheckDateStart){
-        qcCheckDateStart = qcCheckDateStart + ' 00:00:00'
-    }
-    if(qcCheckDateEnd){
-        qcCheckDateEnd = qcCheckDateEnd + ' 23:59:59'
-    }
 
     name = nameTemp
     behospitalCode = behospitalCodeTemp
     level = levelTemp==="全部"?"":levelTemp
     deptId = deptIdTemp
     doctorName = doctorNameTemp
-    fpCheckName = fpCheckNameTemp
-    qcCheckName = qcCheckNameTemp
-    qcCheckMain = qcCheckMainTemp
     doctorNum = doctorNumTemp
     deptName = deptNameTemp
-    fpCheckStatus = fpCheckStatusTemp
-    qcCheckStatus = qcCheckStatusTemp
     if(deptName == ""){
         $(".selectDept").attr({'title':"全部",'data-id':''}).val("全部")
     }
@@ -221,19 +142,9 @@ $(".abnormalClear").on("click", function(e){
     deptId=""; 
     deptIdTemp="";  
     doctorName="";
-    fpCheckName="";
-    qcCheckName="" ; 
-    qcCheckMian="" ; 
     doctorNum=""; 
-    doctorNameTemp=""; 
-    fpCheckNameTemp="";
-    qcCheckNameTemp="";
-    qcCheckMainTemp="";
-    doctorNumTemp=""; 
-    fpCheckStatus="";
-    fpCheckStatusTemp="";
-    qcCheckStatus="";
-    qcCheckStatusTemp=""
+    doctorNameTemp="";
+    doctorNumTemp="";
     data_desc=["leave_hospital_date"];
     if(isPlacefile != 1){
         data_desc=["behospital_date"]
@@ -243,10 +154,6 @@ $(".abnormalClear").on("click", function(e){
     $('.patientNameInp').val('')
     $('.doctorInp').val('')
     $('.doctorNumInp').val('')
-    $('.doctorInp').val('')
-    $('.fpCheckPeople').val('')
-    $('.qcCheckPeople').val('')
-    $('.qcCheckMain').val('')
     // $('#datepicker').val('')
     // $('#datepicker2').val('')
     //默认日期为近一周
@@ -260,22 +167,12 @@ $(".abnormalClear").on("click", function(e){
         changeYear: true,
         dateFormat:"yy/mm/dd"
     }).datepicker( "setDate",new Date());
-    $( "#datepickerFp1" ).datepicker({
-        changeMonth: true,
-        changeYear: true,
-        dateFormat:"yy/mm/dd",
-    }).datepicker( "setDate", "");
-    $( "#datepickerFp2" ).datepicker({
-        changeMonth: true,
-        changeYear: true,
-        dateFormat:"yy/mm/dd"
-    }).datepicker( "setDate","");
-    $( "#datepickerQc1" ).datepicker({
+    $( "#datepicker3" ).datepicker({
         changeMonth: true,
         changeYear: true,
         dateFormat:"yy/mm/dd",
     }).datepicker( "setDate", "");
-    $( "#datepickerQc2" ).datepicker({
+    $( "#datepicker4" ).datepicker({
         changeMonth: true,
         changeYear: true,
         dateFormat:"yy/mm/dd"
@@ -288,12 +185,6 @@ $(".abnormalClear").on("click", function(e){
     $(".levelList").css("display", "none")
     $(".selectLevel").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
     // $('.selectLevel ').addClass('unSelect')
-    $('.fpSelectCheck').html('全部')
-    $(".fpCheckList").css("display", "none")
-    $(".fpSelectCheck").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
-    $('.qcSelectCheck').html('全部')
-    $(".qcCheckList").css("display", "none")
-    $(".qcSelectCheck").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
     $("th[code]").removeClass("asc desc")
     if(isPlacefile == 1){
         $(".leaveHospitalDate").addClass(" desc")
@@ -308,76 +199,57 @@ $(".abnormalClear").on("click", function(e){
     if(behosDateEnd){
         behosDateEnd = behosDateEnd.replace(/\//g,'-') + ' 23:59:59'
     }
-    fpCheckDateStart = ""
-    fpCheckDateEnd = ""
-    qcCheckDateStart = ""
-    qcCheckDateEnd = ""
     getTabData(1)
 })
-function renderTab(data,hisId){
+
+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))
+        //   initScroll("qcList","YX",1)
+        return;
+    }
+    const titles = $(".checkerTable .tabTitle th[code]");
+    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>
+                `
+            for(let i=0;i<titles.length;i++){
+                str +=  `<td class="textCenter"><span data-index=${i}>${ item[$(titles).attr('code')] || "-"}<span></td>`
+            }
+        str += "</tr>"
+    }
+    $('.checkerTable .tbody').html(str)
+}
+function renderTab(data){
     let str = ``
-    let hasSelectAll = true;
     if(data.length===0){
-      $('.tbody').html(emptyBox(null,showNum+2))
+      $('.tbody').html(emptyBox(null,8))
     //   initScroll("qcList","YX",1)
       return;
     }
+    const titles = $(".patientTable .tabTitle th[code]");
     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>
+                <td class="scoreOperaItem textCenter" code="${item.doctorId}">${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>`
-                }
-            }
+        for(let i=0;i<titles.length;i++){
+            str +=  `<td class="textCenter"><span data-index=${i}>${ item[$(titles).attr('code')] || "-"}<span></td>`
         }
-                // <td >${item.behospitalCode || "-"}</td>
-                // <td>${item.fileCode || "-"}</td>
-                // <td  class="textCenter"><span data-index=${i} class="patientNameSpan">${item.name || "-"}<span></td>
-                // <td  class="textCenter">${item.sex || "-"}</td>
-                // <td  class="textCenter">${item.age || "-"}</td>
-                // <td  class="textCenter">${item.bedCode || "-"}</td>
-                // <td  class="textCenter">${item.behospitalDate&&item.behospitalDate.slice(0,10) || "-"}</td>
-                // <td  class="textCenter">${item.leaveHospitalDate&&item.leaveHospitalDate.slice(0,10)|| "-"}</td>
-                // <td  class="textCenter">${item.diagnose|| "-"}</td>
-                // <td  class="textCenter">${item.behDoctorName   || "-"}</td>
-                // <td  class="textCenter">${item.doctorName || "-"}</td>
-                // <td  class="textCenter">${item.directorDoctorName || "-"}</td>
-                // <td  class="textCenter">${item.behDeptName || "-"}</td>
-                // <td  class="textCenter">${item.level || "-"}</td>
-                // <td  class="textCenter">${item.scoreRes || "-"}</td>
-                // <td  class="textCenter">${item.gradeTime&&item.gradeTime.slice(0,10) || "-"}</td>
-
         str += "</tr>"
     }
-    if(data.length === 0){
-        hasSelectAll = false
-    }
-    if(hasSelectAll){
-        $('.scoreOpera img').attr("src" ,iconCheck)
-        $('.scoreOpera').attr("data-selectall",true)
-    }else{
-        $('.scoreOpera img').attr("src" ,iconUnCheck)
-        $('.scoreOpera').attr("data-selectall",false)
-    }
-    $('.tbody').html(str)
-    bindScoreOperaItem()
-    bindRecordScoreOper()
-    bindScoreDetail(hisId)
-    // initScroll("qcList","YX",1)
+
+    $('.patientTable .tbody').html(str)
 }
 
 function isTextCenter(name){
@@ -392,10 +264,6 @@ $('.selectLevel').on("click", function(e){
     $(".selectDept .arrow").attr("src",iconDown)
     $(".checkList ").css("display", "none")
     $(".selectCheck .arrow").attr("src",iconDown)
-    $(".fpCheckList ").css("display", "none")
-    $(".fpSelectCheck .arrow").attr("src",iconDown)
-    $(".qcSelectCheck .arrow").attr("src",iconDown)
-    $(".qcCheckList ").css("display", "none")
     const showList =  $(".levelList ").css("display")
     if(showList == "none" ||!showList){
         $(".levelList ").css("display","block")
@@ -406,45 +274,6 @@ $('.selectLevel').on("click", function(e){
     }
 })
 
-
-//选择病案首页核查状态
-$('.fpSelectCheck').on("click", function(e){
-    e.stopPropagation()
-    $(".deptList ").css("display", "none")
-    $(".selectDept .arrow").attr("src",iconDown)
-    $(".levelList ").css("display","none")
-    $(".selectLevel .arrow").attr("src",iconDown)
-    $(".qcSelectCheck .arrow").attr("src",iconDown)
-    $(".qcCheckList ").css("display", "none")
-    const showList =  $(".fpCheckList ").css("display")
-    if(showList == "none" ||!showList){
-        $(".fpCheckList ").css("display","block")
-        $(".fpSelectCheck .arrow").attr("src",iconUp)
-    }else{
-        $(".fpCheckList ").css("display", "none")
-        $(".fpSelectCheck .arrow").attr("src",iconDown)
-    }
-})
-
-//选择病历核查状态
-$('.qcSelectCheck').on("click", function(e){
-    e.stopPropagation()
-    $(".deptList ").css("display", "none")
-    $(".selectDept .arrow").attr("src",iconDown)
-    $(".levelList ").css("display","none")
-    $(".selectLevel .arrow").attr("src",iconDown)
-    $(".fpSelectCheck .arrow").attr("src",iconDown)
-    $(".fpCheckList ").css("display", "none")
-    const showList =  $(".qcCheckList ").css("display")
-    if(showList == "none" ||!showList){
-        $(".qcCheckList ").css("display","block")
-        $(".qcSelectCheck .arrow").attr("src",iconUp)
-    }else{
-        $(".qcCheckList ").css("display", "none")
-        $(".qcSelectCheck .arrow").attr("src",iconDown)
-    }
-})
-
 bindLeveldSelect()
 //病历等级选择
 function bindLeveldSelect(){
@@ -458,77 +287,52 @@ function bindLeveldSelect(){
         $('.selectLevel').removeClass('unSelect')
     })
 }
-bindCheckedSelectFp()
-//病案首页核查状态选择
-function bindCheckedSelectFp(){
-    $('.fpCheckItem').on("click",function(){
-        const fpCheckItemName = $(this).attr("data-name")
-        const fpCheckItemItemId = $(this).attr("data-id") || ""
-        fpCheckStatusTemp =fpCheckItemItemId
-        $('.fpSelectCheck').html(fpCheckItemName)
-        $(".fpCheckList").css("display", "none")
-        $(".fpSelectCheck").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
-        $('.fpSelectCheck').removeClass('unSelect')
-    })
-}
 
-bindCheckedSelectQc()
-//病历核查状态选择
-function bindCheckedSelectQc(){
-    $('.qcCheckItem').on("click",function(){
-        const qcCheckItemName = $(this).attr("data-name")
-        const qcCheckItemItemId = $(this).attr("data-id") || ""
-        qcCheckStatusTemp =qcCheckItemItemId
-        $('.qcSelectCheck').html(qcCheckItemName)
-        $(".qcCheckList").css("display", "none")
-        $(".qcSelectCheck").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
-        $('.qcSelectCheck').removeClass('unSelect')
-    })
-}
-
-$('.selectDept').on("focus", function(e){
+$('.selectDept').on("click", function(e){
     e.stopPropagation()
     $(".levelList ").css("display","none")
     $(".selectLevel .arrow").attr("src",iconDown)
-    $(".checkList ").css("display", "none")
-    $(".selectCheck .arrow").attr("src",iconDown)
-    $(".fpCheckList ").css("display", "none")
-    $(".fpSelectCheck .arrow").attr("src",iconDown)
-    $(".qcCheckList ").css("display", "none")
-    $(".qcSelectCheck .arrow").attr("src",iconDown)
+    $(".checkerList ").css("display", "none")
+    $(".selectChecker .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([])}
+            rendeDropList(deptList,'dept')
+        }else{rendeDropList([],'dept')}
+    }).catch((e) =>{
+
+    })
+}
+
+//核查人员列表
+getCheckerList()
+function getCheckerList(val){
+    post(ywCheckApi.getCheckUserMap,{inputStr:val=="全部"?"":val||""}).then(res =>{
+        if(res.data.code == '0'){
+            const list = res.data.data||[];
+            rendeDropList(list,'checker')
+            renderCheckerTable(list)
+        }else{rendeDropList([],'checker')}
     }).catch((e) =>{
 
     })
 }
-function rendeDeptList(deptList){
-    if(deptList.length == 0){
-      $('.deptList').html("")
+function rendeDropList(list,code){
+    if(list.length == 0){
+      $('.'+code+"List").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>`
+    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>`
     }
-    $('.deptList').html(str)
+    $('.'+code+"List").html(str)
     bindDeptSelect()
 }
 //科室选择
@@ -557,151 +361,6 @@ function hideLoading(){
     $("#mainBox .loadingBox", parent.document).remove()
 }
 
-function bindRecordScoreBtn(){
-    $('.recordScoreBtn').off("click").on("click",function(e){
-        scoreSum = 0;   // 解决全选评分之后  再单选 toast不隐藏的bug
-        // if(!hasData('FUNC000017')){
-        //     return
-        // }
-        let scoreList = []
-        for(let i = 0; i <tabList.length; i++){
-            if(tabList[i].hasSelect){
-                scoreList.push(tabList[i].behospitalCode)
-            }
-        }
-        if(scoreList.length === 0){
-            $.alerModal({"message":'请选择要评分的项！',type:"tip",time:'1000',isFather: true, fatherWrapper: $("#mainBox", parent.document)});
-            return
-        } else{
-            loading()
-            for(let j = 0; j < scoreList.length; j++){
-                recordScore(scoreList[j],scoreList.length,true)
-            }
-        }
-    })
-}
-
-function bindOrder(){
-    $("th[code]").off("click").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)
-    });
-}
-
-
-function recordScore(behospitalCode,totalNum,hasToast){
-    const param = {
-        behospitalCode: behospitalCode
-    }
-    post(api.recordScore,param).then(res =>{
-        // hideLoading()
-        if(res.data.code === '0'){            
-            scoreSum++
-            if(scoreSum === totalNum){
-                hideLoading()
-                scoreSum = 0
-                const activePage = $(".activePage").attr('data-page') || 1
-                getTabData(activePage)
-                if(hasToast){
-                //   $.alerModal({"message":'评分成功',type:"tip",time:'1000',win:true,isFather: true, fatherWrapper: $("#mainBox", parent.document)});
-                  $.alerModal({"message":'评分成功',type:"tip",time:'1000',isFather: true,win:true, fatherWrapper: $("#mainBox", parent.document)});
-                }
-            }
-        }else{
-            hideLoading()
-            const activePage = $(".activePage").attr('data-page') || 1
-            getTabData(activePage)
-            if(hasToast){
-                // $.alerModal({"message":res.data.msg || '评分失败,请重试~',type:"tip",time:'1000',isFather: true, fatherWrapper: $("#mainBox", parent.document)});
-                $.alerModal({"message":'评分失败,请重试~',type:"tip",time:'1000',win: 'default',isFather: true, fatherWrapper: $("#mainBox", parent.document)});
-            }
-        }
-    }).catch((e) =>{
-        hideLoading()
-        const activePage = $(".activePage").attr('data-page') || 1
-        getTabData(activePage)
-        if(hasToast){
-            $.alerModal({"message":'评分失败,请重试~',type:"tip",win: 'default',time:'1000',isFather: true, fatherWrapper: $("#mainBox", parent.document)});
-        }
-    })
-}
-
-function renderColSet(list){
-    let pageSetList =  list || pageSetCopy
-    let allSelect = true
-    for(let i = 0; i < pageSetList.length; i++){
-        if(pageSetList[i].status != 1){
-            allSelect = false
-        }
-    }
-    let str = `<div class='colSetBox'> 
-            <div class='mask'></div>
-            <div class='cloInfobox'>
-                <div class='cloInfoTitle'><span class='cloInfoTitleTxt'>列显示设置</span> <img class="iconClose" src=${require('./../images/icon_close_default.png')} alt="关闭" /></div>
-                <div class='cloInfo'></div>
-                <div class='btnBox'> <span class='defaultColSet'>恢复默认</span> <span class='cancalColSet'>取消</span> <span class='saveColSet'>保存设置</span></div>
-            </div>
-        </div>`
-    let infoStr = `<div class='colTabTitle' ><span class='colOpera toggleSelectColAll' data-select=${allSelect}>${allSelect  ? `<img  src=${iconCheck} />`:`<img src=${iconUnCheck} />`}全选</span><span  class='colName'>列名</span></div><div class='colTabInfoBox' >`
-    for(let i = 0; i < pageSetList.length; i++){
-        infoStr += `<div  class='colTabInfo' data-index=${i}>
-            <span class='colOpera' data-index=${i}>${pageSetList[i].status == 1 ? `<img class="toggleSelectCol" src=${iconCheck} />`:`<img class="toggleSelectCol" src=${iconUnCheck} />`}</span>
-            <span class='colName'>            
-                <span>${pageSetList[i].name}</span>
-                <span class="pageOrder">
-                    <span class="pageSetUpBox">${ i === 0 ?'':`<img class="pageSetUp" src=${goUpG} />`}</span>
-                    <span  class="pageSetDownBox">${ i === pageSetList.length -1 ?'':`<img class="pageSetDown" src=${goDownG} />`}</span>
-                </span>
-               
-            </span>
-           
-        </div>`
-    }
-    infoStr += "</div>"
-    // $(".main-body").append(str)
-    if(!$("#mainBox .colSetBox", parent.document).length){
-        $("#mainBox", parent.document).append(str)
-    }
-    $("#mainBox .colSetBox .cloInfo", parent.document).html(infoStr)
-   
-    $(".colTabInfoBox", parent.document).scrollTop(scrollTop)
-    scrollTop = 0
-
-    bindSelectCol()
-    bindColOrder()
-    bindSaveColSet()
-    bindDefaultColset()
-    bindCloseColSet()
-    bindImgEnter()
-}
-
-function bindImgEnter(){
-    $(".pageSetUpBox img",parent.document).off("mouseenter").on("mouseenter",function(){
-        $(this).attr('src', goUpB)
-    })
-    $(".pageSetDownBox img",parent.document).off("mouseenter").on("mouseenter",function(){
-        $(this).attr('src', goDownB)
-    })
-    $(".pageSetUpBox img",parent.document).off("mouseout").on("mouseout",function(){
-        $(this).attr('src', goUpG)
-    })
-    $(".pageSetDownBox img",parent.document).off("mouseout").on("mouseout",function(){
-        $(this).attr('src', goDownG)
-    })
-}
-
 $(".patientNumInp").on("input", function(e){
     const val = $(this).val().trim();
     let beCode=behospitalCode;
@@ -719,22 +378,6 @@ $(".doctorInp").on("input", function(e){
     const val = $(this).val().trim()
     doctorNameTemp = val
 })
-$(".fpCheckPeople").on("input", function(e){
-    const val = $(this).val().trim()
-    fpCheckNameTemp = val
-})
-$(".qcCheckPeople").on("input", function(e){
-    const val = $(this).val().trim()
-    qcCheckNameTemp = val
-})
-$(".qcCheckMain").on("input", function(e){
-    const val = $(this).val().trim()
-    qcCheckMainTemp = val
-})
-$(".doctorNumInp").on("input", function(e){
-  const val = $(this).val().trim();
-    doctorNumTemp = val
-})
 $(function() {
     $.datepicker.regional['zh-CN'] = {
     clearText: '清除',
@@ -768,19 +411,7 @@ $(function() {
     initStatus: '请选择日期',
     isRTL: false};
     $.datepicker.setDefaults($.datepicker.regional['zh-CN']);
-    let startDate = "", endDate=new Date()
-    let year = new Date().getFullYear()
-    let month = new Date().getMonth() + 1
-    if(statisticsType == '1'){
-        startDate = new Date(`${year}-${month}-01`)
-    }else if(statisticsType == '2'){
-        startDate = new Date(`${year}-01-01`)
-    } else if(statisticsType == '3') {
-        startDate = new Date(startDateParam)
-        endDate =  new Date(endDateParam)
-    }else{
-        startDate = "-6d"
-    }
+    let startDate = "-6d",endDate=new Date();
     $( "#datepicker" ).datepicker({
         changeMonth: true,
         changeYear: true,
@@ -791,22 +422,12 @@ $(function() {
         changeYear: true,
         dateFormat:"yy/mm/dd"
     }).datepicker( "setDate",endDate);
-    $( "#datepickerFp1" ).datepicker({
-        changeMonth: true,
-        changeYear: true,
-        dateFormat:"yy/mm/dd"
-    }).datepicker( "setDate","");
-    $( "#datepickerFp2" ).datepicker({
-        changeMonth: true,
-        changeYear: true,
-        dateFormat:"yy/mm/dd"
-    }).datepicker( "setDate","");
-    $( "#datepickerQc1" ).datepicker({
+    $( "#datepicker3" ).datepicker({
         changeMonth: true,
         changeYear: true,
         dateFormat:"yy/mm/dd"
     }).datepicker( "setDate","");
-    $( "#datepickerQc2" ).datepicker({
+    $( "#datepicker4" ).datepicker({
         changeMonth: true,
         changeYear: true,
         dateFormat:"yy/mm/dd"
@@ -877,82 +498,8 @@ function renderPagination(totalPage,activePage,totalNum){
 
 $(document).on("click", function(){
     $(".levelList ").css("display", "none")
-    $(".checkList").css("display", "none")
-    $(".fpCheckList").css("display", "none")
-    $(".qcCheckList").css("display", "none")
+    $(".checkerList").css("display", "none")
     $(".selectDept .arrow").attr("src",iconDown)
     $(".selectLevel .arrow").attr("src",iconDown)
-    $(".selectCheck .arrow").attr("src",iconDown)
-    $(".fpSelectCheck .arrow").attr("src",iconDown)
-    $(".qcSelectCheck .arrow").attr("src",iconDown)
+    $(".selectChecker .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天
-            "doctorCode":doctorNum,
-            "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,
-            "checkStatus": qcCheckStatus?Number(qcCheckStatus):qcCheckStatus, //病历核查状态
-            "mrStatus": fpCheckStatus?Number(fpCheckStatus):fpCheckStatus,   //首页核查状态（1：已核查，0：未核查）
-            "chName": qcCheckName,   //病历核查人员
-            "diagnose": qcCheckMain,   //病历主诊断.....................
-            "mrName": fpCheckName,  //首页核查人员
-            "chTimeStart": qcCheckDateStart.replace(/\//g,'-'), //病历核查起始时间
-            "chTimeEnd": qcCheckDateEnd.replace(/\//g,'-'), //病历核查截止时间
-            "mrTimeStart": fpCheckDateStart.replace(/\//g,'-'), //首页核查起始时间
-            "mrTimeEnd": fpCheckDateEnd.replace(/\//g,'-'), //首页核查截止时间
-        }
-        $.alerModal({type:"radio",time:'1000',isFather: true, fatherWrapper: $("#mainBox", parent.document)});
-        closeRadio()
-        radioSelect()
-        bindSaveColPort(param)
-    })
-})($));
-function closeRadio(){
-    $(".colSetBox .iconClose,.colSetBox .cancalColSet", parent.document ).off("click").on("click",function(){
-        $(".divModal",parent.document).html("")
-    })
-}
-function radioSelect(){
-    $(".selectDate", parent.document).click(function(){
-        $(this).find("input").prop("checked",true)
-        $(this).siblings().find("input").prop("checked",false)
-    })
-}
-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")
-        })
-    })
-}

src/js/api.js

@@ -136,7 +136,6 @@ const api = {
   medicalCheckExport: '/console/export/medicalCheckExport', //稽查表导出
   getMedNursePage: '/qc/medNurse/getMedNursePage', //护理信息
 
-  entryGroupExportByDeptPage: '/print/export/entryGroupExportByDeptPage', //（科室病案首页导出,终末）
   qcCheckStatisticsByDept: '/consoleByDept/qcCheckStatisticsByDept', //（质控核查统计-科室）
   qcCheckStaExportByDept: '/print/export/qcCheckStaExportByDept', //（质控核查统计-科室）
   reHos31DaysPageByDept: '/consoleByDept/reHos31DaysPageByDept', // 31日再入院-科室）
@@ -177,6 +176,15 @@ const api = {
     getListDoctor:'/bas/doctor/getList',//（科室医生列表）
 
 }
+const ywCheckApi = {
+    addMedCheckInfo:'/qc/medCheckInfo/addMedCheckInfo',   //核查
+    getAllotCheckList:'/qc/medCheckInfo/getCheckList', //分配核查任务列表
+    getCheckUserMap:'/qc/medCheckInfo/getCheckUserMap',  //核查人员列表
+    addCheck:'/check/addCheck', //生成核查任务
+    getTaskList:'/check/getUserList', //核查任务列表
+
+};
 module.exports = {
   api,
+  ywCheckApi
 };

src/js/creatCheckTask.js

@@ -25,7 +25,7 @@ $(".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';
+let activeTabCode = '1';    //激活的tab  code
 let isPlacefile = getCookie('isPlacefile')||1
 if(isPlacefile != 1){
     data_desc=["behospital_date"]
@@ -165,7 +165,7 @@ function bindLeveldSelect(){
         $('.selectLevel').removeClass('unSelect')
     })
 }
-
+//科室列表
 function getDeptList(val){
     post(api.getDeptList,{inputStr:val=="全部"?"":val||""}).then(res =>{
         if(res.data.code == '0'){
@@ -343,7 +343,7 @@ $(function() {
        $(".tabBox .tabs button").removeClass("active");
        $(me).addClass("active");
        //更新列表并重置筛选条件
-
+       $(".abnormalClear").click();
     });
 //选择生成状态
     $('.selectStatus').on("click", function(e){