Merge branch 'version1.3.8' into test

src/css/console.less

@@ -403,14 +403,14 @@ div.console {
       }
       &.li04.li04again {
         border-left: 1px solid @darkLightBorderColor;
-        cursor: default;
+        // cursor: default;
       }
       &:hover {
         .numShow {
           color: @activeColor;
         }
         .againNum {
-          color: @fstColor;
+          // color: @fstColor;
         }
       }
     }

src/css/qcList.less

@@ -193,7 +193,7 @@ h2{
         cursor: pointer;
     }
 }
-.selectLevel,.selectDept,.selectCheck{
+.selectLevel,.selectDept,.fpSelectCheck,.qcSelectCheck{
     display: inline-block;
     position: relative;
     width:120px;

src/css/qcListCopy.less

@@ -132,7 +132,7 @@ h2{
     width: 100%;
 }
 .toggle-item{
-    display: block;
+    display: none;
 }
 .filter-toggler{
     position: absolute;
@@ -206,7 +206,7 @@ h2{
         cursor: pointer;
     }
 }
-.selectLevel,.selectDept,.selectCheck{
+.selectLevel,.selectDept,.fpSelectCheck,.qcSelectCheck{
     display: inline-block;
     position: relative;
     width:120px;

src/css/qcListDept.less

@@ -187,7 +187,7 @@ h2{
     }
 }
 
-.selectLevel,.selectDept,.selectCheck{
+.selectLevel,.selectDept,.fpSelectCheck,.qcSelectCheck{
     display: inline-block;
     position: relative;
     width:120px;

src/css/qcListDocteam.less

@@ -185,7 +185,7 @@ h2{
     }
 }
 
-.selectLevel,.selectDept,.selectCheck{
+.selectLevel,.selectDept,.fpSelectCheck,.qcSelectCheck{
     display: inline-block;
     position: relative;
     width:120px;

src/css/qcListOutHospital.less

@@ -133,7 +133,7 @@ h2{
     width: 100%;
 }
 .toggle-item{
-    display: block;
+    display: none;
 }
 .filter-toggler{
     position: absolute;
@@ -212,7 +212,7 @@ h2{
     width: 150px;
     max-height: 300px;
 }
-.selectLevel,.selectDept,.selectCheck,.selectLeaveHosType{
+.selectLevel,.selectDept,.fpSelectCheck,.qcSelectCheck,.selectLeaveHosType{
     display: inline-block;
     position: relative;
     width:120px;

src/css/qcListPerson.less

@@ -189,7 +189,7 @@ h2{
         cursor: pointer;
     }
 }
-.selectLevel,.selectDept,.selectDoctor,.selectCheck{
+.selectLevel,.selectDept,.selectDoctor,.fpSelectCheck,.qcSelectCheck{
     display: inline-block;
     position: relative;
     width:120px;

src/css/qcScore.less

@@ -586,7 +586,7 @@
     width: 100%;
   }
   img{
-    width: 86px;
+    width: 140px;
   }
   p{
     // margin-top: 15px;

src/css/quexianDetailControlHome.less

@@ -300,6 +300,10 @@
         -moz-appearance: textfield;
     }
 }
+.canJump{
+    color: #00A1F0;
+    cursor: pointer;
+}
 
 .usrContain .selectReject,.usrContain .selectModuleType ,.managerContainer .selectModuleType  {
     float: right;

src/css/readmission.less

@@ -0,0 +1,382 @@
+@import "./reset.less";
+.container{
+    width: 100%;
+    height: 100%;
+    overflow: auto;
+    background: #fff;
+    border-bottom: 10px @disColor solid;
+    box-sizing: border-box;
+}
+ul,li{
+    list-style: none;
+}
+h2{
+    .h2;
+    border-bottom: 10px @disColor solid;
+    position: fixed;
+    top: 0;
+}
+.partTitle{
+    border-bottom: 10px @disColor solid;
+    height: 54px;
+}
+.main-body{
+    .main-body-com;
+    border: none;
+    // border:10px @disColor solid;
+    border-left:10px @disColor solid;
+    margin: 44px 0 0;
+    min-width: 1090px;
+    min-height: calc(100% - 84px);
+    // overflow: auto;
+    height:  calc(100% - 44px);
+    .selectDefect{
+        min-width: 120px;
+        width: auto;
+        display: inline-block;
+        position: relative;
+        padding: 0 10px;
+        height:32px;
+        border-radius:4px;
+        border: 1px solid #E2E5EF;
+        box-sizing: border-box;
+        cursor: default;
+    }
+}
+.qctable{
+    .table;
+    min-width: 1090px;
+    th,td{
+        padding:5px 10px;
+    }
+    th{
+        white-space: nowrap;
+    }
+    th[code]{
+        cursor: pointer;
+        &:after{
+            content:"";
+            display:inline-block;
+            width: 11px;
+            height: 14px;
+            margin-left: 4px;
+            vertical-align: middle;
+            background-size: 100%;
+            background-image: url("../images/grey.png");
+        }
+        &.asc:after{
+            background: url("../images/up_blue.png");
+            background-size: 100%;
+        }
+        &.desc:after{
+            background: url("../images/down_blue.png");
+            background-size: 100%;
+        }
+    }
+    td{
+        white-space: nowrap;
+    }
+    .moduleNumber{
+        text-align: center;
+    }
+    .scoreOperaItem{
+        width: 50px;
+        cursor: pointer;
+    }
+    .tabTitle   {
+        background: #EFF0F9 !important;
+      }
+    
+}
+.tabFoot{
+    height: 40px;
+    background: none;
+    /*border: 1px solid #E2E5EF;
+    border-top: none;
+    box-sizing: border-box;*/
+}
+.scoreOpera{
+    height: 50px;
+    line-height: 50px;
+    margin: 0 20px 0 0;
+    cursor: pointer;
+    img{
+        margin: 0 10px 0 0;
+        vertical-align: middle;
+    }
+}
+
+.recordScoreOperaBtn{
+    cursor: pointer;
+    color: @activeColor;
+}
+.recordScoreBtn{
+    cursor: pointer;
+    display: inline-block;
+    width:68px;
+    height:30px;
+    line-height: 30px;
+    text-align: center;
+    border-radius:4px;
+    box-sizing: border-box;
+    border: 1px solid @activeColor;
+    color: #fff;
+    background: @activeColor;
+}
+.filterBox{
+    position: relative;
+}
+.overAuto{
+    display: table;
+    padding-right: 20px;
+    width: 100%;
+}
+.toggle-item{
+    display: block;
+}
+.filter-toggler{
+    position: absolute;
+    left: 1048px;
+    top: 8px;
+    color: #777;
+    white-space: nowrap;
+    font-size: 14px;
+    background: url("../images/arrow_down.png") 60px center no-repeat;
+    padding-right: 15px;
+    background-size: 10px 6px;
+    &.up{
+        background: url("../images/arrow_up.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;
+    }
+    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;
+    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{
+    width: 160px;
+    max-height: 400px;
+}
+.levelList,.checkList{
+    width: 120px;
+    // height: 200px;
+    li:hover{
+        background-color: #EEF4FF;
+        cursor: pointer;
+    }
+}
+.selectLevel,.selectDept,.selectCheck{
+    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;
+}
+
+.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;
+}
+.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;
+}
+.arrow{
+    position: absolute;
+    width: 10px;
+    top: 12px;
+    right: 10px;
+}
+.iconCheck{
+    width: 14px;
+}
+.fl{
+    float: left;
+}
+.clearfix:after {
+    content: '';
+    height: 0;
+    line-height: 0;
+    display: block;
+    visibility: hidden;
+    clear: both;
+}
+.clearfix{
+    zoom:1
+}
+.divide{
+    margin: 0 10px;
+}
+.datapickerBox{
+    position: relative;
+    display: inline-block;
+    width: 120px;
+    height: 32px;
+    input{
+        position: absolute;
+    }
+}
+.setCol{
+    color: #777;
+    cursor: pointer;
+    display: inline-block;
+    margin: 10px 0 0  0px;
+}
+.iconSetting{
+    width: 18px;
+    position: relative;
+    top: 3px;
+    margin: 0 3px 0 0;
+}
+.iconCalen{
+    position: absolute;
+    width: 15px;
+    top: 10px;
+    right: 10px;
+}
+.textCenter{
+    text-align: center;
+}
+.patientNameSpan{
+    color: @activeColor;
+    cursor: pointer;
+}
+
+.deptItem:hover{
+    background-color: #EEF4FF;
+    cursor: pointer;
+}
+.ellipsis{
+    overflow: hidden;
+    text-overflow:ellipsis;
+    white-space: nowrap;
+}
+.unSelect{
+    color: #cfccd6
+ }
+
+
+.pagination{
+    margin: 35px 0 20px 0  ;
+    text-align: right;
+}
+.totalSum{
+    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;
+}
+.prePage,.nextPage{
+    img{
+        position: relative;
+        top: 0px   ;
+    }
+}
+ .more{
+    cursor: not-allowed;
+}
+.arrowPage{
+    width: 6px;
+}
+.activePage{
+    color: @activeColor;
+}
+
+.tbody{
+    tr:nth-child(4n+1){
+        background-color:  #ffffff !important;
+    }
+    tr:nth-child(4n+2){
+        background-color:  #ffffff !important;
+    }
+    tr:nth-child(4n+3){
+        background-color:  #EFF1F6 !important;
+    }
+    tr:nth-child(4n+4){
+        background-color:  #EFF1F6 !important;
+    }
+}
+.patientNameSpan{
+    color: @activeColor;
+    cursor: pointer;
+}
+
+
+
+
+

src/css/uccDetail.less

@@ -132,7 +132,7 @@ h2{
     width: 100%;
 }
 .toggle-item{
-    display: block;
+    display: none;
 }
 .filter-toggler{
     position: absolute;
@@ -206,7 +206,7 @@ h2{
         cursor: pointer;
     }
 }
-.selectLevel,.selectDept,.selectCheck{
+.selectLevel,.selectDept,.fpSelectCheck,.qcSelectCheck{
     display: inline-block;
     position: relative;
     width:120px;

src/html/console.html

@@ -57,6 +57,10 @@
                           <p class="numShow againNum"></p>
                           <p class="explainNum">31日再入院病人数</p>
                         </li>
+                        <!-- <li class="li05 li04again" data-type="5">
+                          <p class="numShow againNum"></p>
+                          <p class="explainNum">31日再入院病人数</p>
+                        </li> -->
                       </ul>
                     </div>
                     <div class="chuyuanEmpty"></div>

src/html/qcList.html

@@ -62,15 +62,44 @@
                         <span>医生工号：</span>
                         <input class="doctorNumInp" type="text" placeholder="请输入医生工号">
                     </span>
-                    <span class="filterItem">
-                        <span>核查状态：</span>
-                        <span class="selectCheck">全部</span>
-                        <ul class="checkList filterDropList">
-                            <Li class="checkItem" data-name="全部" data-id="全部">全部</Li>
-                            <Li class="checkItem" data-name="未核查" data-id="0">未核查</Li>
-                            <Li class="checkItem" data-name="已核查" data-id="1">已核查</Li>
+                    <span class="filterItem fpFilterItem">
+                        <span>病案首页核查状态：</span>
+                        <span class="fpSelectCheck">全部</span>
+                        <ul class="checkList filterDropList fpCheckList">
+                            <Li class="fpCheckItem" data-name="全部" data-id="">全部</Li>
+                            <Li class="fpCheckItem" data-name="未核查" data-id="0">未核查</Li>
+                            <Li class="fpCheckItem" data-name="已核查" data-id="1">已核查</Li>
                         </ul>
                     </span>
+                    <span class="filterItem doctorFilter fpFilterItem">
+                        <span>病案首页核查人：</span>
+                        <input class="fpCheckPeople" type="text" placeholder="请输入病案首页核查人">
+                    </span>
+                    <span class="filterItem qcFiliterItem">
+                        <span>病历核查状态：</span>
+                        <span class="qcSelectCheck">全部</span>
+                        <ul class="checkList filterDropList qcCheckList">
+                            <Li class="qcCheckItem" data-name="全部" data-id="">全部</Li>
+                            <Li class="qcCheckItem" data-name="未核查" data-id="0">未核查</Li>
+                            <Li class="qcCheckItem" data-name="已核查" data-id="1">已核查</Li>
+                        </ul>
+                    </span>
+                    <span class="filterItem doctorFilter qcFiliterItem">
+                        <span>病历核查人：</span>
+                        <input class="qcCheckPeople" type="text" placeholder="请输入病历核查人">
+                    </span>
+                    <span class="filterItem typeFilter clearfix" >
+                        <span class="fl">病案首页核查时间：</span>
+                        <span class="datapickerBox fl"><input type="text" placeholder="请选择时间" id="datepickerFp1" autocomplete="off" readonly /></span>
+                        <span  class="divide fl">-</span>
+                        <span class="datapickerBox fl"><input type="text" placeholder="请选择时间" id="datepickerFp2"  autocomplete="off" readonly/></span>
+                    </span>
+                    <span class="filterItem typeFilter clearfix qcFiliterItem" >
+                        <span class="fl">病历核查时间：</span>
+                        <span class="datapickerBox fl"><input type="text" placeholder="请选择时间" id="datepickerQc1" autocomplete="off" readonly /></span>
+                        <span  class="divide fl">-</span>
+                        <span class="datapickerBox fl"><input type="text" placeholder="请选择时间" id="datepickerQc2"  autocomplete="off" readonly/></span>
+                    </span>
                 </div>
             </div>
             <div class="overAuto">

src/html/qcListCopy.html

@@ -47,7 +47,7 @@
                     <span class="filterclear abnormalClear filterclearT">重置</span>
                     <span class="export">导出</span>
                 </div>
-                <a href="javascript:void(0);" class="filter-toggler up" id="filterToggler">收起筛选</a>
+                <a href="javascript:void(0);" class="filter-toggler" id="filterToggler">展开筛选</a>
                 <div class="toggle-item clearfix">
                     <span class="filterItem typeFilter">
                         <span>病人姓名：</span>
@@ -65,6 +65,44 @@
                         <span>医生工号：</span>
                         <input class="doctorNumInp" type="text" placeholder="请输入医生工号">
                     </span>
+                    <span class="filterItem fpFilterItem">
+                        <span>病案首页核查状态：</span>
+                        <span class="fpSelectCheck">全部</span>
+                        <ul class="checkList filterDropList fpCheckList">
+                            <Li class="fpCheckItem" data-name="全部" data-id="">全部</Li>
+                            <Li class="fpCheckItem" data-name="未核查" data-id="0">未核查</Li>
+                            <Li class="fpCheckItem" data-name="已核查" data-id="1">已核查</Li>
+                        </ul>
+                    </span>
+                    <span class="filterItem doctorFilter fpFilterItem">
+                        <span>病案首页核查人：</span>
+                        <input class="fpCheckPeople" type="text" placeholder="请输入病案首页核查人">
+                    </span>
+                    <span class="filterItem qcFiliterItem">
+                        <span>病历核查状态：</span>
+                        <span class="qcSelectCheck">全部</span>
+                        <ul class="checkList filterDropList qcCheckList">
+                            <Li class="qcCheckItem" data-name="全部" data-id="">全部</Li>
+                            <Li class="qcCheckItem" data-name="未核查" data-id="0">未核查</Li>
+                            <Li class="qcCheckItem" data-name="已核查" data-id="1">已核查</Li>
+                        </ul>
+                    </span>
+                    <span class="filterItem doctorFilter qcFiliterItem">
+                        <span>病历核查人：</span>
+                        <input class="qcCheckPeople" type="text" placeholder="请输入病历核查人">
+                    </span>
+                    <span class="filterItem typeFilter clearfix" >
+                        <span class="fl">病案首页核查时间：</span>
+                        <span class="datapickerBox fl"><input type="text" placeholder="请选择时间" id="datepickerFp1" autocomplete="off" readonly /></span>
+                        <span  class="divide fl">-</span>
+                        <span class="datapickerBox fl"><input type="text" placeholder="请选择时间" id="datepickerFp2"  autocomplete="off" readonly/></span>
+                    </span>
+                    <span class="filterItem typeFilter clearfix qcFiliterItem" >
+                        <span class="fl">病历核查时间：</span>
+                        <span class="datapickerBox fl"><input type="text" placeholder="请选择时间" id="datepickerQc1" autocomplete="off" readonly /></span>
+                        <span  class="divide fl">-</span>
+                        <span class="datapickerBox fl"><input type="text" placeholder="请选择时间" id="datepickerQc2"  autocomplete="off" readonly/></span>
+                    </span>
                     <span class="filterItem doctorFilter">
                         <span>缺陷名称：</span>
                         <span class="selectDefect"> 
@@ -72,15 +110,7 @@
                         </span>
                         <!-- <input class="doctorInp" type="text" placeholder="请输入医生姓名"> -->
                     </span>
-                    <span class="filterItem">
-                        <span>核查状态：</span>
-                        <span class="selectCheck">全部</span>
-                        <ul class="checkList filterDropList">
-                            <Li class="checkItem" data-name="全部" data-id="全部">全部</Li>
-                            <Li class="checkItem" data-name="未核查" data-id="0">未核查</Li>
-                            <Li class="checkItem" data-name="已核查" data-id="1">已核查</Li>
-                        </ul>
-                    </span>
+                    
                 </div>
             </div>
             <div class="overAuto">

src/html/qcListDept.html

@@ -62,15 +62,44 @@
                         <span>医生工号：</span>
                         <input class="doctorNumInp" type="text" placeholder="请输入医生工号">
                     </span>
-                    <span class="filterItem">
-                        <span>核查状态：</span>
-                        <span class="selectCheck">全部</span>
-                        <ul class="checkList filterDropList">
-                            <Li class="checkItem" data-name="全部" data-id="全部">全部</Li>
-                            <Li class="checkItem" data-name="未核查" data-id="0">未核查</Li>
-                            <Li class="checkItem" data-name="已核查" data-id="1">已核查</Li>
+                    <span class="filterItem fpFilterItem">
+                        <span>病案首页核查状态：</span>
+                        <span class="fpSelectCheck">全部</span>
+                        <ul class="checkList filterDropList fpCheckList">
+                            <Li class="fpCheckItem" data-name="全部" data-id="">全部</Li>
+                            <Li class="fpCheckItem" data-name="未核查" data-id="0">未核查</Li>
+                            <Li class="fpCheckItem" data-name="已核查" data-id="1">已核查</Li>
                         </ul>
                     </span>
+                    <span class="filterItem doctorFilter fpFilterItem">
+                        <span>病案首页核查人：</span>
+                        <input class="fpCheckPeople" type="text" placeholder="请输入病案首页核查人">
+                    </span>
+                    <span class="filterItem qcFiliterItem">
+                        <span>病历核查状态：</span>
+                        <span class="qcSelectCheck">全部</span>
+                        <ul class="checkList filterDropList qcCheckList">
+                            <Li class="qcCheckItem" data-name="全部" data-id="">全部</Li>
+                            <Li class="qcCheckItem" data-name="未核查" data-id="0">未核查</Li>
+                            <Li class="qcCheckItem" data-name="已核查" data-id="1">已核查</Li>
+                        </ul>
+                    </span>
+                    <span class="filterItem doctorFilter qcFiliterItem">
+                        <span>病历核查人：</span>
+                        <input class="qcCheckPeople" type="text" placeholder="请输入病历核查人">
+                    </span>
+                    <span class="filterItem typeFilter clearfix" >
+                        <span class="fl">病案首页核查时间：</span>
+                        <span class="datapickerBox fl"><input type="text" placeholder="请选择时间" id="datepickerFp1" autocomplete="off" readonly /></span>
+                        <span  class="divide fl">-</span>
+                        <span class="datapickerBox fl"><input type="text" placeholder="请选择时间" id="datepickerFp2"  autocomplete="off" readonly/></span>
+                    </span>
+                    <span class="filterItem typeFilter clearfix qcFiliterItem" >
+                        <span class="fl">病历核查时间：</span>
+                        <span class="datapickerBox fl"><input type="text" placeholder="请选择时间" id="datepickerQc1" autocomplete="off" readonly /></span>
+                        <span  class="divide fl">-</span>
+                        <span class="datapickerBox fl"><input type="text" placeholder="请选择时间" id="datepickerQc2"  autocomplete="off" readonly/></span>
+                    </span>
                 </div>
             </div>
             <div class="overAuto">

src/html/qcListDocteam.html

@@ -54,15 +54,44 @@
                         <span>医生工号：</span>
                         <input class="doctorNumInp" type="text" placeholder="请输入医生工号">
                     </span>
-                    <span class="filterItem">
-                        <span>核查状态：</span>
-                        <span class="selectCheck">全部</span>
-                        <ul class="checkList filterDropList">
-                            <Li class="checkItem" data-name="全部" data-id="全部">全部</Li>
-                            <Li class="checkItem" data-name="未核查" data-id="0">未核查</Li>
-                            <Li class="checkItem" data-name="已核查" data-id="1">已核查</Li>
+                    <span class="filterItem fpFilterItem">
+                        <span>病案首页核查状态：</span>
+                        <span class="fpSelectCheck">全部</span>
+                        <ul class="checkList filterDropList fpCheckList">
+                            <Li class="fpCheckItem" data-name="全部" data-id="">全部</Li>
+                            <Li class="fpCheckItem" data-name="未核查" data-id="0">未核查</Li>
+                            <Li class="fpCheckItem" data-name="已核查" data-id="1">已核查</Li>
                         </ul>
                     </span>
+                    <span class="filterItem doctorFilter fpFilterItem">
+                        <span>病案首页核查人：</span>
+                        <input class="fpCheckPeople" type="text" placeholder="请输入病案首页核查人">
+                    </span>
+                    <span class="filterItem qcFiliterItem">
+                        <span>病历核查状态：</span>
+                        <span class="qcSelectCheck">全部</span>
+                        <ul class="checkList filterDropList qcCheckList">
+                            <Li class="qcCheckItem" data-name="全部" data-id="">全部</Li>
+                            <Li class="qcCheckItem" data-name="未核查" data-id="0">未核查</Li>
+                            <Li class="qcCheckItem" data-name="已核查" data-id="1">已核查</Li>
+                        </ul>
+                    </span>
+                    <span class="filterItem doctorFilter qcFiliterItem">
+                        <span>病历核查人：</span>
+                        <input class="qcCheckPeople" type="text" placeholder="请输入病历核查人">
+                    </span>
+                    <span class="filterItem typeFilter clearfix" >
+                        <span class="fl">病案首页核查时间：</span>
+                        <span class="datapickerBox fl"><input type="text" placeholder="请选择时间" id="datepickerFp1" autocomplete="off" readonly /></span>
+                        <span  class="divide fl">-</span>
+                        <span class="datapickerBox fl"><input type="text" placeholder="请选择时间" id="datepickerFp2"  autocomplete="off" readonly/></span>
+                    </span>
+                    <span class="filterItem typeFilter clearfix qcFiliterItem" >
+                        <span class="fl">病历核查时间：</span>
+                        <span class="datapickerBox fl"><input type="text" placeholder="请选择时间" id="datepickerQc1" autocomplete="off" readonly /></span>
+                        <span  class="divide fl">-</span>
+                        <span class="datapickerBox fl"><input type="text" placeholder="请选择时间" id="datepickerQc2"  autocomplete="off" readonly/></span>
+                    </span>
                 </div>
             </div>
             <div class="overAuto">

src/html/qcListOutHospital.html

@@ -49,7 +49,7 @@
                     <span class="filterclear abnormalClear filterclearT">重置</span>
                     <span class="export">导出</span>
                 </div>
-                <a href="javascript:void(0);" class="filter-toggler up" id="filterToggler">收起筛选</a>
+                <a href="javascript:void(0);" class="filter-toggler" id="filterToggler">收起筛选</a>
                 <div class="toggle-item clearfix">
                     <span class="filterItem">
                         <span>病历等级：</span>
@@ -79,15 +79,44 @@
                         <input class="doctorNumInp" type="text" placeholder="请输入医生工号">
                     </span>
                     
-                    <span class="filterItem">
-                        <span>核查状态：</span>
-                        <span class="selectCheck">全部</span>
-                        <ul class="checkList filterDropList">
-                            <Li class="checkItem" data-name="全部" data-id="全部">全部</Li>
-                            <Li class="checkItem" data-name="未核查" data-id="0">未核查</Li>
-                            <Li class="checkItem" data-name="已核查" data-id="1">已核查</Li>
+                    <span class="filterItem fpFilterItem">
+                        <span>病案首页核查状态：</span>
+                        <span class="fpSelectCheck">全部</span>
+                        <ul class="checkList filterDropList fpCheckList">
+                            <Li class="fpCheckItem" data-name="全部" data-id="">全部</Li>
+                            <Li class="fpCheckItem" data-name="未核查" data-id="0">未核查</Li>
+                            <Li class="fpCheckItem" data-name="已核查" data-id="1">已核查</Li>
                         </ul>
                     </span>
+                    <span class="filterItem doctorFilter fpFilterItem">
+                        <span>病案首页核查人：</span>
+                        <input class="fpCheckPeople" type="text" placeholder="请输入病案首页核查人">
+                    </span>
+                    <span class="filterItem qcFiliterItem">
+                        <span>病历核查状态：</span>
+                        <span class="qcSelectCheck">全部</span>
+                        <ul class="checkList filterDropList qcCheckList">
+                            <Li class="qcCheckItem" data-name="全部" data-id="">全部</Li>
+                            <Li class="qcCheckItem" data-name="未核查" data-id="0">未核查</Li>
+                            <Li class="qcCheckItem" data-name="已核查" data-id="1">已核查</Li>
+                        </ul>
+                    </span>
+                    <span class="filterItem doctorFilter qcFiliterItem">
+                        <span>病历核查人：</span>
+                        <input class="qcCheckPeople" type="text" placeholder="请输入病历核查人">
+                    </span>
+                    <span class="filterItem typeFilter clearfix" >
+                        <span class="fl">病案首页核查时间：</span>
+                        <span class="datapickerBox fl"><input type="text" placeholder="请选择时间" id="datepickerFp1" autocomplete="off" readonly /></span>
+                        <span  class="divide fl">-</span>
+                        <span class="datapickerBox fl"><input type="text" placeholder="请选择时间" id="datepickerFp2"  autocomplete="off" readonly/></span>
+                    </span>
+                    <span class="filterItem typeFilter clearfix qcFiliterItem" >
+                        <span class="fl">病历核查时间：</span>
+                        <span class="datapickerBox fl"><input type="text" placeholder="请选择时间" id="datepickerQc1" autocomplete="off" readonly /></span>
+                        <span  class="divide fl">-</span>
+                        <span class="datapickerBox fl"><input type="text" placeholder="请选择时间" id="datepickerQc2"  autocomplete="off" readonly/></span>
+                    </span>
                 </div>
             </div>
             <div class="overAuto">

src/html/qcListPerson.html

@@ -59,15 +59,44 @@
                     </span>
                     <!-- <input class="doctorInp" type="text" placeholder="请输入医生姓名"> -->
                 </span>
-                <span class="filterItem">
-                    <span>核查状态：</span>
-                    <span class="selectCheck">全部</span>
-                    <ul class="checkList filterDropList">
-                        <Li class="checkItem" data-name="全部" data-id="全部">全部</Li>
-                        <Li class="checkItem" data-name="未核查" data-id="0">未核查</Li>
-                        <Li class="checkItem" data-name="已核查" data-id="1">已核查</Li>
+                <span class="filterItem fpFilterItem">
+                    <span>病案首页核查状态：</span>
+                    <span class="fpSelectCheck">全部</span>
+                    <ul class="checkList filterDropList fpCheckList">
+                        <Li class="fpCheckItem" data-name="全部" data-id="">全部</Li>
+                        <Li class="fpCheckItem" data-name="未核查" data-id="0">未核查</Li>
+                        <Li class="fpCheckItem" data-name="已核查" data-id="1">已核查</Li>
                     </ul>
                 </span>
+                <span class="filterItem doctorFilter fpFilterItem">
+                    <span>病案首页核查人：</span>
+                    <input class="fpCheckPeople" type="text" placeholder="请输入病案首页核查人">
+                </span>
+                <span class="filterItem qcFiliterItem">
+                    <span>病历核查状态：</span>
+                    <span class="qcSelectCheck">全部</span>
+                    <ul class="checkList filterDropList qcCheckList">
+                        <Li class="qcCheckItem" data-name="全部" data-id="">全部</Li>
+                        <Li class="qcCheckItem" data-name="未核查" data-id="0">未核查</Li>
+                        <Li class="qcCheckItem" data-name="已核查" data-id="1">已核查</Li>
+                    </ul>
+                </span>
+                <span class="filterItem doctorFilter qcFiliterItem">
+                    <span>病历核查人：</span>
+                    <input class="qcCheckPeople" type="text" placeholder="请输入病历核查人">
+                </span>
+                <span class="filterItem typeFilter clearfix" >
+                    <span class="fl">病案首页核查时间：</span>
+                    <span class="datapickerBox fl"><input type="text" placeholder="请选择时间" id="datepickerFp1" autocomplete="off" readonly /></span>
+                    <span  class="divide fl">-</span>
+                    <span class="datapickerBox fl"><input type="text" placeholder="请选择时间" id="datepickerFp2"  autocomplete="off" readonly/></span>
+                </span>
+                <span class="filterItem typeFilter clearfix qcFiliterItem" >
+                    <span class="fl">病历核查时间：</span>
+                    <span class="datapickerBox fl"><input type="text" placeholder="请选择时间" id="datepickerQc1" autocomplete="off" readonly /></span>
+                    <span  class="divide fl">-</span>
+                    <span class="datapickerBox fl"><input type="text" placeholder="请选择时间" id="datepickerQc2"  autocomplete="off" readonly/></span>
+                </span>
             </div>
             </div>
             <div class="overAuto">

src/html/qcScore.html

@@ -45,7 +45,7 @@
         <span class="level">病历等级：${level}</span>
         <span class="score">病历得分：${scoreRes}</span>
         {{if hasCheck}}
-        <span class="check">${checkState===1 ? "重新核查" : "核查"}</span>
+        <span class="check">${checkState===1 ? "重新核查" : "病历核查"}</span>
         {{/if}}
     </script>
     <script type="text/html" id="tableTmpl">

src/html/readmission.html

@@ -0,0 +1,148 @@
+<!DOCTYPE html>
+<html lang="en">
+
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <meta http-equiv="X-UA-Compatible" content="ie=edge">
+    <title>病历质控评分</title>
+    
+</head>
+
+<body>
+    <div class="container qcListCopy">
+        <!-- <h2>质控评分</h2>控制台 / 条目缺陷占比 / 缺陷详情 -->
+        <div class="partTitle">
+            <p class="titlePic"></p>
+        </div>
+        <!-- <div class="partTitle">
+            <p>未整改病历统计</p>
+            <div class="dateDetail fr">
+    
+            </div>
+        </div> -->
+        <div class="main-body">
+            <div class="filterBox">
+                <div class="clearfix">
+                    <!-- <span class="filterItem typeFilter">
+                        <span>科室名称：</span>
+                        <input class="patientNumInp" style="width: 148px;" type="text" placeholder="请输入科室名称">
+                    </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>
+                        <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="filterItem typeFilter">
+                      <span>病人姓名：</span>
+                      <input class="patientNameInp" type="text" placeholder="请输入病人姓名">
+                  </span>
+                  <span class="filterItem typeFilter">
+                      <span>病案号：</span>
+                      <input class="patientRecordInp" style="width: 148px;" type="text" placeholder="请输入病人住院序号">
+                  </span>
+                    <span class="filter">查询</span>
+                    <span class="filterclear abnormalClear filterclearT">重置</span>
+                    <span class="export">导出</span>
+                </div>
+                <!-- <a href="javascript:void(0);" class="filter-toggler up" id="filterToggler">收起筛选</a>
+                <div class="toggle-item clearfix">
+                    <span class="filterItem typeFilter">
+                        <span>病人姓名：</span>
+                        <input class="patientNameInp" type="text" placeholder="请输入病人姓名">
+                    </span>
+                    <span class="filterItem typeFilter">
+                        <span>病人住院序号：</span>
+                        <input class="patientNumInp" style="width: 148px;" type="text" placeholder="请输入病人住院序号">
+                    </span>
+                    <span class="filterItem doctorFilter">
+                        <span>医生姓名：</span>
+                        <input class="doctorInp" type="text" placeholder="请输入医生姓名">
+                    </span>
+                    <span class="filterItem doctorFilter">
+                        <span>医生工号：</span>
+                        <input class="doctorNumInp" type="text" placeholder="请输入医生工号">
+                    </span>
+                    <span class="filterItem doctorFilter">
+                        <span>缺陷名称：</span>
+                        <span class="selectDefect"> 
+                        
+                        </span>
+                    </span>
+                    <span class="filterItem">
+                        <span>核查状态：</span>
+                        <span class="selectCheck">全部</span>
+                        <ul class="checkList filterDropList">
+                            <Li class="checkItem" data-name="全部" data-id="全部">全部</Li>
+                            <Li class="checkItem" data-name="未核查" data-id="0">未核查</Li>
+                            <Li class="checkItem" data-name="已核查" data-id="1">已核查</Li>
+                        </ul>
+                    </span>
+                </div> -->
+            </div>
+            <div class="overAuto">
+                <table class="qctable">
+                    <thead>
+                    <!-- <tr class="tabOpera"> -->
+                        <!-- <td colspan="18" style="background: #fff">
+                            <div class="tabFoot">
+                                <span class="scoreOpera" data-selectAll=false><img class="iconCheck" src="../images/icon_unchecked.png" alt="checkbox">全选</span>
+                                <span class="recordScoreBtn">评分</span>
+                            </div>
+                        </td> -->
+                    <!-- </tr> -->
+                    <tr class="tabTitle">
+                      <th class="moduleName" style="width: 65px;">序号</th>
+                      <th class="beHospitalId textCenter">病人住院序号</th>
+                      <th class="beHospitalId textCenter">病案号</th>
+                      <th class="beHospitalId textCenter">病人姓名</th>
+                      <th class="beHospitalId textCenter">性别</th>
+                      <th class="beHospitalId textCenter">病例等级</th>
+                      <th class="beHospitalId textCenter">病例得分</th>
+                      <th class="beHospitalId textCenter">科室</th>
+                      <th class="beHospitalId textCenter">主诊断</th>
+                      <th class="beHospitalId textCenter">出院日期</th>
+                      <th class="beHospitalId textCenter">入院日期</th>
+                      <th class="beHospitalId textCenter">间隔天数</th>
+                    </tr>
+                    </thead>
+                    <tbody class="tbody">
+
+                    </tbody>
+                    <tfoot>
+                        <!-- <tr>
+                            <td colspan="17">
+                                <div class="tabFoot">
+                                    <span class="scoreOpera" data-selectAll=false><img class="iconCheck" src="../images/icon_unchecked.png" alt="checkbox">全选</span>
+                                    <span class="recordScoreBtn">评分</span>
+                                </div>
+                            </td>
+                        </tr> -->
+                    </tfoot>
+                </table>
+            </div>
+
+            <!--<div class="tabFoot">
+                <span class="scoreOpera" data-selectAll=false><img class="iconCheck" src="" alt="checkbox">全选</span>
+                <span class="recordScoreBtn">评分</span>
+            </div>-->
+
+            <div class="pagination"></div>
+        </div>
+
+    </div>
+</body>
+
+</html>

src/html/uccDetail.html

@@ -47,7 +47,7 @@
                     <span class="filterclear abnormalClear filterclearT">重置</span>
                     <span class="export">导出</span>
                 </div>
-                <a href="javascript:void(0);" class="filter-toggler up" id="filterToggler">收起筛选</a>
+                <a href="javascript:void(0);" class="filter-toggler" id="filterToggler">收起筛选</a>
                 <div class="toggle-item clearfix">
                     <span class="filterItem typeFilter">
                         <span>病人姓名：</span>
@@ -72,15 +72,44 @@
                         </span>
                         <!-- <input class="doctorInp" type="text" placeholder="请输入医生姓名"> -->
                     </span>
-                    <span class="filterItem">
-                        <span>核查状态：</span>
-                        <span class="selectCheck">全部</span>
-                        <ul class="checkList filterDropList">
-                            <Li class="checkItem" data-name="全部" data-id="全部">全部</Li>
-                            <Li class="checkItem" data-name="未核查" data-id="0">未核查</Li>
-                            <Li class="checkItem" data-name="已核查" data-id="1">已核查</Li>
+                    <span class="filterItem fpFilterItem">
+                        <span>病案首页核查状态：</span>
+                        <span class="fpSelectCheck">全部</span>
+                        <ul class="checkList filterDropList fpCheckList">
+                            <Li class="fpCheckItem" data-name="全部" data-id="">全部</Li>
+                            <Li class="fpCheckItem" data-name="未核查" data-id="0">未核查</Li>
+                            <Li class="fpCheckItem" data-name="已核查" data-id="1">已核查</Li>
                         </ul>
                     </span>
+                    <span class="filterItem doctorFilter fpFilterItem">
+                        <span>病案首页核查人：</span>
+                        <input class="fpCheckPeople" type="text" placeholder="请输入病案首页核查人">
+                    </span>
+                    <span class="filterItem qcFiliterItem">
+                        <span>病历核查状态：</span>
+                        <span class="qcSelectCheck">全部</span>
+                        <ul class="checkList filterDropList qcCheckList">
+                            <Li class="qcCheckItem" data-name="全部" data-id="">全部</Li>
+                            <Li class="qcCheckItem" data-name="未核查" data-id="0">未核查</Li>
+                            <Li class="qcCheckItem" data-name="已核查" data-id="1">已核查</Li>
+                        </ul>
+                    </span>
+                    <span class="filterItem doctorFilter qcFiliterItem">
+                        <span>病历核查人：</span>
+                        <input class="qcCheckPeople" type="text" placeholder="请输入病历核查人">
+                    </span>
+                    <span class="filterItem typeFilter clearfix" >
+                        <span class="fl">病案首页核查时间：</span>
+                        <span class="datapickerBox fl"><input type="text" placeholder="请选择时间" id="datepickerFp1" autocomplete="off" readonly /></span>
+                        <span  class="divide fl">-</span>
+                        <span class="datapickerBox fl"><input type="text" placeholder="请选择时间" id="datepickerFp2"  autocomplete="off" readonly/></span>
+                    </span>
+                    <span class="filterItem typeFilter clearfix qcFiliterItem" >
+                        <span class="fl">病历核查时间：</span>
+                        <span class="datapickerBox fl"><input type="text" placeholder="请选择时间" id="datepickerQc1" autocomplete="off" readonly /></span>
+                        <span  class="divide fl">-</span>
+                        <span class="datapickerBox fl"><input type="text" placeholder="请选择时间" id="datepickerQc2"  autocomplete="off" readonly/></span>
+                    </span>
                 </div>
             </div>
             <div class="overAuto">

src/js/api.js

@@ -97,6 +97,7 @@ const api = {
     leaveHosMRPage:'/console/leaveHosMRPage', //出院人数统计详情
     unModifyMRStatistics: '/console/unModifyMRStatistics',  //未整改病历统计
     unModifyMRPage: '/console/unModifyMRPage', //未整改病历质控评分页（内页）
+    reHos31DaysPage: '/console/reHos31DaysPage', //31天再入院人数（内页）
 
 
     //导出接口
@@ -113,6 +114,7 @@ const api = {
     getPage:'/qc/doctoradvice/getPage',//医嘱信息
     unModifyMRPageExport:'/console/export/unModifyMRPageExport',//未整改病历详情页导出
     unModifyMRStatisticsExport:'/console/export/unModifyMRStatisticsExport', //未整改病历统计导出
+    reHos31DaysPageExport:'/console/export/reHos31DaysPageExport', //31天再入院统计导出
 }
 module.exports = {
     api

src/js/console.js

@@ -559,7 +559,7 @@ function personNum(data){
     $(".newborn").html(data['新生儿人数']).parent(".chuyuannum").attr("data-num",'新生儿患者')
     $(".patientNum").html(data['手术病人数']).parent(".chuyuannum").attr("data-num",'手术病人数')
     $(".goAwayNum").html(data['非医嘱离院病人数']).parent(".chuyuannum").attr("data-num",'非医嘱离院病人数')
-    $(".againNum").html(data['31日再入院病人数']).parent(".chuyuannum").attr("data-num",'31日再入院病人数')
+    $(".againNum").html(data['31日再入院病人数']).parent(".li04again").attr("data-num",'31日再入院病人数')
     $(".chuyuannum").click(function(){
         let chuyuantype = $(this).attr("data-type")
         let chuyuannum = $(this).attr("data-num")
@@ -567,6 +567,14 @@ function personNum(data){
         $(parent.document).find("#contentIframe").attr("src","qcListOutHospital.html?from=1&shijian=3"+"&outNum="+chuyuannum+"&outNumType="+chuyuantype+"&startDateParam="+behosDateStart+"&endDateParam="+behosDateEnd)
     
     })
+    // 点击31日再入院病人数
+    $(".li04again").click(function(){
+        let chuyuantype = $(this).attr("data-type")
+        let chuyuannum = $(this).attr("data-num")
+        focusMenuItem("YH-ZKK-31TZRYRS");
+        $(parent.document).find("#contentIframe").attr("src","readmission.html?from=1&shijian=3"+"&outNum="+chuyuannum+"&outNumType="+chuyuantype+"&startDateParam="+behosDateStart+"&endDateParam="+behosDateEnd)
+    
+    })
 }
 //part02
 function setNumDetail(data){

src/js/partDetailControl.js

@@ -183,9 +183,12 @@ function renderTab(data,hisId,activePage){
     $('.tbody').html(str?str:emptyBox())
     bindScoreDetail(hisId)
     $(".goHomeDetail").click(function(){
+        let index =  $(this).parent().attr("data-index")
         let deptName = $(this).attr("data-dept")
         let ruleType = $(this).attr("data-ruleType")
-        $(parent.document).find("#contentIframe").attr("src","quexianDetailControlHome.html?deptName="+deptName+"&from=1&casesId=243"+"&shijian=3"+"&ruleType="+ruleType+"&startDateParam="+startDateParam+"&endDateParam="+endDateParam)
+        let deptId = data[index].deptId
+    
+        $(parent.document).find("#contentIframe").attr("src","quexianDetailControlHome.html?deptName="+deptName+"&deptId="+deptId+"&from=1&casesId=243"+"&shijian=3"+"&ruleType="+ruleType+"&startDateParam="+startDateParam+"&endDateParam="+endDateParam)
     })
 
     // initScroll("partDetailControl","YX",1)

src/js/qcList.js

@@ -30,10 +30,12 @@ let startDateParam = getUrlArgObjectNew("startDateParam",srcUrl)||""
 let endDateParam = getUrlArgObjectNew("endDateParam",srcUrl)||""
 $(".selectLevel").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
 $(".selectDept").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
-$(".selectCheck").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,
   nameTemp = "", behospitalCodeTemp="",levelTemp="", deptId="",deptIdTemp="", doctorName="", doctorNum="",doctorNameTemp="",doctorNumTemp="",
-  checkStatus="",checkStatusTemp="",data_desc=["leave_hospital_date"],data_asc=[];
+  fpCheckStatus="",fpCheckStatusTemp="",fpCheckName="",fpCheckNameTemp="",qcCheckName="",qcCheckNameTemp="",qcCheckStatus="",qcCheckStatusTemp="",fpCheckDateStart="",fpCheckDateEnd="",
+  qcCheckDateStart="",qcCheckDateEnd="",data_desc=["leave_hospital_date"],data_asc=[];
 if(chengdu){
     levelTemp = chengdu
     level = chengdu
@@ -102,7 +104,14 @@ function getTabData(activePage){
         leaveHosDateEnd: behosDateEnd, //出院日期--结束时间
         size: 15,
         statisticsType:statisticsType,
-        checkStatus: checkStatus?Number(checkStatus):checkStatus, //核查状态
+        checkStatus: qcCheckStatus?Number(qcCheckStatus):qcCheckStatus, //病历核查状态
+        mrStatus: fpCheckStatus?Number(fpCheckStatus):fpCheckStatus,   //首页核查状态（1：已核查，0：未核查）
+        chName: qcCheckName,   //病历核查人员
+        mrName: fpCheckName,  //首页核查人员
+        chTimeStart: qcCheckDateStart.replace(/\//g,'-'), //病历核查起始时间
+        chTimeEnd: qcCheckDateEnd.replace(/\//g,'-'), //病历核查截止时间
+        mrTimeStart: fpCheckDateStart.replace(/\//g,'-'), //首页核查起始时间
+        mrTimeEnd: fpCheckDateEnd.replace(/\//g,'-'), //首页核查截止时间
     }
     return post(api.qcList,param).then(res =>{
         if(res.data.code == '0'){
@@ -130,26 +139,58 @@ function getTabData(activePage){
 $(".filter").on("click", function(e){
     behosDateStart = $("#datepicker").val()
     behosDateEnd = $("#datepicker2").val()
-    const start = new Date(behosDateStart).getTime()
-    const end = new Date(behosDateEnd).getTime()
-    if(start > end){
-        $.alerModal({"message":'开始时间不能大于结束时间~',type:"tip",time:'1000',isFather: true, fatherWrapper: $("#mainBox", parent.document)});
+ 
+    
+    fpCheckDateStart = $("#datepickerFp1").val()
+    fpCheckDateEnd = $("#datepickerFp2").val()
+    qcCheckDateStart = $("#datepickerQc1").val()
+    qcCheckDateEnd = $("#datepickerQc2").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
     doctorNum = doctorNumTemp
-    checkStatus = checkStatusTemp
+    fpCheckStatus = fpCheckStatusTemp
+    qcCheckStatus = qcCheckStatusTemp
     getTabData(1)
 })
 $(".abnormalClear").on("click", function(e){
@@ -163,12 +204,18 @@ $(".abnormalClear").on("click", function(e){
     levelTemp="";  
     deptId=""; 
     deptIdTemp="";  
-    doctorName=""; 
+    doctorName="";
+    fpCheckName="";
+    qcCheckName="" ; 
     doctorNum=""; 
     doctorNameTemp=""; 
+    fpCheckNameTemp="";
+    qcCheckNameTemp="";
     doctorNumTemp=""; 
-    checkStatus="";
-    checkStatusTemp="";
+    fpCheckStatus="";
+    fpCheckStatusTemp="";
+    qcCheckStatus="";
+    qcCheckStatusTemp=""
     data_desc=["leave_hospital_date"];
     data_asc=[];
     $('.patientNumInp').val('')
@@ -176,9 +223,11 @@ $(".abnormalClear").on("click", function(e){
     $('.doctorInp').val('')
     $('.doctorNumInp').val('')
     $('.doctorInp').val('')
+    $('.fpCheckPeople').val('')
+    $('.qcCheckPeople').val('')
     // $('#datepicker').val('')
     // $('#datepicker2').val('')
-    //默认日期为近一个月
+    //默认日期为近一周
     $( "#datepicker" ).datepicker({
         changeMonth: true,
         changeYear: true,
@@ -189,6 +238,26 @@ $(".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({
+        changeMonth: true,
+        changeYear: true,
+        dateFormat:"yy/mm/dd",
+    }).datepicker( "setDate", "");
+    $( "#datepickerQc2" ).datepicker({
+        changeMonth: true,
+        changeYear: true,
+        dateFormat:"yy/mm/dd"
+    }).datepicker( "setDate","");
     $('.selectDept ').html('全部')
     $(".deptList").css("display", "none")
     $(".selectDept").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
@@ -197,9 +266,12 @@ $(".abnormalClear").on("click", function(e){
     $(".levelList").css("display", "none")
     $(".selectLevel").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
     // $('.selectLevel ').addClass('unSelect')
-    $('.selectCheck').html('全部')
-    $(".checkList").css("display", "none")
-    $(".selectCheck").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
+    $('.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")
     $(".leaveHospitalDate").addClass(" desc")
     behosDateStart = $("#datepicker").val()
@@ -210,7 +282,10 @@ $(".abnormalClear").on("click", function(e){
     if(behosDateEnd){
         behosDateEnd = behosDateEnd.replace(/\//g,'-') + ' 23:59:59'
     }
-   
+    fpCheckDateStart = ""
+    fpCheckDateEnd = ""
+    qcCheckDateStart = ""
+    qcCheckDateEnd = ""
     getTabData(1)
 })
 function renderTab(data,hisId){
@@ -232,7 +307,7 @@ function renderTab(data,hisId){
                 <td  class="recordScoreOperaBtn textCenter" style="opacity:${hasData('FUNC000017')?'1':'0.5'}">评分</td>`
         for(let j = 0; j < pageSet.length; j++){
             if(pageSet[j].status == 1){
-                if(pageSet[j].val === "checkStatus"){
+                if(pageSet[j].val === "checkStatus" || pageSet[j].val === "mrStatus" ){
                     str +=  `<td class="${isTextCenter(pageSet[j].val) ? 'textCenter':''}"><span data-index=${i} class="${pageSet[j].val=='name'?'patientNameSpan':'' } ">${item[pageSet[j].val] =="1"? "已核查" :item[pageSet[j].val] === 0 ? "未核查":"-"}<span></td>`
                 }else{
                     str +=  `<td class="${isTextCenter(pageSet[j].val) ? 'textCenter':''}"><span data-index=${i} class="${pageSet[j].val=='name'?'patientNameSpan':'' } ">${item[pageSet[j].val] || "-"}<span></td>`
@@ -307,6 +382,10 @@ $('.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")
@@ -318,20 +397,41 @@ $('.selectLevel').on("click", function(e){
 })
 
 
-//选择核查状态
-$('.selectCheck').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)
-    const showList =  $(".checkList ").css("display")
+    $(".qcSelectCheck .arrow").attr("src",iconDown)
+    $(".qcCheckList ").css("display", "none")
+    const showList =  $(".fpCheckList ").css("display")
     if(showList == "none" ||!showList){
-        $(".checkList ").css("display","block")
-        $(".selectCheck .arrow").attr("src",iconUp)
+        $(".fpCheckList ").css("display","block")
+        $(".fpSelectCheck .arrow").attr("src",iconUp)
     }else{
-        $(".checkList ").css("display", "none")
-        $(".selectCheck .arrow").attr("src",iconDown)
+        $(".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)
     }
 })
 
@@ -348,17 +448,31 @@ function bindLeveldSelect(){
         $('.selectLevel').removeClass('unSelect')
     })
 }
-bindCheckedSelect()
-//核查状态选择
-function bindCheckedSelect(){
-    $('.checkItem').on("click",function(){
-        const checkItemName = $(this).attr("data-name")
-        const checkItemItemId = $(this).attr("data-id")
-        checkStatusTemp =checkItemItemId
-        $('.selectCheck').html(checkItemName)
-        $(".checkList").css("display", "none")
-        $(".selectCheck").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
-        $('.selectCheck').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')
     })
 }
 
@@ -405,6 +519,10 @@ $('.selectDept').on("click", function(e){
     $(".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)
     const showList =  $(".deptList ").css("display")
     if(showList == "none" ||!showList){
         $(".deptList ").css("display","block")
@@ -774,6 +892,14 @@ $(".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
+})
 $(".doctorNumInp").on("input", function(e){
   const val = $(this).val().trim();
     doctorNumTemp = val
@@ -834,6 +960,26 @@ $(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({
+        changeMonth: true,
+        changeYear: true,
+        dateFormat:"yy/mm/dd"
+    }).datepicker( "setDate","");
+    $( "#datepickerQc2" ).datepicker({
+        changeMonth: true,
+        changeYear: true,
+        dateFormat:"yy/mm/dd"
+    }).datepicker( "setDate","");
     getPageSet().then(res =>{
         $(".filter").click();   //初始查询
     })
@@ -905,13 +1051,23 @@ $(document).on("click", function(){
     $(".levelList ").css("display", "none")
     $(".deptList").css("display", "none")
     $(".checkList").css("display", "none")
+    $(".fpCheckList").css("display", "none")
+    $(".qcCheckList").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)
 })
 $((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
+        }
         if((new Date(behosDateEnd) - new Date(behosDateStart))/24/60/60/1000 > 7){
             $.alerModal({"message":"最多只能导出7天",type:"tip",time:'1000',isFather: true, fatherWrapper: $("#mainBox", parent.document)});
             return
@@ -927,7 +1083,14 @@ $((function($){
             "leaveHosDateStart": behosDateStart,
             "level": level,
             "name": name,
-            "checkStatus": checkStatus?Number(checkStatus):checkStatus, //核查状态
+            "checkStatus": qcCheckStatus?Number(qcCheckStatus):qcCheckStatus, //病历核查状态
+            "mrStatus": fpCheckStatus?Number(fpCheckStatus):fpCheckStatus,   //首页核查状态（1：已核查，0：未核查）
+            "chName": qcCheckName,   //病历核查人员
+            "mrName": fpCheckName,  //首页核查人员
+            "chTimeStart": qcCheckDateStart.replace(/\//g,'-'), //病历核查起始时间
+            "chTimeEnd": qcCheckDateEnd.replace(/\//g,'-'), //病历核查截止时间
+            "mrTimeStart": fpCheckDateStart.replace(/\//g,'-'), //首页核查起始时间
+            "mrTimeEnd": fpCheckDateEnd.replace(/\//g,'-'), //首页核查截止时间
         }
         expJson(api.exportQcList,param).then(res =>{
             downloadExportedData(res.data, behosDateStart.slice(0,10).replace(/-/g,"")+"-"+behosDateEnd.slice(0,10).replace(/-/g,"")+"抽查住院病历质量情况.xls")

src/js/qcListCopy.js

@@ -30,17 +30,21 @@ let startDateParam = getUrlArgObjectNew("startDate",srcUrl)||""
 let endDateParam = getUrlArgObjectNew("endDate",srcUrl)||""
 let from = getUrlArgObjectNew("from",srcUrl)||""
 let defectName = getUrlArgObjectNew("defectName",srcUrl)||"";
-let casesId = getUrlArgObjectNew("casesEntryId",srcUrl)||"";
+let casesEntryId = getUrlArgObjectNew("casesEntryId",srcUrl)|| "";
+let casesId = getUrlArgObjectNew("casesId",srcUrl)|| "";
+let  ruleType = getUrlArgObjectNew("ruleType",srcUrl)||""
 let isSingleReject = getUrlArgObjectNew("isSingleReject",srcUrl)||""
 let deptListDept = JSON.parse(getCookie("deptList"))||[]
 let currentPage;
-
 $(".selectLevel").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
 $(".selectDept").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
-$(".selectCheck").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,
   nameTemp = "", behospitalCodeTemp="",levelTemp="", deptId="",deptIdTemp="", doctorName="", deptName="", deptNameTemp="",doctorNum="",doctorNameTemp="",doctorNumTemp="",
-  checkStatus="",checkStatusTemp="",data_desc=["leaveHospitalDate"],data_asc=[];
+  fpCheckStatus="",fpCheckStatusTemp="",fpCheckName="",fpCheckNameTemp="",qcCheckName="",qcCheckNameTemp="",qcCheckStatus="",qcCheckStatusTemp="",fpCheckDateStart="",fpCheckDateEnd="",
+  qcCheckDateStart="",qcCheckDateEnd="",
+  data_desc=["leaveHospitalDate"],data_asc=[];
 if(chengdu){
     levelTemp = chengdu
     level = chengdu
@@ -58,6 +62,9 @@ if(docName){
     $('.doctorInp').val(docName)
 }
 if(deptIdPram&&deptNamePram){
+    if(deptNamePram == "全院"){
+        deptNamePram = "全部"
+    }
     deptIdTemp = deptIdPram = deptIdPram
     deptName = deptNameTemp = deptNamePram
     if(deptNamePram.length > 10){
@@ -79,6 +86,12 @@ if(from==2){
     $('.selectDept').html(deptName)
 }else if(from==3){
   $(".partTitle .titlePic ").html(`<a href="keyItemFlawControl.html">关键条目缺陷占比 / </a>缺陷详情`)
+}else if(from==4){
+    $(".qcFiliterItem").css("display","none")
+    $(".partTitle .titlePic ").html(`<a class="consoleD" href="console.html">控制台 / </a><a class="consoleP" href="singleVeto.html?from=1">条目缺陷占比 / </a><a class="defectDetail" href="quexianDetailControlHome.html">缺陷详情 / </a>病历详情`)
+    $(".defectDetail").on("click",function(){
+        $(parent.document).find("#contentIframe").attr("src","quexianDetailControlHome.html?deptName="+deptNamePram+"&deptId="+deptIdPram+"&from=1&casesId=243"+"&shijian=3"+"&ruleType="+ruleType+"&startDateParam="+startDateParam+"&endDateParam="+endDateParam) 
+    })
 }else{
     $(".partTitle .titlePic ").html(`<a class="consoleD" href="console.html">控制台 / </a><a class="consoleP" href="singleVeto.html?from=1">条目缺陷占比 / </a>缺陷详情`)
 }
@@ -128,12 +141,20 @@ function getTabData(activePage){
         startDate: behosDateStart.replace(/\//g,'-'), //出院日期--开始时间
         endDate: behosDateEnd.replace(/\//g,'-'), //出院日期--结束时间
         casesEntryName: casesEntryName,
-        casesEntryId:casesId,
+        casesEntryId:casesEntryId,
         size: 15,
+        ruleType:ruleType,
         isReject: isSingleReject,
         doctorName: doctorName,
         doctorId: doctorNum,
-        checkStatus: checkStatus?Number(checkStatus):checkStatus, //核查状态
+        checkStatus: qcCheckStatus?Number(qcCheckStatus):qcCheckStatus, //病历核查状态
+        mrStatus: fpCheckStatus?Number(fpCheckStatus):fpCheckStatus,   //首页核查状态（1：已核查，0：未核查）
+        chName: qcCheckName,   //病历核查人员
+        mrName: fpCheckName,  //首页核查人员
+        chTimeStart: qcCheckDateStart.replace(/\//g,'-'), //病历核查起始时间
+        chTimeEnd: qcCheckDateEnd.replace(/\//g,'-'), //病历核查截止时间
+        mrTimeStart: fpCheckDateStart.replace(/\//g,'-'), //首页核查起始时间
+        mrTimeEnd: fpCheckDateEnd.replace(/\//g,'-'), //首页核查截止时间
     }
     return post(from==2?api.qcResultShortByDeptPage:api.qcResultDefectList,param).then(res =>{
         if(res.data.code == '0'){
@@ -162,10 +183,26 @@ function getTabData(activePage){
 $(".filter").on("click", function(e){
     behosDateStart = $("#datepicker").val()
     behosDateEnd = $("#datepicker2").val()
-    const start = new Date(behosDateStart).getTime()
-    const end = new Date(behosDateEnd).getTime()
-    if(start > end){
-        $.alerModal({"message":'开始时间不能大于结束时间~',type:"tip",time:'1000',isFather: true, fatherWrapper: $("#mainBox", parent.document)});
+    fpCheckDateStart = $("#datepickerFp1").val()
+    fpCheckDateEnd = $("#datepickerFp2").val()
+    qcCheckDateStart = $("#datepickerQc1").val()
+    qcCheckDateEnd = $("#datepickerQc2").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)});
         return
     }
     if(behosDateStart){
@@ -174,6 +211,18 @@ $(".filter").on("click", function(e){
     if(behosDateEnd){
         behosDateEnd = behosDateEnd + ' 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
@@ -181,8 +230,11 @@ $(".filter").on("click", function(e){
     deptId = deptIdTemp
     deptName = deptNameTemp
     doctorName = doctorNameTemp
+    fpCheckName = fpCheckNameTemp
+    qcCheckName = qcCheckNameTemp
     doctorNum = doctorNumTemp
-    checkStatus = checkStatusTemp
+    fpCheckStatus = fpCheckStatusTemp
+    qcCheckStatus = qcCheckStatusTemp
     getTabData(1)
 })
 $(".abnormalClear").on("click", function(e){
@@ -198,12 +250,18 @@ $(".abnormalClear").on("click", function(e){
     deptName=""; 
     deptNameTemp=""; 
     deptIdTemp="";  
-    doctorName=""; 
+    doctorName="";
+    fpCheckName="";
+    qcCheckName="" ;
     doctorNum=""; 
     doctorNameTemp=""; 
+    fpCheckNameTemp="";
+    qcCheckNameTemp="";
     doctorNumTemp=""; 
-    checkStatus="";
-    checkStatusTemp="";
+    fpCheckStatus="";
+    fpCheckStatusTemp="";
+    qcCheckStatus="";
+    qcCheckStatusTemp=""
     data_desc=["leaveHospitalDate"]
     data_asc=[];
     if(from == 2){
@@ -212,11 +270,17 @@ $(".abnormalClear").on("click", function(e){
         deptNameTemp=deptListDept[0]&&deptListDept[0].deptName;
         deptIdTemp=deptListDept[0]&&deptListDept[0].deptId;
     }
+    if(from == 4){
+        deptIdTemp = deptIdPram = deptIdPram
+        deptName = deptNameTemp = deptNamePram
+    }
     $('.patientNumInp').val('')
     $('.patientNameInp').val('')
     $('.doctorInp').val('')
     $('.doctorNumInp').val('')
     $('.doctorInp').val('')
+    $('.fpCheckPeople').val('')
+    $('.qcCheckPeople').val('')
     // $('#datepicker').val('')
     // $('#datepicker2').val('')
     //默认日期为近一个月
@@ -232,9 +296,37 @@ $(".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({
+        changeMonth: true,
+        changeYear: true,
+        dateFormat:"yy/mm/dd",
+    }).datepicker( "setDate", "");
+    $( "#datepickerQc2" ).datepicker({
+        changeMonth: true,
+        changeYear: true,
+        dateFormat:"yy/mm/dd"
+    }).datepicker( "setDate","");
     if(from == 2){
-        console.log('deptListDept',deptListDept)
         $('.selectDept ').html(deptListDept[0].deptName)
+    }else if(from == 4){
+        if(deptNamePram.length > 10){
+            $('.selectDept').html(deptNamePram.substring(0,8)+'...')
+        }else{
+            $('.selectDept').html(deptNamePram)
+        }
+        $('.selectDept ').attr('title',deptNamePram)
+        $(".deptList").css("display", "none")
+        $(".selectDept").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
     }else{
         $('.selectDept ').html('全部')
     }
@@ -245,9 +337,12 @@ $(".abnormalClear").on("click", function(e){
     $(".levelList").css("display", "none")
     $(".selectLevel").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
     // $('.selectLevel ').addClass('unSelect')
-    $('.selectCheck').html('全部')
-    $(".checkList").css("display", "none")
-    $(".selectCheck").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
+    $('.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")
     $(".leaveHospitalDate").addClass(" desc")
     behosDateStart = $("#datepicker").val()
@@ -258,7 +353,10 @@ $(".abnormalClear").on("click", function(e){
     if(behosDateEnd){
         behosDateEnd = behosDateEnd + ' 23:59:59'
     }
-   
+    fpCheckDateStart = ""
+    fpCheckDateEnd = ""
+    qcCheckDateStart = ""
+    qcCheckDateEnd = ""
     getTabData(1)
 })
 function renderTab(data,hisId){
@@ -279,7 +377,7 @@ function renderTab(data,hisId){
                 <td  class="textCenter">${(currentPage-1)*15 + i+1}</td>`
         for(let j = 0; j < pageSet.length; j++){
             if(pageSet[j].status == 1){
-                if(pageSet[j].val === "checkStatus"){
+                if(pageSet[j].val === "checkStatus" || pageSet[j].val === "mrStatus"  ){
                     str +=  `<td class="${isTextCenter(pageSet[j].val) ? 'textCenter':''}"><span data-index=${i} class="${pageSet[j].val=='name'?'patientNameSpan':'' } ">${item[pageSet[j].val] =="1"? "已核查" :item[pageSet[j].val] === 0 ? "未核查":"-"}<span></td>`
                 }else{
                     str +=  `<td class="${isTextCenter(pageSet[j].val) ? 'textCenter':''}"><span data-index=${i} class="${pageSet[j].val=='name'?'patientNameSpan':'' } ">${item[pageSet[j].val] || "-"}<span></td>`
@@ -336,7 +434,6 @@ function bindScoreDetail(hisId){
         const id = tabList[index].behospitalCode
         const age = tabList[index].age;
         const noScore = tabList[index].level == '未评分'
-        const checkStatus = tabList[index].checkStatus
         if(noScore){
             $.alerModal({"message":'请先进行评分！',type:"tip",time:'1000',isFather: true, fatherWrapper: $("#mainBox", parent.document)});
             return
@@ -352,8 +449,10 @@ $('.selectLevel').on("click", function(e){
     e.stopPropagation()
     $(".deptList ").css("display", "none")
     $(".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")
@@ -364,20 +463,40 @@ $('.selectLevel').on("click", function(e){
     }
 })
 
-//选择核查状态
-$('.selectCheck').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)
-    const showList =  $(".checkList ").css("display")
+    $(".qcSelectCheck .arrow").attr("src",iconDown)
+    $(".qcCheckList ").css("display", "none")
+    const showList =  $(".fpCheckList ").css("display")
     if(showList == "none" ||!showList){
-        $(".checkList ").css("display","block")
-        $(".selectCheck .arrow").attr("src",iconUp)
+        $(".fpCheckList ").css("display","block")
+        $(".fpSelectCheck .arrow").attr("src",iconUp)
     }else{
-        $(".checkList ").css("display", "none")
-        $(".selectCheck .arrow").attr("src",iconDown)
+        $(".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)
     }
 })
 
@@ -396,17 +515,31 @@ function bindLeveldSelect(){
     })
 }
 
-bindCheckedSelect()
-//核查状态选择
-function bindCheckedSelect(){
-    $('.checkItem').on("click",function(){
-        const checkItemName = $(this).attr("data-name")
-        const checkItemItemId = $(this).attr("data-id")
-        checkStatusTemp =checkItemItemId
-        $('.selectCheck').html(checkItemName)
-        $(".checkList").css("display", "none")
-        $(".selectCheck").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
-        $('.selectCheck').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')
     })
 }
 
@@ -451,8 +584,10 @@ $('.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)
     const showList =  $(".deptList ").css("display")
     if(showList == "none" ||!showList){
         $(".deptList ").css("display","block")
@@ -826,6 +961,14 @@ $(".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
+})
 $(".doctorNumInp").on("input", function(e){
   const val = $(this).val().trim();
     doctorNumTemp = val
@@ -886,6 +1029,26 @@ $(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({
+        changeMonth: true,
+        changeYear: true,
+        dateFormat:"yy/mm/dd"
+    }).datepicker( "setDate","");
+    $( "#datepickerQc2" ).datepicker({
+        changeMonth: true,
+        changeYear: true,
+        dateFormat:"yy/mm/dd"
+    }).datepicker( "setDate","");
     getPageSet().then(res =>{
         $(".filter").click();   //初始查询
     })
@@ -956,20 +1119,22 @@ function renderPagination(totalPage,activePage,totalNum){
 $(document).on("click", function(){
     $(".levelList ").css("display", "none")
     $(".deptList").css("display", "none")
-    $(".checkList").css("display", "none")
+    $(".fpCheckList").css("display", "none")
+    $(".qcCheckList").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)
 })
 $(function($){
     $('.export').click(function(){
-        const start = new Date(behosDateStart).getTime()
-        const end = new Date(behosDateEnd).getTime()
-        if(start > end){
+        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((end - start)/24/60/60/1000 > 7){
+        if((behosDateEndTime - behosDateStartTime)/24/60/60/1000 > 7){
             $.alerModal({"message":"最多只能导出7天",type:"tip",time:'1000',isFather: true, fatherWrapper: $("#mainBox", parent.document)});
             return
         }
@@ -980,14 +1145,22 @@ $(function($){
             behDeptName: deptName,
             ascs:data_asc,     //升序
             descs:data_desc,       //降序
+            ruleType:ruleType,
             startDate: behosDateStart.replace(/\//g,'-'), //出院日期--开始时间
             endDate: behosDateEnd.replace(/\//g,'-'), //出院日期--结束时间
             casesEntryName: casesEntryName,
-            casesEntryId:casesId,
+            casesEntryId:casesEntryId,
             isReject: isSingleReject,
             doctorName: doctorName,
             doctorId: doctorNum,
-            checkStatus: checkStatus?Number(checkStatus):checkStatus, //核查状态
+            checkStatus: qcCheckStatus?Number(qcCheckStatus):qcCheckStatus, //病历核查状态
+            mrStatus: fpCheckStatus?Number(fpCheckStatus):fpCheckStatus,   //首页核查状态（1：已核查，0：未核查）
+            chName: qcCheckName,   //病历核查人员
+            mrName: fpCheckName,  //首页核查人员
+            chTimeStart: qcCheckDateStart.replace(/\//g,'-'), //病历核查起始时间
+            chTimeEnd: qcCheckDateEnd.replace(/\//g,'-'), //病历核查截止时间
+            mrTimeStart: fpCheckDateStart.replace(/\//g,'-'), //首页核查起始时间
+            mrTimeEnd: fpCheckDateEnd.replace(/\//g,'-'), //首页核查截止时间
         }
         expJson(api.qcResultShortPageExport,param).then(res =>{
             downloadExportedData(res.data, $(".partTitle").text()+".xls")

src/js/qcListDept.js

@@ -22,7 +22,8 @@ const goDownB = require("./../images/arrow_down_blue.png")
 let pageSet = [],pageSetCopy = [], showNum = 0, scrollTop=0;
 $(".selectLevel").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
 $(".selectDept").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
-$(".selectCheck").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
+$(".fpSelectCheck").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
+$(".qcSelectCheck").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
 let srcUrl = $("#contentIframe",parent.document).attr("src")
 let statisticsType = getUrlArgObjectNew("dateType",srcUrl)||getUrlArgObjectNew("shijian",srcUrl) || ""
 let chengdu = getUrlArgObjectNew("chengdu",srcUrl)||""
@@ -33,7 +34,8 @@ let startDateParam = getUrlArgObjectNew("startDateParam",srcUrl)||""
 let endDateParam = getUrlArgObjectNew("endDateParam",srcUrl)||""
 let tabList = [], name = "", behospitalCode="", behosDateStart="", level="",behosDateEnd="", scoreSum = 0,nameTemp = "",
   behospitalCodeTemp="",levelTemp="", deptId="",deptIdTemp="", doctorName="", doctorNameTemp="", doctorNum="", doctorNumTemp="",
-  checkStatus="",checkStatusTemp="",data_desc=["leave_hospital_date"],data_asc=[];
+  fpCheckStatus="",fpCheckStatusTemp="",fpCheckName="",fpCheckNameTemp="",qcCheckName="",qcCheckNameTemp="",qcCheckStatus="",qcCheckStatusTemp="",fpCheckDateStart="",fpCheckDateEnd="",
+  qcCheckDateStart="",qcCheckDateEnd="",data_desc=["leave_hospital_date"],data_asc=[];
 
 $("#filterToggler").click(function(){
   const text = $(this).text();
@@ -105,7 +107,14 @@ function getTabData(activePage){
         leaveHosDateEnd: behosDateEnd, //0-未启用 1-启用
         size: 15,
         statisticsType:statisticsType,
-        checkStatus: checkStatus?Number(checkStatus):checkStatus, //核查状态
+        checkStatus: qcCheckStatus?Number(qcCheckStatus):qcCheckStatus, //病历核查状态
+        mrStatus: fpCheckStatus?Number(fpCheckStatus):fpCheckStatus,   //首页核查状态（1：已核查，0：未核查）
+        chName: qcCheckName,   //病历核查人员
+        mrName: fpCheckName,  //首页核查人员
+        chTimeStart: qcCheckDateStart.replace(/\//g,'-'), //病历核查起始时间
+        chTimeEnd: qcCheckDateEnd.replace(/\//g,'-'), //病历核查截止时间
+        mrTimeStart: fpCheckDateStart.replace(/\//g,'-'), //首页核查起始时间
+        mrTimeEnd: fpCheckDateEnd.replace(/\//g,'-'), //首页核查截止时间
     }
     return post(api.qcListByDept,param).then(res =>{
         if(res.data.code == '0'){
@@ -132,10 +141,26 @@ function getTabData(activePage){
 $(".filter").on("click", function(e){
     behosDateStart = $("#datepicker").val()
     behosDateEnd = $("#datepicker2").val()
-    const start = new Date(behosDateStart).getTime()
-    const end = new Date(behosDateEnd).getTime()
-    if(start > end){
-        $.alerModal({"message":'开始时间不能大于结束时间~',type:"tip",time:'1000',isFather: true, fatherWrapper: $("#mainBox", parent.document)});
+    fpCheckDateStart = $("#datepickerFp1").val()
+    fpCheckDateEnd = $("#datepickerFp2").val()
+    qcCheckDateStart = $("#datepickerQc1").val()
+    qcCheckDateEnd = $("#datepickerQc2").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)});
         return
     }
     if(behosDateStart){
@@ -144,13 +169,28 @@ $(".filter").on("click", function(e){
     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
     doctorNum = doctorNumTemp
-    checkStatus = checkStatusTemp
+    fpCheckStatus = fpCheckStatusTemp
+    qcCheckStatus = qcCheckStatusTemp
     getTabData(1)
 })
 
@@ -165,12 +205,18 @@ $(".abnormalClear").on("click", function(e){
     levelTemp="";  
     deptId=""; 
     deptIdTemp="";  
-    doctorName=""; 
+    doctorName="";
+    fpCheckName="";
+    qcCheckName="" ;  
     doctorNum=""; 
     doctorNameTemp=""; 
-    doctorNumTemp=""; 
-    checkStatus="";
-    checkStatusTemp="";
+    doctorNumTemp="";
+    fpCheckNameTemp="";
+    qcCheckNameTemp=""; 
+    fpCheckStatus="";
+    fpCheckStatusTemp="";
+    qcCheckStatus="";
+    qcCheckStatusTemp=""
     data_desc=["leave_hospital_date"]
     data_asc=[];
     $('.patientNumInp').val('')
@@ -178,9 +224,11 @@ $(".abnormalClear").on("click", function(e){
     $('.doctorInp').val('')
     $('.doctorNumInp').val('')
     $('.doctorInp').val('')
+    $('.fpCheckPeople').val('')
+    $('.qcCheckPeople').val('')
    // $('#datepicker').val('')
     // $('#datepicker2').val('')
-    //默认日期为近一个月
+    //默认日期为近一周
     $( "#datepicker" ).datepicker({
         changeMonth: true,
         changeYear: true,
@@ -191,6 +239,26 @@ $(".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({
+        changeMonth: true,
+        changeYear: true,
+        dateFormat:"yy/mm/dd",
+    }).datepicker( "setDate", "");
+    $( "#datepickerQc2" ).datepicker({
+        changeMonth: true,
+        changeYear: true,
+        dateFormat:"yy/mm/dd"
+    }).datepicker( "setDate","");
     $('.selectDept ').html('全部')
     $(".deptList").css("display", "none")
     $(".selectDept").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
@@ -199,9 +267,12 @@ $(".abnormalClear").on("click", function(e){
     $(".levelList").css("display", "none")
     $(".selectLevel").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
     // $('.selectLevel ').addClass('unSelect')
-    $('.selectCheck').html('全部')
-    $(".checkList").css("display", "none")
-    $(".selectCheck").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
+    $('.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")
     $(".leaveHospitalDate").addClass(" desc")
     behosDateStart = $("#datepicker").val()
@@ -212,6 +283,10 @@ $(".abnormalClear").on("click", function(e){
     if(behosDateEnd){
         behosDateEnd = behosDateEnd.replace(/\//g,'-') + ' 23:59:59'
     }
+    fpCheckDateStart = ""
+    fpCheckDateEnd = ""
+    qcCheckDateStart = ""
+    qcCheckDateEnd = ""
     getTabData(1)
 })
 function bindOrder(){
@@ -251,7 +326,7 @@ function renderTab(data){
                 <td  class="recordScoreOperaBtn textCenter" style="opacity:${hasData('FUNC000017')?'1':'0.5'}">评分</td>`
         for(let j = 0; j < pageSet.length; j++){
             if(pageSet[j].status == 1){
-                if(pageSet[j].val === "checkStatus"){
+                if(pageSet[j].val === "checkStatus" || pageSet[j].val === "mrStatus" ){
                     str +=  `<td class="${isTextCenter(pageSet[j].val) ? 'textCenter':''}"><span data-index=${i} class="${pageSet[j].val=='name'?'patientNameSpan':'' } ">${item[pageSet[j].val] =="1"? "已核查" :item[pageSet[j].val] === 0 ? "未核查":"-"}<span></td>`
                 }else{
                     str +=  `<td class="${isTextCenter(pageSet[j].val) ? 'textCenter':''}"><span data-index=${i} class="${pageSet[j].val=='name'?'patientNameSpan':'' } ">${item[pageSet[j].val] || "-"}<span></td>`
@@ -326,6 +401,10 @@ $('.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")
@@ -337,20 +416,41 @@ $('.selectLevel').on("click", function(e){
 })
 
 
-//选择核查状态
-$('.selectCheck').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)
-    const showList =  $(".checkList ").css("display")
+    $(".qcSelectCheck .arrow").attr("src",iconDown)
+    $(".qcCheckList ").css("display", "none")
+    const showList =  $(".fpCheckList ").css("display")
     if(showList == "none" ||!showList){
-        $(".checkList ").css("display","block")
-        $(".selectCheck .arrow").attr("src",iconUp)
+        $(".fpCheckList ").css("display","block")
+        $(".fpSelectCheck .arrow").attr("src",iconUp)
     }else{
-        $(".checkList ").css("display", "none")
-        $(".selectCheck .arrow").attr("src",iconDown)
+        $(".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)
     }
 })
 
@@ -368,17 +468,31 @@ function bindLeveldSelect(){
     })
 }
 
-bindCheckedSelect()
-//核查状态选择
-function bindCheckedSelect(){
-    $('.checkItem').on("click",function(){
-        const checkItemName = $(this).attr("data-name")
-        const checkItemItemId = $(this).attr("data-id")
-        checkStatusTemp =checkItemItemId
-        $('.selectCheck').html(checkItemName)
-        $(".checkList").css("display", "none")
-        $(".selectCheck").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
-        $('.selectCheck').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')
     })
 }
 
@@ -426,6 +540,10 @@ $('.selectDept').on("click", function(e){
     $(".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)
     const showList =  $(".deptList ").css("display")
     if(showList == "none" ||!showList){
         $(".deptList ").css("display","block")
@@ -771,6 +889,14 @@ $(".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
+})
 $(".doctorNumInp").on("input", function(e){
   const val = $(this).val().trim();
   doctorNumTemp = val
@@ -832,6 +958,26 @@ $(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({
+        changeMonth: true,
+        changeYear: true,
+        dateFormat:"yy/mm/dd"
+    }).datepicker( "setDate","");
+    $( "#datepickerQc2" ).datepicker({
+        changeMonth: true,
+        changeYear: true,
+        dateFormat:"yy/mm/dd"
+    }).datepicker( "setDate","");
     getPageSet().then(res =>{
         $(".filter").click();   //初始查询
     })
@@ -902,14 +1048,23 @@ $(document).on("click", function(){
     $(".levelList ").css("display", "none")
     $(".deptList").css("display", "none")
     $(".checkList").css("display", "none")
+    $(".fpCheckList").css("display", "none")
+    $(".qcCheckList").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)
 })
 
 $((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
+        }
         if((new Date(behosDateEnd) - new Date(behosDateStart))/24/60/60/1000 > 7){
             $.alerModal({"message":"最多只能导出7天",type:"tip",time:'1000',isFather: true, fatherWrapper: $("#mainBox", parent.document)});
             return
@@ -925,7 +1080,14 @@ $((function($){
             "leaveHosDateStart": behosDateStart,
             "level": level,
             "name": name,
-            "checkStatus": checkStatus?Number(checkStatus):checkStatus, //核查状态
+            "checkStatus": qcCheckStatus?Number(qcCheckStatus):qcCheckStatus, //病历核查状态
+            "mrStatus": fpCheckStatus?Number(fpCheckStatus):fpCheckStatus,   //首页核查状态（1：已核查，0：未核查）
+            "chName": qcCheckName,   //病历核查人员
+            "mrName": fpCheckName,  //首页核查人员
+            "chTimeStart": qcCheckDateStart.replace(/\//g,'-'), //病历核查起始时间
+            "chTimeEnd": qcCheckDateEnd.replace(/\//g,'-'), //病历核查截止时间
+            "mrTimeStart": fpCheckDateStart.replace(/\//g,'-'), //首页核查起始时间
+            "mrTimeEnd": fpCheckDateEnd.replace(/\//g,'-'), //首页核查截止时间
         }
         expJson(api.exportQcListDept,param).then(res =>{
             downloadExportedData(res.data, behosDateStart.slice(0,10).replace(/-/g,"")+"-"+behosDateEnd.slice(0,10).replace(/-/g,"")+"抽查住院病历质量情况.xls")

src/js/qcListDocteam.js

@@ -21,7 +21,8 @@ const goDownB = require("./../images/arrow_down_blue.png")
 
 let pageSet = [],pageSetCopy = [], showNum = 0, scrollTop=0;
 $(".selectLevel").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
-$(".selectCheck").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
+$(".fpSelectCheck").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
+$(".qcSelectCheck").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
 let srcUrl = $("#contentIframe",parent.document).attr("src")
 let statisticsType = getUrlArgObjectNew("dateType",srcUrl)||getUrlArgObjectNew("shijian",srcUrl) || ""
 let chengdu = getUrlArgObjectNew("chengdu",srcUrl)||""
@@ -30,7 +31,8 @@ let deptNamePram = getUrlArgObjectNew("deptName",srcUrl)||""
 let docName = getUrlArgObjectNew("docName",srcUrl)||""
 let tabList = [], name = "", behospitalCode="", behosDateStart="", level="",behosDateEnd="", scoreSum = 0,nameTemp = "",
   behospitalCodeTemp="",levelTemp="", deptId="",deptIdTemp="", doctorName="", doctorNameTemp="", doctorNum="", doctorNumTemp="",
-  checkStatus="",checkStatusTemp="",data_desc=["leave_hospital_date"],data_asc=[];
+  fpCheckStatus="",fpCheckStatusTemp="",fpCheckName="",fpCheckNameTemp="",qcCheckName="",qcCheckNameTemp="",qcCheckStatus="",qcCheckStatusTemp="",fpCheckDateStart="",fpCheckDateEnd="",
+  qcCheckDateStart="",qcCheckDateEnd="",data_desc=["leave_hospital_date"],data_asc=[];
 
 $("#filterToggler").click(function(){
   const text = $(this).text();
@@ -38,7 +40,6 @@ $("#filterToggler").click(function(){
   $(this).text(text==="收起筛选"?"展开筛选":"收起筛选").toggleClass("up");
 });
 
-console.log('docName',docName)
 if(chengdu){
     levelTemp = chengdu
     level = chengdu
@@ -89,7 +90,14 @@ function getTabData(activePage){
         leaveHosDateEnd: behosDateEnd, //0-未启用 1-启用
         size: 15,
         statisticsType:statisticsType,
-        checkStatus: checkStatus?Number(checkStatus):checkStatus, //核查状态
+        checkStatus: qcCheckStatus?Number(qcCheckStatus):qcCheckStatus, //病历核查状态
+        mrStatus: fpCheckStatus?Number(fpCheckStatus):fpCheckStatus,   //首页核查状态（1：已核查，0：未核查）
+        chName: qcCheckName,   //病历核查人员
+        mrName: fpCheckName,  //首页核查人员
+        chTimeStart: qcCheckDateStart.replace(/\//g,'-'), //病历核查起始时间
+        chTimeEnd: qcCheckDateEnd.replace(/\//g,'-'), //病历核查截止时间
+        mrTimeStart: fpCheckDateStart.replace(/\//g,'-'), //首页核查起始时间
+        mrTimeEnd: fpCheckDateEnd.replace(/\//g,'-'), //首页核查截止时间
     }
     return post(api.qcListByDoc,param).then(res =>{
         if(res.data.code == '0'){
@@ -116,25 +124,60 @@ function getTabData(activePage){
 $(".filter").on("click", function(e){
     behosDateStart = $("#datepicker").val()
     behosDateEnd = $("#datepicker2").val()
-    const start = new Date(behosDateStart).getTime()
-    const end = new Date(behosDateEnd).getTime()
-    if(start > end){
-        $.alerModal({"message":'开始时间不能大于结束时间~',type:"tip",time:'1000',isFather: true, fatherWrapper: $("#mainBox", parent.document)});
+    fpCheckDateStart = $("#datepickerFp1").val()
+    fpCheckDateEnd = $("#datepickerFp2").val()
+    qcCheckDateStart = $("#datepickerQc1").val()
+    qcCheckDateEnd = $("#datepickerQc2").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)});
+        return
+    }
+
     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
     doctorNum = doctorNumTemp
-    checkStatus = checkStatusTemp
+    fpCheckStatus = fpCheckStatusTemp
+    qcCheckStatus = qcCheckStatusTemp
     getTabData(1)
 })
 
@@ -150,11 +193,17 @@ $(".abnormalClear").on("click", function(e){
     deptId="";
     deptIdTemp="";
     doctorName="";
+    fpCheckName="";
+    qcCheckName="" ;  
     doctorNum="";
     doctorNameTemp="";
     doctorNumTemp="";
-    checkStatus="";
-    checkStatusTemp="";
+    fpCheckNameTemp="";
+    qcCheckNameTemp=""; 
+    fpCheckStatus="";
+    fpCheckStatusTemp="";
+    qcCheckStatus="";
+    qcCheckStatusTemp=""
     data_desc=["leave_hospital_date"]
     data_asc=[];
     $('.patientNumInp').val('')
@@ -162,9 +211,11 @@ $(".abnormalClear").on("click", function(e){
     $('.doctorInp').val('')
     $('.doctorNumInp').val('')
     $('.doctorInp').val('')
+    $('.fpCheckPeople').val('')
+    $('.qcCheckPeople').val('')
    // $('#datepicker').val('')
     // $('#datepicker2').val('')
-    //默认日期为近一个月
+    //默认日期为近一周
     $( "#datepicker" ).datepicker({
         changeMonth: true,
         changeYear: true,
@@ -175,13 +226,36 @@ $(".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({
+        changeMonth: true,
+        changeYear: true,
+        dateFormat:"yy/mm/dd",
+    }).datepicker( "setDate", "");
+    $( "#datepickerQc2" ).datepicker({
+        changeMonth: true,
+        changeYear: true,
+        dateFormat:"yy/mm/dd"
+    }).datepicker( "setDate","");
     $('.selectLevel').html('全部')
     $(".levelList").css("display", "none")
     $(".selectLevel").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
     // $('.selectLevel ').addClass('unSelect')
-    $('.selectCheck').html('全部')
-    $(".checkList").css("display", "none")
-    $(".selectCheck").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
+    $('.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")
     $(".leaveHospitalDate").addClass(" desc")
     behosDateStart = $("#datepicker").val()
@@ -192,6 +266,10 @@ $(".abnormalClear").on("click", function(e){
     if(behosDateEnd){
         behosDateEnd = behosDateEnd.replace(/\//g,'-') + ' 23:59:59'
     }
+    fpCheckDateStart = ""
+    fpCheckDateEnd = ""
+    qcCheckDateStart = ""
+    qcCheckDateEnd = ""
     getTabData(1)
 })
 function bindOrder(){
@@ -231,7 +309,7 @@ function renderTab(data){
                 <td  class="recordScoreOperaBtn textCenter" style="opacity:${hasData('FUNC000017')?'1':'0.5'}">评分</td>`
         for(let j = 0; j < pageSet.length; j++){
             if(pageSet[j].status == 1){
-                if(pageSet[j].val === "checkStatus"){
+                if(pageSet[j].val === "checkStatus" || pageSet[j].val === "mrStatus" ){
                     str +=  `<td class="${isTextCenter(pageSet[j].val) ? 'textCenter':''}"><span data-index=${i} class="${pageSet[j].val=='name'?'patientNameSpan':'' } ">${item[pageSet[j].val] =="1"? "已核查" :item[pageSet[j].val] === 0 ? "未核查":"-"}<span></td>`
                 }else{
                     str +=  `<td class="${isTextCenter(pageSet[j].val) ? 'textCenter':''}"><span data-index=${i} class="${pageSet[j].val=='name'?'patientNameSpan':'' } ">${item[pageSet[j].val] || "-"}<span></td>`
@@ -304,6 +382,10 @@ $('.selectLevel').on("click", function(e){
     e.stopPropagation()
     $(".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")
@@ -314,23 +396,43 @@ $('.selectLevel').on("click", function(e){
     }
 })
 
-//选择核查状态
-$('.selectCheck').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)
-    const showList =  $(".checkList ").css("display")
+    $(".qcSelectCheck .arrow").attr("src",iconDown)
+    $(".qcCheckList ").css("display", "none")
+    const showList =  $(".fpCheckList ").css("display")
     if(showList == "none" ||!showList){
-        $(".checkList ").css("display","block")
-        $(".selectCheck .arrow").attr("src",iconUp)
+        $(".fpCheckList ").css("display","block")
+        $(".fpSelectCheck .arrow").attr("src",iconUp)
     }else{
-        $(".checkList ").css("display", "none")
-        $(".selectCheck .arrow").attr("src",iconDown)
+        $(".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)
+    }
+})
 
 
 
@@ -348,17 +450,31 @@ function bindLeveldSelect(){
     })
 }
 
-bindCheckedSelect()
-//核查状态选择
-function bindCheckedSelect(){
-    $('.checkItem').on("click",function(){
-        const checkItemName = $(this).attr("data-name")
-        const checkItemItemId = $(this).attr("data-id")
-        checkStatusTemp =checkItemItemId
-        $('.selectCheck').html(checkItemName)
-        $(".checkList").css("display", "none")
-        $(".selectCheck").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
-        $('.selectCheck').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')
     })
 }
 
@@ -672,7 +788,6 @@ function bindColOrder(){
         }else{
             const downItem =  pageSetCopy[index]
             const downItemBack =  pageSetCopy[index + 1]
-            console.log('downItem',downItem,'downItemBack',downItemBack)
             pageSetCopy.splice(index,2,downItemBack,downItem)
             scrollTop = $(".colTabInfoBox", parent.document).scrollTop()
             renderColSet(pageSetCopy)
@@ -696,6 +811,14 @@ $(".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
+})
 $(".doctorNumInp").on("input", function(e){
   const val = $(this).val().trim();
   doctorNumTemp = val
@@ -754,6 +877,26 @@ $(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({
+        changeMonth: true,
+        changeYear: true,
+        dateFormat:"yy/mm/dd"
+    }).datepicker( "setDate","");
+    $( "#datepickerQc2" ).datepicker({
+        changeMonth: true,
+        changeYear: true,
+        dateFormat:"yy/mm/dd"
+    }).datepicker( "setDate","");
     getPageSet().then(res =>{
         $(".filter").click();   //初始查询
     })
@@ -823,10 +966,20 @@ function renderPagination(totalPage,activePage,totalNum){
 $(document).on("click", function(){
     $(".levelList ").css("display", "none")
     $(".selectLevel .arrow").attr("src",iconDown)
+    $(".fpCheckList").css("display", "none")
+    $(".qcCheckList").css("display", "none")
+    $(".fpSelectCheck .arrow").attr("src",iconDown)
+    $(".qcSelectCheck .arrow").attr("src",iconDown)
 
 })
 $((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
+    }
     if((new Date(behosDateEnd) - new Date(behosDateStart))/24/60/60/1000 > 7){
       $.alerModal({"message":"最多只能导出7天",type:"tip",time:'1000',isFather: true, fatherWrapper: $("#mainBox", parent.document)});
       return
@@ -842,7 +995,14 @@ $((function($){
       "leaveHosDateStart": behosDateStart,
       "level": level,
       "name": name,
-      "checkStatus": checkStatus?Number(checkStatus):checkStatus, //核查状态
+      "checkStatus": qcCheckStatus?Number(qcCheckStatus):qcCheckStatus, //病历核查状态
+      "mrStatus": fpCheckStatus?Number(fpCheckStatus):fpCheckStatus,   //首页核查状态（1：已核查，0：未核查）
+      "chName": qcCheckName,   //病历核查人员
+      "mrName": fpCheckName,  //首页核查人员
+      "chTimeStart": qcCheckDateStart.replace(/\//g,'-'), //病历核查起始时间
+      "chTimeEnd": qcCheckDateEnd.replace(/\//g,'-'), //病历核查截止时间
+      "mrTimeStart": fpCheckDateStart.replace(/\//g,'-'), //首页核查起始时间
+      "mrTimeEnd": fpCheckDateEnd.replace(/\//g,'-'), //首页核查截止时间
     }
     expJson(api.exportQcDocteam,param).then(res =>{
       downloadExportedData(res.data, behosDateStart.slice(0,10).replace(/-/g,"")+"-"+behosDateEnd.slice(0,10).replace(/-/g,"")+"抽查住院病历质量情况.xls")

src/js/qcListOutHospital.js

@@ -38,11 +38,14 @@ let currentPage;
 
 $(".selectLevel").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
 $(".selectDept").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
-$(".selectCheck").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
+$(".fpSelectCheck").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
+$(".qcSelectCheck").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
 $(".selectLeaveHosType").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
 let tabList = [], name = "", behospitalCode="", behosDateStart="", level="",behosDateEnd="", scoreSum = 0,
-  nameTemp = "", behospitalCodeTemp="",levelTemp="", deptId="",deptIdTemp="", doctorName="", deptName="", deptNameTemp="",doctorNum="",doctorNameTemp="",doctorNumTemp="",
-  checkStatus="",checkStatusTemp="",leaveHosType="",leaveHosTypeTemp="",data_desc=["leaveHospitalDate"],data_asc=[];
+  nameTemp = "", behospitalCodeTemp="",levelTemp="", deptId="",deptIdTemp="", doctorName="", deptName="", deptNameTemp="",
+  doctorNum="",doctorNameTemp="",doctorNumTemp="",leaveHosType="",leaveHosTypeTemp="",
+  fpCheckStatus="",fpCheckStatusTemp="",fpCheckName="",fpCheckNameTemp="",qcCheckName="",qcCheckNameTemp="",qcCheckStatus="",qcCheckStatusTemp="",fpCheckDateStart="",fpCheckDateEnd="",
+  qcCheckDateStart="",qcCheckDateEnd="",data_desc=["leaveHospitalDate"],data_asc=[];
 if(chengdu){
     levelTemp = chengdu
     level = chengdu
@@ -132,8 +135,15 @@ function getTabData(activePage){
         size: 15,
         doctorName: doctorName,
         doctorId: doctorNum,
-        checkStatus: checkStatus?Number(checkStatus):checkStatus, //核查状态
         leaveHosType: leaveHosType  == "全部" ? "":leaveHosType, //出院人数类型
+        checkStatus: qcCheckStatus?Number(qcCheckStatus):qcCheckStatus, //病历核查状态
+        mrStatus: fpCheckStatus?Number(fpCheckStatus):fpCheckStatus,   //首页核查状态（1：已核查，0：未核查）
+        chName: qcCheckName,   //病历核查人员
+        mrName: fpCheckName,  //首页核查人员
+        chTimeStart: qcCheckDateStart.replace(/\//g,'-'), //病历核查起始时间
+        chTimeEnd: qcCheckDateEnd.replace(/\//g,'-'), //病历核查截止时间
+        mrTimeStart: fpCheckDateStart.replace(/\//g,'-'), //首页核查起始时间
+        mrTimeEnd: fpCheckDateEnd.replace(/\//g,'-'), //首页核查截止时间
     }
     return post(api.leaveHosMRPage,param).then(res =>{
         if(res.data.code == '0'){
@@ -162,10 +172,28 @@ function getTabData(activePage){
 $(".filter").on("click", function(e){
     behosDateStart = $("#datepicker").val()
     behosDateEnd = $("#datepicker2").val()
-    const start = new Date(behosDateStart).getTime()
-    const end = new Date(behosDateEnd).getTime()
-    if(start > end){
-        $.alerModal({"message":'开始时间不能大于结束时间~',type:"tip",time:'1000',isFather: true, fatherWrapper: $("#mainBox", parent.document)});
+    fpCheckDateStart = $("#datepickerFp1").val()
+    fpCheckDateEnd = $("#datepickerFp2").val()
+    qcCheckDateStart = $("#datepickerQc1").val()
+    qcCheckDateEnd = $("#datepickerQc2").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)});
         return
     }
     if(behosDateStart){
@@ -174,6 +202,18 @@ $(".filter").on("click", function(e){
     if(behosDateEnd){
         behosDateEnd = behosDateEnd + ' 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
@@ -182,8 +222,11 @@ $(".filter").on("click", function(e){
     deptName = deptNameTemp
     doctorName = doctorNameTemp
     doctorNum = doctorNumTemp
-    checkStatus = checkStatusTemp
     leaveHosType = leaveHosTypeTemp
+    fpCheckStatus = fpCheckStatusTemp
+    qcCheckStatus = qcCheckStatusTemp
+    fpCheckName = fpCheckNameTemp
+    qcCheckName = qcCheckNameTemp
     getTabData(1)
 })
 $(".abnormalClear").on("click", function(e){
@@ -199,12 +242,18 @@ $(".abnormalClear").on("click", function(e){
     deptName=""; 
     deptNameTemp=""; 
     deptIdTemp="";  
-    doctorName=""; 
+    doctorName="";
+    fpCheckName="";
+    qcCheckName="" ;   
     doctorNum=""; 
     doctorNameTemp=""; 
     doctorNumTemp=""; 
-    checkStatus="";
-    checkStatusTemp="";
+    fpCheckNameTemp="";
+    qcCheckNameTemp=""; 
+    fpCheckStatus="";
+    fpCheckStatusTemp="";
+    qcCheckStatus="";
+    qcCheckStatusTemp=""
     leaveHosType="";
     leaveHosTypeTemp="";
     data_desc=["leaveHospitalDate"];
@@ -220,9 +269,11 @@ $(".abnormalClear").on("click", function(e){
     $('.doctorInp').val('')
     $('.doctorNumInp').val('')
     $('.doctorInp').val('')
+    $('.fpCheckPeople').val('')
+    $('.qcCheckPeople').val('')
     // $('#datepicker').val('')
     // $('#datepicker2').val('')
-    //默认日期为近一个月
+    //默认日期为本年
     let year = new Date().getFullYear()
     let month = new Date().getMonth() + 1
     $( "#datepicker" ).datepicker({
@@ -235,6 +286,26 @@ $(".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({
+        changeMonth: true,
+        changeYear: true,
+        dateFormat:"yy/mm/dd",
+    }).datepicker( "setDate", "");
+    $( "#datepickerQc2" ).datepicker({
+        changeMonth: true,
+        changeYear: true,
+        dateFormat:"yy/mm/dd"
+    }).datepicker( "setDate","");
     if(from == 2){
         // console.log('deptListDept',deptListDept)
         // $('.selectDept ').html(deptListDept[0].deptName)
@@ -248,9 +319,12 @@ $(".abnormalClear").on("click", function(e){
     $(".levelList").css("display", "none")
     $(".selectLevel").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
     // $('.selectLevel ').addClass('unSelect')
-    $('.selectCheck').html('全部')
-    $(".checkList").css("display", "none")
-    $(".selectCheck").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
+    $('.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="下拉">`)
     $('.selectLeaveHosType').html('全部')
     $(".leaveHosTypeList").css("display", "none")
     $(".selectLeaveHosType").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
@@ -264,6 +338,10 @@ $(".abnormalClear").on("click", function(e){
     if(behosDateEnd){
         behosDateEnd = behosDateEnd + ' 23:59:59'
     }
+    fpCheckDateStart = ""
+    fpCheckDateEnd = ""
+    qcCheckDateStart = ""
+    qcCheckDateEnd = ""
    
     getTabData(1)
 })
@@ -285,7 +363,7 @@ function renderTab(data,hisId){
                 <td  class="textCenter">${(currentPage-1)*15 + i+1}</td>`
         for(let j = 0; j < pageSet.length; j++){
             if(pageSet[j].status == 1){
-                if(pageSet[j].val === "checkStatus"){
+                if(pageSet[j].val === "checkStatus" || pageSet[j].val === "mrStatus" ){
                     str +=  `<td class="${isTextCenter(pageSet[j].val) ? 'textCenter':''}"><span data-index=${i} class="${pageSet[j].val=='name'?'patientNameSpan':'' } ">${item[pageSet[j].val] =="1"? "已核查" :item[pageSet[j].val] === 0 ? "未核查":"-"}<span></td>`
                 }else{
                     str +=  `<td class="${isTextCenter(pageSet[j].val) ? 'textCenter':''}"><span data-index=${i} class="${pageSet[j].val=='name'?'patientNameSpan':'' } ">${item[pageSet[j].val] || "-"}<span></td>`
@@ -362,6 +440,10 @@ $('.selectLevel').on("click", function(e){
     $(".selectCheck .arrow").attr("src",iconDown)
     $(".leaveHosTypeList").css("display", "none")
     $(".selectLeaveHosType").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
+    $(".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")
@@ -372,8 +454,8 @@ $('.selectLevel').on("click", function(e){
     }
 })
 
-//选择核查状态
-$('.selectCheck').on("click", function(e){
+//选择病案首页核查状态
+$('.fpSelectCheck').on("click", function(e){
     e.stopPropagation()
     $(".deptList ").css("display", "none")
     $(".selectDept .arrow").attr("src",iconDown)
@@ -381,13 +463,36 @@ $('.selectCheck').on("click", function(e){
     $(".selectLevel .arrow").attr("src",iconDown)
     $(".leaveHosTypeList").css("display", "none")
     $(".selectLeaveHosType").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
-    const showList =  $(".checkList ").css("display")
+    $(".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)
+    $(".leaveHosTypeList").css("display", "none")
+    $(".selectLeaveHosType").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
+    $(".fpSelectCheck .arrow").attr("src",iconDown)
+    $(".fpCheckList ").css("display", "none")
+    const showList =  $(".qcCheckList ").css("display")
     if(showList == "none" ||!showList){
-        $(".checkList ").css("display","block")
-        $(".selectCheck .arrow").attr("src",iconUp)
+        $(".qcCheckList ").css("display","block")
+        $(".qcSelectCheck .arrow").attr("src",iconUp)
     }else{
-        $(".checkList ").css("display", "none")
-        $(".selectCheck .arrow").attr("src",iconDown)
+        $(".qcCheckList ").css("display", "none")
+        $(".qcSelectCheck .arrow").attr("src",iconDown)
     }
 })
 
@@ -439,17 +544,31 @@ function bindleaveHosTypeSelect(){
     })
 }
 
-bindCheckedSelect()
-//核查状态选择
-function bindCheckedSelect(){
-    $('.checkItem').on("click",function(){
-        const checkItemName = $(this).attr("data-name")
-        const checkItemItemId = $(this).attr("data-id")
-        checkStatusTemp =checkItemItemId
-        $('.selectCheck').html(checkItemName)
-        $(".checkList").css("display", "none")
-        $(".selectCheck").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
-        $('.selectCheck').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')
     })
 }
 
@@ -494,10 +613,13 @@ $('.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)
     $(".leaveHosTypeList").css("display", "none")
     $(".selectLeaveHosType").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
+    
     const showList =  $(".deptList ").css("display")
     if(showList == "none" ||!showList){
         $(".deptList ").css("display","block")
@@ -871,6 +993,14 @@ $(".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
+})
 $(".doctorNumInp").on("input", function(e){
   const val = $(this).val().trim();
     doctorNumTemp = val
@@ -931,6 +1061,26 @@ $(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({
+        changeMonth: true,
+        changeYear: true,
+        dateFormat:"yy/mm/dd"
+    }).datepicker( "setDate","");
+    $( "#datepickerQc2" ).datepicker({
+        changeMonth: true,
+        changeYear: true,
+        dateFormat:"yy/mm/dd"
+    }).datepicker( "setDate","");
     getPageSet().then(res =>{
         $(".filter").click();   //初始查询
     })
@@ -1001,12 +1151,14 @@ function renderPagination(totalPage,activePage,totalNum){
 $(document).on("click", function(){
     $(".levelList ").css("display", "none")
     $(".deptList").css("display", "none")
-    $(".checkList").css("display", "none")
     $(".leaveHosTypeList").css("display", "none")
+    $(".fpCheckList").css("display", "none")
+    $(".qcCheckList").css("display", "none")
     $(".selectDept .arrow").attr("src",iconDown)
     $(".selectLevel .arrow").attr("src",iconDown)
-    $(".selectCheck .arrow").attr("src",iconDown)
     $(".selectLeaveHosType .arrow").attr("src",iconDown)
+    $(".fpSelectCheck .arrow").attr("src",iconDown)
+    $(".qcSelectCheck .arrow").attr("src",iconDown)
 })
 $(function($){
     $('.export').click(function(){
@@ -1031,7 +1183,14 @@ $(function($){
             endDate: behosDateEnd.replace(/\//g,'-'), //出院日期--结束时间
             doctorName: doctorName,
             doctorId: doctorNum,
-            checkStatus: checkStatus?Number(checkStatus):checkStatus, //核查状态
+            checkStatus: qcCheckStatus?Number(qcCheckStatus):qcCheckStatus, //病历核查状态
+            mrStatus: fpCheckStatus?Number(fpCheckStatus):fpCheckStatus,   //首页核查状态（1：已核查，0：未核查）
+            chName: qcCheckName,   //病历核查人员
+            mrName: fpCheckName,  //首页核查人员
+            chTimeStart: qcCheckDateStart.replace(/\//g,'-'), //病历核查起始时间
+            chTimeEnd: qcCheckDateEnd.replace(/\//g,'-'), //病历核查截止时间
+            mrTimeStart: fpCheckDateStart.replace(/\//g,'-'), //首页核查起始时间
+            mrTimeEnd: fpCheckDateEnd.replace(/\//g,'-'), //首页核查截止时间
             leaveHosType: leaveHosType  == "全部" ? "":leaveHosType, //出院人数类型
         }
         expJson(api.leaveHosMrPageExport,param).then(res =>{

src/js/qcListPerson.js

@@ -34,7 +34,8 @@ $("#filterToggler").click(function(){
 });
 $(".selectLevel").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
 $(".selectDept").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
-$(".selectCheck").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
+$(".fpSelectCheck").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
+$(".qcSelectCheck").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
 let srcUrl = $("#contentIframe",parent.document).attr("src")
 let statisticsType = getUrlArgObjectNew("dateType",srcUrl)||getUrlArgObjectNew("shijian",srcUrl) || ""
 let chengdu = getUrlArgObjectNew("chengdu",srcUrl)||""
@@ -44,7 +45,8 @@ let docName = getUrlArgObjectNew("docName",srcUrl)||""
 
 let tabList = [], name = "", behospitalCode="", behosDateStart="", level="",behosDateEnd="", scoreSum = 0,nameTemp = "",
   behospitalCodeTemp="",levelTemp="", deptId="",deptIdTemp="", doctorName=doctorName_global, doctorNameTemp=doctorName_global,
-  checkStatus="",checkStatusTemp="",data_desc=["leave_hospital_date"],data_asc=[];
+  fpCheckStatus="",fpCheckStatusTemp="",fpCheckName="",fpCheckNameTemp="",qcCheckName="",qcCheckNameTemp="",qcCheckStatus="",qcCheckStatusTemp="",fpCheckDateStart="",fpCheckDateEnd="",
+  qcCheckDateStart="",qcCheckDateEnd="",data_desc=["leave_hospital_date"],data_asc=[];
 
 
 if(chengdu){
@@ -108,7 +110,14 @@ function getTabData(activePage){
         leaveHosDateEnd: behosDateEnd, //0-未启用 1-启用
         size: 15,
         statisticsType:statisticsType,
-        checkStatus: checkStatus?Number(checkStatus):checkStatus, //核查状态
+        checkStatus: qcCheckStatus?Number(qcCheckStatus):qcCheckStatus, //病历核查状态
+        mrStatus: fpCheckStatus?Number(fpCheckStatus):fpCheckStatus,   //首页核查状态（1：已核查，0：未核查）
+        chName: qcCheckName,   //病历核查人员
+        mrName: fpCheckName,  //首页核查人员
+        chTimeStart: qcCheckDateStart.replace(/\//g,'-'), //病历核查起始时间
+        chTimeEnd: qcCheckDateEnd.replace(/\//g,'-'), //病历核查截止时间
+        mrTimeStart: fpCheckDateStart.replace(/\//g,'-'), //首页核查起始时间
+        mrTimeEnd: fpCheckDateEnd.replace(/\//g,'-'), //首页核查截止时间
     }
     return post(api.qcListByPerson,param).then(res =>{
         if(res.data.code == '0'){
@@ -135,10 +144,28 @@ function getTabData(activePage){
 $(".filter").on("click", function(e){
     behosDateStart = $("#datepicker").val()
     behosDateEnd = $("#datepicker2").val()
-    const start = new Date(behosDateStart).getTime()
-    const end = new Date(behosDateEnd).getTime()
-    if(start > end){
-        $.alerModal({"message":'开始时间不能大于结束时间~',type:"tip",time:'1000',isFather: true, fatherWrapper: $("#mainBox", parent.document)});
+    fpCheckDateStart = $("#datepickerFp1").val()
+    fpCheckDateEnd = $("#datepickerFp2").val()
+    qcCheckDateStart = $("#datepickerQc1").val()
+    qcCheckDateEnd = $("#datepickerQc2").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)});
         return
     }
     if(behosDateStart){
@@ -146,13 +173,28 @@ $(".filter").on("click", function(e){
     }
     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
-    checkStatus = checkStatusTemp
+    fpCheckStatus = fpCheckStatusTemp
+    qcCheckStatus = qcCheckStatusTemp
+    fpCheckName = fpCheckNameTemp
+    qcCheckName = qcCheckNameTemp
     getTabData(1)
 })
 $(".abnormalClear").on("click", function(e){
@@ -167,11 +209,17 @@ $(".abnormalClear").on("click", function(e){
     deptId=""; 
     deptIdTemp="";  
     doctorName=""; 
+    fpCheckName="";
+    qcCheckName="" ;  
     doctorNum=""; 
     doctorNameTemp=""; 
     doctorNumTemp=""; 
-    checkStatus="";
-    checkStatusTemp="";
+    fpCheckNameTemp="";
+    qcCheckNameTemp=""; 
+    fpCheckStatus="";
+    fpCheckStatusTemp="";
+    qcCheckStatus="";
+    qcCheckStatusTemp=""
     data_desc=["leave_hospital_date"]
     data_asc=[];
     $('.patientNumInp').val('')
@@ -179,9 +227,11 @@ $(".abnormalClear").on("click", function(e){
     $('.doctorInp').val('')
     $('.doctorNumInp').val('')
     $('.doctorInp').val('')
+    $('.fpCheckPeople').val('')
+    $('.qcCheckPeople').val('')
     // $('#datepicker').val('')
     // $('#datepicker2').val('')
-    //默认日期为近一个月
+    //默认日期为近一周
     $( "#datepicker" ).datepicker({
         changeMonth: true,
         changeYear: true,
@@ -192,6 +242,26 @@ $(".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({
+        changeMonth: true,
+        changeYear: true,
+        dateFormat:"yy/mm/dd",
+    }).datepicker( "setDate", "");
+    $( "#datepickerQc2" ).datepicker({
+        changeMonth: true,
+        changeYear: true,
+        dateFormat:"yy/mm/dd"
+    }).datepicker( "setDate","");
     $('.selectDept ').html('全部')
     $(".deptList").css("display", "none")
     $(".selectDept").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
@@ -200,9 +270,12 @@ $(".abnormalClear").on("click", function(e){
     $(".levelList").css("display", "none")
     $(".selectLevel").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
     // $('.selectLevel ').addClass('unSelect')
-    $('.selectCheck').html('全部')
-    $(".checkList").css("display", "none")
-    $(".selectCheck").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
+    $('.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")
     $(".leaveHospitalDate").addClass(" desc")
     behosDateStart = $("#datepicker").val()
@@ -213,6 +286,10 @@ $(".abnormalClear").on("click", function(e){
     if(behosDateEnd){
         behosDateEnd = behosDateEnd.replace(/\//g,'-') + ' 23:59:59'
     }
+    fpCheckDateStart = ""
+    fpCheckDateEnd = ""
+    qcCheckDateStart = ""
+    qcCheckDateEnd = ""
     getTabData(1)
 })
 function bindOrder(){
@@ -252,7 +329,7 @@ function renderTab(data){
                 <td  class="recordScoreOperaBtn textCenter" style="opacity:${hasData('FUNC000017')?'1':'0.5'}">评分</td>`
         for(let j = 0; j < pageSet.length; j++){
             if(pageSet[j].status == 1){
-                if(pageSet[j].val === "checkStatus"){
+                if(pageSet[j].val === "checkStatus" || pageSet[j].val === "mrStatus" ){
                     str +=  `<td class="${isTextCenter(pageSet[j].val) ? 'textCenter':''}"><span data-index=${i} class="${pageSet[j].val=='name'?'patientNameSpan':'' } ">${item[pageSet[j].val] =="1"? "已核查" :item[pageSet[j].val] === 0 ? "未核查":"-"}<span></td>`
                 }else{
                     str +=  `<td class="${isTextCenter(pageSet[j].val) ? 'textCenter':''}"><span data-index=${i} class="${pageSet[j].val=='name'?'patientNameSpan':'' } ">${item[pageSet[j].val] || "-"}<span></td>`
@@ -327,6 +404,10 @@ $('.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")
@@ -338,23 +419,43 @@ $('.selectLevel').on("click", function(e){
 })
 
 
-//选择核查状态
-$('.selectCheck').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)
-    const showList =  $(".checkList ").css("display")
+    $(".qcSelectCheck .arrow").attr("src",iconDown)
+    $(".qcCheckList ").css("display", "none")
+    const showList =  $(".fpCheckList ").css("display")
     if(showList == "none" ||!showList){
-        $(".checkList ").css("display","block")
-        $(".selectCheck .arrow").attr("src",iconUp)
+        $(".fpCheckList ").css("display","block")
+        $(".fpSelectCheck .arrow").attr("src",iconUp)
     }else{
-        $(".checkList ").css("display", "none")
-        $(".selectCheck .arrow").attr("src",iconDown)
+        $(".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()
 //病历等级选择
@@ -371,17 +472,31 @@ function bindLeveldSelect(){
 }
 
 
-bindCheckedSelect()
-//核查状态选择
-function bindCheckedSelect(){
-    $('.checkItem').on("click",function(){
-        const checkItemName = $(this).attr("data-name")
-        const checkItemItemId = $(this).attr("data-id")
-        checkStatusTemp =checkItemItemId
-        $('.selectCheck').html(checkItemName)
-        $(".checkList").css("display", "none")
-        $(".selectCheck").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
-        $('.selectCheck').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')
     })
 }
 
@@ -427,6 +542,10 @@ $('.selectDept').on("click", function(e){
     $(".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)
     const showList =  $(".deptList ").css("display")
     if(showList == "none" ||!showList){
         $(".deptList ").css("display","block")
@@ -765,6 +884,14 @@ $(".patientNameInp").on("input", function(e){
     const val = $(this).val().trim()
     nameTemp = 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
+})
 $(".doctorInp").on("input", function(e){
     const val = $(this).val().trim()
     doctorNameTemp = val
@@ -823,6 +950,26 @@ $(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({
+        changeMonth: true,
+        changeYear: true,
+        dateFormat:"yy/mm/dd"
+    }).datepicker( "setDate","");
+    $( "#datepickerQc2" ).datepicker({
+        changeMonth: true,
+        changeYear: true,
+        dateFormat:"yy/mm/dd"
+    }).datepicker( "setDate","");
     getPageSet().then(res =>{
         $(".filter").click();   //初始查询
     })
@@ -893,10 +1040,13 @@ $(document).on("click", function(){
     $(".levelList ").css("display", "none")
     $(".deptList").css("display", "none")
     $(".checkList").css("display", "none")
+    $(".fpCheckList").css("display", "none")
+    $(".qcCheckList").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)
 })
 
 $((function($){

src/js/qcScore.js

@@ -14,6 +14,7 @@ $(function(){
   const global_id=getUrlArgObject("id");
   const global_age = getUrlArgObject("age");
   let global_check;
+  let global_check_home;
   const global_code = getUrlArgObject("code");
   let global_activeTab=$(".sub-menu .page.active").attr("code");  //当前激活菜单项
   let global_modules ={};   //模板数据缓存
@@ -64,7 +65,14 @@ function initMenu(data){
   $(".page").on("click",function(){
     $(".info-item .cont,.flaw-item,td").removeClass("active");   //清空缺陷定位背景
     const title = $(this).attr("code");
-    if(title==="缺陷总览"||title==="谈话告知书"||title==="知情同意书"||title === '医嘱信息'){
+    if(title == '缺陷总览'){
+      $(".check").css('display','none')
+    }else if(title == '病案首页'){
+      $(".check").css('display','block').text(global_check_home==1?'重新核查':'病案首页核查')
+    }else{
+      $(".check").css('display','block')
+    }
+    if(title==="缺陷总览"||title==="谈话告知书"||title==="知情同意书"){
       if(title==="缺陷总览"){
         getRecordDetailUpdate()
       }
@@ -114,8 +122,9 @@ function getRecordDetail(){
   post(api.getRecordDetail,{'behospitalCode':global_id}).then(function(res){
     if(res.data.code==='0'){
       const data = res.data.data;
-      const {beHospital,result,msg,checkStatus,drgs} = data;
+      const {beHospital,result,msg,checkStatus,drgs,mrStatus} = data;
       global_check = checkStatus
+      global_check_home = mrStatus
       const info=Object.assign(beHospital,result);
       initMenu(JSON.parse(result.menuData));
       // $(".sub-menu>ul>li:first-child.page,.menu-mini>ul>li:first-child.page").addClass("active");
@@ -169,7 +178,7 @@ function initPatientInfo(data){
   if(hasData("FUNC000014")){
     hasCheck = true
   }
-  const obj=Object.assign({},data,{age:!global_age||global_age=="null"?"-":global_age,hasCheck,checkState:global_check});
+  const obj=Object.assign({},data,{age:!global_age||global_age=="null"?"-":global_age,hasCheck,checkState:global_check,checkStateHome:global_check_home});
   
   $("#infoTmpl").tmpl(obj).appendTo("#patientInfo");
   $(".check").on("click", function(){
@@ -709,16 +718,21 @@ function formatFlawKeys(data){
     });
   }
   function checkQc(){
+    console.log('global_activeTab',global_activeTab)
     const param={
       behospitalCode:getUrlArgObject("id"),
-      hospitalId:getUrlArgObject("hid")
+      hospitalId:getUrlArgObject("hid"),
+      checkType: global_activeTab == '病案首页'?'1':'0'
     };
     post(api.checkQc,param).then((res)=>{
       if(res.data.code==='0') {
-        global_check = 1
+        if(global_activeTab == '病案首页'){
+          global_check_home = 1
+        }else{
+          global_check = 1
+        }
         $(".check").text("重新核查")
-        $.alerModal({"message":`<div class="checkTipsBox"><img class="checkImg" src=${checkOk}><p class="checkTxt">核查成功</p></div>`,type:"tip",time:'1000',isFather: false});
-       
+        $.alerModal({"message":"核查成功",type:"tip",time:'1000',win:true});
       }else{
         $.alerModal({"message":res.data.msg ||"核查失败",type:"tip",time:'1000',isFather: false});
       }

src/js/quexianDetailControlHome.js

@@ -22,7 +22,7 @@ $(function(){
     dateChange()
     let srcUrl = $("#contentIframe",parent.document).attr("src")
     deptName = getUrlArgObjectNew("deptName",srcUrl)||""
-    deptId = deptIdTemp = getUrlArgObjectNew("caseName",srcUrl)||""
+    deptId = deptIdTemp = getUrlArgObjectNew("deptId",srcUrl)||""
     from = getUrlArgObjectNew("from",srcUrl)||""
     isReject = isRejectTemp = getUrlArgObjectNew("shijian",srcUrl)||""
     casesIds = getUrlArgObjectNew("casesId",srcUrl)||""
@@ -167,7 +167,7 @@ function getTabData(activePage){
         type: 0,
         name: name, //条目名
         doctorName:"",
-        casesName:deptId,
+        casesName:"",
         ruleType:ruleType||null,
         deptName:deptName=="全院"?"":(deptName||""),
         casesId:casesIds||"",
@@ -305,7 +305,7 @@ function renderTab(data,activePage){
                 <td  class="textCenter">${(activePage-1)*15 + i+1}</td>
                 <td class="textCenter">${item.casesName}</td>
                 <td>${item.name}</td>
-                <td class="textCenter">${item.num}</td>
+                <td class="textCenter canJump" data-ruleType="${item.ruleType}">${item.num}</td>
                 <td  class="textCenter">${item.percentStr}</td>
             </tr>
         `
@@ -313,6 +313,12 @@ function renderTab(data,activePage){
     $('tbody.tbodys').html(str?str:emptyBox())
     bindEdit(data,activePage)
     // initScroll("quexianDetailControlHome","Y",1)
+    $(".canJump").click(function(){
+        // let ruleType = $(this).attr("data-ruleType")
+        let index = $(this).parent().attr("data-index")
+        let defectName = data[index].name
+        $(parent.document).find("#contentIframe").attr("src","qcListCopy.html?deptName="+deptName+"&deptId="+deptId+"&from=4&casesId=243"+"&shijian=3"+"&ruleType="+ruleType+"&startDate="+startDateParam+"&endDate="+endDateParam+"&defectName="+defectName)
+    })
 }
 
 function bindEdit(data,activePage){
@@ -580,7 +586,7 @@ $(function() {
             type: 0,
             name: name, //条目名
             doctorName:"",
-            casesName:deptId,
+            casesName:"",
             ruleType:ruleType||null,
             deptName:deptName=="全院"?"":(deptName||""),
             casesId:casesIds||"",

src/js/readmission.js

@@ -0,0 +1,489 @@
+const $ = require('jquery');
+require("../css/readmission.less");
+require('./modal.js');
+const {api} = require('./api.js')
+const {post,getCookie,getUrlArgObjectNew,emptyBox,setTitleTxt,setDatePicker,getPickerDate,expJson,downloadExportedData,initScroll} = 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")
+const iconDown= require("./../images/arrow_down.png")
+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")
+let  deptName = "", behospitalCode="", deptNameTemp = "",deptId='',deptIdTemp='', behospitalCodeTemp="", data_desc="",data_asc="",deptRecord="",patientName="" ; 
+let srcUrl = $("#contentIframe",parent.document).attr("src")
+statisticsType = getUrlArgObjectNew("dateType",srcUrl)||"";
+from = getUrlArgObjectNew("from",srcUrl)||""
+lineType = getUrlArgObjectNew("lineType",srcUrl)||""
+let startDateParam = getUrlArgObjectNew("startDateParam",srcUrl)||""
+let endDateParam = getUrlArgObjectNew("endDateParam",srcUrl)||""
+// $(".selectDept").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
+/*if(lineType){
+  $("th[code="+data_desc+"]").addClass("desc");
+}*/
+//setTitleTxt('',from)         //导航栏面包屑
+if(statisticsType == 1){
+  setDatePicker($("#datepicker"),$("#datepicker2"),1)
+}else if(statisticsType == 2){
+  setDatePicker($("#datepicker"),$("#datepicker2"),2)
+}else if(statisticsType == 3){
+  setDatePicker($("#datepicker"),$("#datepicker2"),3,new Date(startDateParam),new Date(endDateParam))
+}else{
+  setDatePicker($("#datepicker"),$("#datepicker2"),'default')
+}
+
+if(from==2){
+  // $(".export").css('display','none')
+  // $(".partTitle .titlePic ").html(`<a class="consoleD" href="deptConsole.html">控制台(科室) / </a><a class="consoleP" href="singleVeto.html?from=1">条目缺陷占比 / </a>缺陷详情`)
+  // deptId=deptListDept[0]&&deptListDept[0].deptId; 
+  // deptName=deptListDept[0]&&deptListDept[0].deptName;
+  // deptNameTemp=deptListDept[0]&&deptListDept[0].deptName;
+  // deptIdTemp=deptListDept[0]&&deptListDept[0].deptId;
+  // $('.selectDept').html(deptName)
+}else if(from==3){
+//   $(".partTitle .titlePic ").html(`<a href="keyItemFlawControl.html">关键条目缺陷占比 / </a>缺陷详情`)
+}else{
+  $(".partTitle .titlePic ").html(`<a class="consoleD" href="console.html">控制台 / </a>31天再入院人数`)
+}
+
+if(!statisticsType){
+  setDatePicker($("#datepicker"),$("#datepicker2"),'default')
+}
+$(".abnormalClear").click(function(){
+  data_desc="";
+  data_asc="";
+  deptId="";
+  deptIdTemp="";
+  deptName="";
+  deptNameTemp="";
+  patientName= "";
+  deptRecord="";
+  setDatePicker($("#datepicker"),$("#datepicker2"),"default")
+  $('.patientRecordInp').val('')
+  $('.patientNameInp').val('')
+  // $(".deptList").css("display", "none")
+  // $(".selectDept").append(`<img class="arrow" src=${iconDown} alt="下拉">`);
+  $("th[code]").removeClass("asc desc")
+  //behospitalCode =behospitalCodeTemp= ""
+  getTabData(1)
+})
+$(".partTitle a").click(function(){
+  //初始菜单选中
+  $(".menu .page",parent.document).removeClass("active").eq(0).addClass("active");
+  $(".container",parent.document).addClass("console-cont");
+})
+
+//判断有无某一权限
+/*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 getTabData(activePage){
+  const dateStatrt = getPickerDate($("#datepicker"),1)
+  const dateEnd = getPickerDate($("#datepicker2"),2)
+  const start = new Date(dateStatrt).getTime()
+  const end = new Date(dateEnd).getTime()
+  if(start > end){
+    $.alerModal({"message":'开始时间不能大于结束时间~',type:"tip",time:'1000',isFather: true, fatherWrapper: $("#mainBox", parent.document)});
+    return
+  }
+  const param = {
+    current:activePage,
+    size: 10,
+    name:patientName,
+    fileCode:deptRecord,
+    startDate:dateStatrt.replace(/\//g,'-'),
+    endDate:dateEnd.replace(/\//g,'-')
+  }
+  startDateParam = dateStatrt
+  endDateParam = dateEnd
+  post(api.reHos31DaysPage,param).then(res =>{
+    if(res.data.code == '0'){
+      const data = res.data.data||[];
+      const totalPage = data.pages;
+      const totalNum = data.total;
+      renderTab(data,data.hospitalId,activePage);
+      renderPagination(totalPage,Number(activePage),totalNum)
+      if(totalPage > 1){
+        renderPagination(totalPage,Number(activePage),totalNum)
+      } else{
+        $('.pagination').html("")
+      }
+    }else{
+      $.alerModal({"message":res.data.msg,type:"tip",time:'1000',isFather: true, fatherWrapper: $("#mainBox", parent.document)});
+    }
+  }).catch((e) =>{
+
+  })
+ 
+}
+
+getTabData(1)
+
+$(".filter").on("click", function(e){
+  // deptName = deptNameTemp;
+  behospitalCode = behospitalCodeTemp;
+  getTabData(1)
+})
+// // 处理th tr数据
+function formatTableData(data){
+  let newColumns = data.filter(function(item,index){
+    if(item.isShow === 1) {
+      return item
+    }
+  })
+  return newColumns
+}
+
+
+function renderTab(data,hisId,activePage){
+  data = data.records;
+  let newData = []
+  for(var i = 0; i < data.length ; i++) {
+    let dataCopy = {copy: true, ...data[i]}
+    newData =  [...newData,data[i],dataCopy]    
+  }
+  let str = ``
+  for(let i = 0; i < newData.length; i++){
+      const item = newData[i]
+      if(!item.copy){
+        str += `
+          <tr  data-index=${i}>
+          <td class="textCenter" rowspan="2">${Math.ceil(((activePage-1)*20 + i+1)/2)}</td>
+          <td class="textCenter">${item.details[0].behospitalCode || "-"}</td> 
+          <td class="textCenter" rowspan="2">${item.fileCode || "-"}</td> 
+          <td class="textCenter patientNameSpan" data-id="${item.details[0].behospitalCode}" data-name="${item.details[1].name}" >${item.details[0].name || "-"}</td> 
+          <td class="textCenter" rowspan="2">${item.sex || "-"}</td> 
+          <td class="textCenter">${item.details[0].level || "-"}</td> 
+          <td class="textCenter">${item.details[0].scoreRes || "-"}</td> 
+          <td class="textCenter">${item.details[0].behDeptName || "-"}</td> 
+          <td class="textCenter" rowspan="2">${item.diagnose || "-"}</td> 
+          <td class="textCenter">${item.details[0].behospitalDate || "-"}</td> 
+          <td class="textCenter">${item.details[0].leaveHospitalDate || "-"}</td> 
+          <td class="textCenter" rowspan="2">${item.diffDays || "-"}</td> 
+          </tr>
+        `
+      }else{
+        str += `
+          <tr  data-index=${i} class="copy">
+          <td class="textCenter delete"></td> 
+          <td class="textCenter">${item.details[1].behospitalCode || "-"}</td> 
+          <td class="textCenter delete">${item.fileCode || "-"}</td> 
+          <td class="textCenter patientNameSpan" data-id="${item.details[1].behospitalCode}" data-name="${item.details[1].name}">${item.details[1].name || "-"}</td> 
+          <td class="textCenter delete">${item.sex || "-"}</td> 
+          <td class="textCenter">${item.details[1].level || "-"}</td> 
+          <td class="textCenter">${item.details[1].scoreRes || "-"}</td> 
+          <td class="textCenter">${item.details[1].behDeptName || "-"}</td> 
+          <td class="textCenter delete">${item.diagnose || "-"}</td> 
+          <td class="textCenter">${item.details[1].behospitalDate || "-"}</td> 
+          <td class="textCenter">${item.details[1].leaveHospitalDate || "-"}</td> 
+          <td class="textCenter delete">${item.diffDays || "-"}</td> 
+          </tr>
+        `
+      }
+  }
+  $('.tbody').html(str?str:emptyBox())
+  $(".tbody .copy .delete").hide()
+  /*bindScoreDetail(hisId)*/
+  // 跳转至详情页
+  $(".goHomeDetail").click(function(){
+    let casesName = $(this).attr("data-name") || '';
+    let casesId = $(this).attr("data-id");
+    let name=$(this).attr("dept-name");
+    name=name==="全院"?"全部":name;
+    let id=$(this).attr("dept-id");
+
+    $(parent.document).find("#contentIframe").attr("src","uccDetail.html?from=3&deptName="+name+"&deptId="+id+"&casesEntryId="+casesId+"&defectName="+casesName+"&startDate="+startDateParam+"&endDate="+endDateParam)
+  })
+  bindScoreDetail(hisId)
+  // initScroll("partDetailControl","YX",1)
+}
+
+function scoreDetail(id,age,hid,code,name){
+  window.open(`./qcScore.html?id=${id}&age=${age}&name=${name}&hid=${getCookie('hospitalid')}&code=${code}`)
+}
+// 跳转至病人详情
+function bindScoreDetail(hisId){
+  $('.patientNameSpan').on('click',function(e){
+      // const id = $(this).attr('data-id')
+      // const age = ''
+      // const noScore = ''
+      // const checkStatus = ''
+      // const name = $(this).attr('data-name')
+      const id = $(this).attr('data-id')
+      const age = ''
+      const noScore = ''
+      const checkStatus = ''
+      const name = $(this).attr('data-name')
+      // qcScore.html?id=ZY010000669760&age=null&name=李**&hid=1&code=YH-BLZK-ZKPF
+      // console.log(id,'=',name,'=');
+      if(noScore){
+          $.alerModal({"message":'请先进行评分！',type:"tip",time:'1000',isFather: true, fatherWrapper: $("#mainBox", parent.document)});
+          return
+      } else{
+          // scoreDetail(id,age,hisId,'YH-BLZK-ZKPF',tabList[index].name)
+          scoreDetail(id,age,hisId,'YH-BLZK-ZKPF',name)
+      }
+     
+  })
+}
+
+
+// $('.selectDept').on("click", function(e){
+//   e.stopPropagation()
+//   $(".selectLevel .arrow").attr("src",iconDown)
+//   const showList =  $(".deptList ").css("display")
+//   if(showList == "none" ||!showList){
+//     $(".deptList ").css("display","block")
+//     $(".selectDept .arrow").attr("src",iconUp)
+//   }else{
+//     $(".deptList ").css("display", "none")
+//     $(".selectDept .arrow").attr("src",iconDown)
+//   }
+// })
+
+//获取科室列表
+// getDeptList()
+// function getDeptList(){
+//   post(api.getDeptList,{inputStr:""}).then(res =>{
+//     if(res.data.code == '0'){
+//       const  deptList = res.data.data
+//       rendeDeptList(deptList)
+//     }else{}
+//   }).catch((e) =>{
+
+//   })
+// }
+//获取页面配置
+
+// function getPageSet(){
+//   const dateStatrt = getPickerDate($("#datepicker"),1)
+//   const dateEnd = getPickerDate($("#datepicker2"),2)
+//   const start = new Date(dateStatrt).getTime()
+//   const end = new Date(dateEnd).getTime()
+//   if(start > end){
+//     $.alerModal({"message":'开始时间不能大于结束时间~',type:"tip",time:'1000',isFather: true, fatherWrapper: $("#mainBox", parent.document)});
+//     return
+//   }
+//   const param = {
+//     "name": deptName,
+//     "asc":data_asc,     //升序
+//     "desc":data_desc,       //降序
+//     "startDate":dateStatrt.replace(/\//g,'-'),
+//     "endDate":dateEnd.replace(/\//g,'-')
+//   }
+//   startDateParam = dateStatrt
+//   endDateParam = dateEnd
+//   post(api.unModifyMRStatistics,param).then(res =>{
+//     if(res.data.code == '0'){
+//       const data = res.data.data||[];
+//       renderTabTitle(data)   //渲染Table表头
+//     }else{
+//       $.alerModal({"message":res.data.msg,type:"tip",time:'1000',isFather: true, fatherWrapper: $("#mainBox", parent.document)});
+//     }
+//   }).catch((e) =>{
+
+//   })
+// }
+// getPageSet()
+
+// 渲染table表头
+// function renderTabTitle(data){ 
+//   data = data.columns; 
+//   let str = `
+//   <th class="moduleName" style="width: 65px;">序号</th>`
+//   for(let i = 0; i < data.length; i++){
+//       const item = data[i]
+//       if(item.isShow == 1){        
+//           str += `<th class="textCenter beHospitalId" code="${item.fieldName}">${item.columnName}</th>`
+//       }
+//   }
+//   $(".tabTitle").html(str)
+//   bindOrder()
+// }
+
+// function rendeDeptList(deptList){
+//   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>`
+//   }
+//   $('.deptList').html(str)
+//   bindDeptSelect()
+// }
+//科室选择
+// function bindDeptSelect(){
+//   $('.deptItem').on("click",function(){
+//     const deptItemName = $(this).attr("data-name")
+//     const deptItemId = $(this).attr("data-id")
+//     deptIdTemp =deptItemId;
+//     deptNameTemp=deptItemName==="全部"?"":deptItemName;
+//     if(deptItemName.length > 10){
+//       $('.selectDept').html(deptItemName.substring(0,8)+'...')
+//     }else{
+//       $('.selectDept').html(deptItemName)
+//     }
+//     $('.selectDept ').attr('title',deptItemName)
+//     $(".selectDept").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
+//     $(".deptList").css("display", "none")
+//     $('.selectDept').removeClass('unSelect')
+//   })
+// }
+function loading(){
+  const str = `
+    <div class="loadingBox">
+            <div class="mask"></div>
+            <img class="loadingImg" src=${loadingImg}  alt="loading" />
+        </div>
+    `
+  $("#mainBox", parent.document).append(str)
+}
+function hideLoading(){
+  $("#mainBox .loadingBox", parent.document).remove()
+}
+$(document).on("click", function(){
+  $(".deptList").css("display", "none");
+  // $(".selectDept .arrow").attr("src",iconDown)
+})
+// 上升下降筛选
+$("th[code]").off("click").on("click",function(e){
+  const code=$(this).attr("code");
+  if(data_asc==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);
+});
+
+
+//分页渲染
+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{
+    if(activePage <= 3){ //选中页数小于4
+      for(let i = 1; i <= 4; i++){
+        str += `<span class="pageNum ${'page'+i}" data-page=${i}>${i}</span>`
+      }
+      str += `<span class="more" >...</span>`
+      str += `<span class="pageNum ${'page'+totalPage}" data-page=${totalPage}>${totalPage}</span>`
+
+    } else if(activePage > totalPage -3){
+      str += `<span class="pageNum page1" data-page=1>1</span>`
+      str += `<span class="more" >...</span>`
+      str += `<span class="pageNum ${'page'+(totalPage-3)}" data-page=${totalPage -3}>${totalPage -3}</span>`
+      str += `<span class="pageNum ${'page'+(totalPage-2)}" data-page=${totalPage -2}>${totalPage -2}</span>`
+      str += `<span class="pageNum ${'page'+(totalPage-1)}" data-page=${totalPage -1}>${totalPage -1}</span>`
+      str += `<span class="pageNum ${'page'+totalPage}" data-page=${totalPage}>${totalPage}</span>`
+    } else {
+      str += `<span class="pageNum page1" data-page=1>1</span>`
+      str += `<span class="more" >...</span>`
+      str += `<span class="pageNum ${'page'+(activePage -1)}" data-page=${activePage -1}>${activePage -1}</span>`
+      str += `<span class="pageNum ${'page'+activePage}" data-page=${activePage}>${activePage}</span>`
+      str += `<span class="pageNum ${'page'+(activePage +1)}" data-page=${activePage +1}>${activePage +1}</span>`
+      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)
+  $('.page' + activePage).addClass('activePage')
+  $(".pageNum").on("click", function(e){
+    const activePageNow = Number($(this).attr('data-page'))
+    getTabData(activePageNow)
+    // renderPagination(totalPage,activePageNow,totalNum)
+  })
+  $(".prePage").on("click", function(e){
+    let activePageNow = Number($(".activePage").attr('data-page'))
+    if(activePageNow > 1){
+      activePageNow--
+      getTabData(activePageNow)
+      // renderPagination(totalPage,activePageNow,totalNum)
+    }
+  })
+  $(".nextPage").on("click", function(e){
+    let activePageNow = Number($(".activePage").attr('data-page'))
+    if(activePageNow < totalPage){
+      activePageNow++
+      getTabData(activePageNow)
+      // renderPagination(totalPage,activePageNow,totalNum)
+    }
+  })
+
+}
+
+// 获取科室名称
+$(".patientNumInp").on("input", function(e){
+  const val = $(this).val().trim()
+  deptName = val
+})
+ 
+// 获取病人姓名  patientRecordInp
+$(".patientNameInp").on("input", function(e){
+  const val = $(this).val().trim()
+  patientName = val
+})
+
+// 获取病案号  patientRecordInp
+$(".patientRecordInp").on("input", function(e){
+  const val = $(this).val().trim()
+  deptRecord = val
+})
+
+
+$(function() {
+  const  iconCalenBlue= require("./../images/icon_calen_blue.png")
+  const  iconCalenGrey= require("./../images/icon_calen_grey.png")
+  $('.datapickerBox').append(`<img class="iconCalen" src=${iconCalenGrey} />`)
+  $('.iconCalen').on("mouseenter", function(e){
+    $(this).attr("src", iconCalenBlue)
+  })
+  $('.iconCalen').on("mouseleave", function(e){
+    $(this).attr("src", iconCalenGrey)
+  })
+  $('.iconCalen').on("click", function(e){
+    $(this).parent().find("input").focus()
+  })
+  $('.export').click(function(){
+      const start = new Date(startDateParam).getTime()
+      const end = new Date(endDateParam).getTime()
+      if(start > end){
+          $.alerModal({"message":'开始时间不能大于结束时间~',type:"tip",time:'1000',isFather: true, fatherWrapper: $("#mainBox", parent.document)});
+          return
+      }
+      const param = {
+        name:patientName,
+        fileCode:deptRecord,
+        startDate:startDateParam.replace(/\//g,'-'),
+        endDate:endDateParam.replace(/\//g,'-'),
+      }
+      expJson(api.reHos31DaysPageExport,param).then(res =>{
+          downloadExportedData(res.data, "31天再入院人数.xls")
+      })
+      
+      //  初始渲染TableTitle
+      // getPageSet().then(res =>{
+      //   $(".filter").click();   //初始查询
+      // })
+  })
+});

src/js/uccDetail.js

@@ -37,10 +37,12 @@ let currentPage;
 
 $(".selectLevel").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
 $(".selectDept").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
-$(".selectCheck").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,
   nameTemp = "", behospitalCodeTemp="",levelTemp="", deptId="",deptIdTemp="", doctorName="", deptName="", deptNameTemp="",doctorNum="",doctorNameTemp="",doctorNumTemp="",
-  checkStatus="",checkStatusTemp="",data_desc=["leaveHospitalDate"],data_asc=[];
+  fpCheckStatus="",fpCheckStatusTemp="",fpCheckName="",fpCheckNameTemp="",qcCheckName="",qcCheckNameTemp="",qcCheckStatus="",qcCheckStatusTemp="",fpCheckDateStart="",fpCheckDateEnd="",
+  qcCheckDateStart="",qcCheckDateEnd="",data_desc=["leaveHospitalDate"],data_asc=[];
 if(chengdu){
     levelTemp = chengdu
     level = chengdu
@@ -128,15 +130,20 @@ function getTabData(activePage){
         level:level,//病历等级
         startDate: behosDateStart.replace(/\//g,'-'), //出院日期--开始时间
         endDate: behosDateEnd.replace(/\//g,'-'), //出院日期--结束时间
-
-
         current:activePage,
         behospitalCode: behospitalCode,
         ascs:data_asc,     //升序
         descs:data_desc,       //降序      
         size: 15,
         isReject: isSingleReject,
-        checkStatus: checkStatus?Number(checkStatus):checkStatus, //核查状态
+        checkStatus: qcCheckStatus?Number(qcCheckStatus):qcCheckStatus, //病历核查状态
+        mrStatus: fpCheckStatus?Number(fpCheckStatus):fpCheckStatus,   //首页核查状态（1：已核查，0：未核查）
+        chName: qcCheckName,   //病历核查人员
+        mrName: fpCheckName,  //首页核查人员
+        chTimeStart: qcCheckDateStart.replace(/\//g,'-'), //病历核查起始时间
+        chTimeEnd: qcCheckDateEnd.replace(/\//g,'-'), //病历核查截止时间
+        mrTimeStart: fpCheckDateStart.replace(/\//g,'-'), //首页核查起始时间
+        mrTimeEnd: fpCheckDateEnd.replace(/\//g,'-'), //首页核查截止时间
     }
     // return post(from==2?api.qcResultShortByDeptPage:api.qcResultDefectList,param).then(res =>{
     return post(api.unModifyMRPage,param).then(res =>{
@@ -166,10 +173,28 @@ function getTabData(activePage){
 $(".filter").on("click", function(e){
     behosDateStart = $("#datepicker").val()
     behosDateEnd = $("#datepicker2").val()
-    const start = new Date(behosDateStart).getTime()
-    const end = new Date(behosDateEnd).getTime()
-    if(start > end){
-        $.alerModal({"message":'开始时间不能大于结束时间~',type:"tip",time:'1000',isFather: true, fatherWrapper: $("#mainBox", parent.document)});
+    fpCheckDateStart = $("#datepickerFp1").val()
+    fpCheckDateEnd = $("#datepickerFp2").val()
+    qcCheckDateStart = $("#datepickerQc1").val()
+    qcCheckDateEnd = $("#datepickerQc2").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)});
         return
     }
     if(behosDateStart){
@@ -178,7 +203,18 @@ $(".filter").on("click", function(e){
     if(behosDateEnd){
         behosDateEnd = behosDateEnd + ' 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
@@ -186,7 +222,11 @@ $(".filter").on("click", function(e){
     deptName = deptNameTemp
     doctorName = doctorNameTemp
     doctorNum = doctorNumTemp
-    checkStatus = checkStatusTemp
+    fpCheckStatus = fpCheckStatusTemp
+    qcCheckStatus = qcCheckStatusTemp
+    fpCheckName = fpCheckNameTemp
+    qcCheckName = qcCheckNameTemp
+
     getTabData(1)
 })
 $(".abnormalClear").on("click", function(e){
@@ -203,11 +243,17 @@ $(".abnormalClear").on("click", function(e){
     deptNameTemp=""; 
     deptIdTemp="";  
     doctorName=""; 
+    fpCheckName="";
+    qcCheckName="" ;  
     doctorNum=""; 
     doctorNameTemp=""; 
     doctorNumTemp=""; 
-    checkStatus="";
-    checkStatusTemp="";
+    fpCheckNameTemp="";
+    qcCheckNameTemp=""; 
+    fpCheckStatus="";
+    fpCheckStatusTemp="";
+    qcCheckStatus="";
+    qcCheckStatusTemp=""
     data_desc=["leaveHospitalDate"]
     data_asc=[];
     if(from == 2){
@@ -221,6 +267,8 @@ $(".abnormalClear").on("click", function(e){
     $('.doctorInp').val('')
     $('.doctorNumInp').val('')
     $('.doctorInp').val('')
+    $('.fpCheckPeople').val('')
+    $('.qcCheckPeople').val('')
     // $('#datepicker').val('')
     // $('#datepicker2').val('')
     //默认日期为近一个月
@@ -236,6 +284,26 @@ $(".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({
+        changeMonth: true,
+        changeYear: true,
+        dateFormat:"yy/mm/dd",
+    }).datepicker( "setDate", "");
+    $( "#datepickerQc2" ).datepicker({
+        changeMonth: true,
+        changeYear: true,
+        dateFormat:"yy/mm/dd"
+    }).datepicker( "setDate","");
     if(from == 2){
         console.log('deptListDept',deptListDept)
         $('.selectDept ').html(deptListDept[0].deptName)
@@ -249,9 +317,12 @@ $(".abnormalClear").on("click", function(e){
     $(".levelList").css("display", "none")
     $(".selectLevel").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
     // $('.selectLevel ').addClass('unSelect')
-    $('.selectCheck').html('全部')
-    $(".checkList").css("display", "none")
-    $(".selectCheck").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
+    $('.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")
     $(".leaveHospitalDate").addClass(" desc")
     behosDateStart = $("#datepicker").val()
@@ -262,6 +333,10 @@ $(".abnormalClear").on("click", function(e){
     if(behosDateEnd){
         behosDateEnd = behosDateEnd + ' 23:59:59'
     }
+    fpCheckDateStart = ""
+    fpCheckDateEnd = ""
+    qcCheckDateStart = ""
+    qcCheckDateEnd = ""
    
     getTabData(1)
 })
@@ -283,7 +358,7 @@ function renderTab(data,hisId){
                 <td  class="textCenter">${(currentPage-1)*15 + i+1}</td>`
         for(let j = 0; j < pageSet.length; j++){
             if(pageSet[j].status == 1){
-                if(pageSet[j].val === "checkStatus"){
+                if(pageSet[j].val === "checkStatus" || pageSet[j].val === "mrStatus" ){
                     str +=  `<td class="${isTextCenter(pageSet[j].val) ? 'textCenter':''}"><span data-index=${i} class="${pageSet[j].val=='name'?'patientNameSpan':'' } ">${item[pageSet[j].val] =="1"? "已核查" :item[pageSet[j].val] === 0 ? "未核查":"-"}<span></td>`
                 }else{
                     str +=  `<td class="${isTextCenter(pageSet[j].val) ? 'textCenter':''}"><span data-index=${i} class="${pageSet[j].val=='name'?'patientNameSpan':'' } ">${item[pageSet[j].val] || "-"}<span></td>`
@@ -358,6 +433,10 @@ $('.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")
@@ -368,23 +447,43 @@ $('.selectLevel').on("click", function(e){
     }
 })
 
-//选择核查状态
-$('.selectCheck').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)
-    const showList =  $(".checkList ").css("display")
+    $(".qcSelectCheck .arrow").attr("src",iconDown)
+    $(".qcCheckList ").css("display", "none")
+    const showList =  $(".fpCheckList ").css("display")
     if(showList == "none" ||!showList){
-        $(".checkList ").css("display","block")
-        $(".selectCheck .arrow").attr("src",iconUp)
+        $(".fpCheckList ").css("display","block")
+        $(".fpSelectCheck .arrow").attr("src",iconUp)
     }else{
-        $(".checkList ").css("display", "none")
-        $(".selectCheck .arrow").attr("src",iconDown)
+        $(".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()
 //病历等级选择
@@ -400,17 +499,31 @@ function bindLeveldSelect(){
     })
 }
 
-bindCheckedSelect()
-//核查状态选择
-function bindCheckedSelect(){
-    $('.checkItem').on("click",function(){
-        const checkItemName = $(this).attr("data-name")
-        const checkItemItemId = $(this).attr("data-id")
-        checkStatusTemp =checkItemItemId
-        $('.selectCheck').html(checkItemName)
-        $(".checkList").css("display", "none")
-        $(".selectCheck").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
-        $('.selectCheck').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')
     })
 }
 
@@ -457,6 +570,10 @@ $('.selectDept').on("click", function(e){
     $(".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)
     const showList =  $(".deptList ").css("display")
     if(showList == "none" ||!showList){
         $(".deptList ").css("display","block")
@@ -830,6 +947,14 @@ $(".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
+})
 $(".doctorNumInp").on("input", function(e){
   const val = $(this).val().trim();
     doctorNumTemp = val
@@ -890,6 +1015,26 @@ $(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({
+        changeMonth: true,
+        changeYear: true,
+        dateFormat:"yy/mm/dd"
+    }).datepicker( "setDate","");
+    $( "#datepickerQc2" ).datepicker({
+        changeMonth: true,
+        changeYear: true,
+        dateFormat:"yy/mm/dd"
+    }).datepicker( "setDate","");
     getPageSet().then(res =>{
         $(".filter").click();   //初始查询
     })
@@ -961,9 +1106,13 @@ $(document).on("click", function(){
     $(".levelList ").css("display", "none")
     $(".deptList").css("display", "none")
     $(".checkList").css("display", "none")
+    $(".fpCheckList").css("display", "none")
+    $(".qcCheckList").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)
 })
 $(function($){
     $('.export').click(function(){
@@ -986,15 +1135,21 @@ $(function($){
             doctorId: doctorNum,    
             startDate: behosDateStart.replace(/\//g,'-'), //出院日期--开始时间
             endDate: behosDateEnd.replace(/\//g,'-'), //出院日期--结束时间
-
             casesEntryName: casesEntryName,           
             casesEntryId:casesId,
             isReject: isSingleReject,
             doctorName: doctorName,
             doctorId: doctorNum,
-            checkStatus: checkStatus?Number(checkStatus):checkStatus, //核查状态
             ascs:data_asc,     //升序
             descs:data_desc,       //降序
+            checkStatus: qcCheckStatus?Number(qcCheckStatus):qcCheckStatus, //病历核查状态
+            mrStatus: fpCheckStatus?Number(fpCheckStatus):fpCheckStatus,   //首页核查状态（1：已核查，0：未核查）
+            chName: qcCheckName,   //病历核查人员
+            mrName: fpCheckName,  //首页核查人员
+            chTimeStart: qcCheckDateStart.replace(/\//g,'-'), //病历核查起始时间
+            chTimeEnd: qcCheckDateEnd.replace(/\//g,'-'), //病历核查截止时间
+            mrTimeStart: fpCheckDateStart.replace(/\//g,'-'), //首页核查起始时间
+            mrTimeEnd: fpCheckDateEnd.replace(/\//g,'-'), //首页核查截止时间
         }
         expJson(api.unModifyMRPageExport,param).then(res =>{
             downloadExportedData(res.data, $(".partTitle").text()+".xls")

src/js/utils.js

@@ -40,7 +40,8 @@ const pageMap={
   'YH-BLZK-ZKPFYLZ':'qcListDocteam.html',
   'YH-ZKK-GJTMQXZB':'keyItemFlawControl.html',
   'YH-ZKK-CYRSTJ':'qcListOutHospital.html',
-  'YH-ZKK-WZGBLTJ': 'uncorrectedCasesStatistics.html'
+  'YH-ZKK-WZGBLTJ': 'uncorrectedCasesStatistics.html',
+  'YH-ZKK-31TZRYRS': 'readmission.html'
 };
 
 //重写assign方法

webpack.config.js

@@ -53,6 +53,7 @@ module.exports = {
     advice:path.resolve(__dirname, 'src/js', 'advice.js'),
     uncorrectedCasesStatistics:path.resolve(__dirname, 'src/js', 'uncorrectedCasesStatistics.js'),
     uccDetail:path.resolve(__dirname, 'src/js', 'uccDetail.js'),
+    readmission:path.resolve(__dirname, 'src/js', 'readmission.js'),
     vendor: 'lodash'// 多个页面所需的公共库文件，防止重复打包带入
   },
   output: {
@@ -611,7 +612,19 @@ module.exports = {
         collapseWhitespace: true //删除空白符与换行符
       }
     }),
-    
+    new HtmlWebpackPlugin({
+      title: 'readmission.html', //未整改病历统计_缺陷详情
+      template: path.resolve(__dirname, 'src/html', 'readmission.html'),
+      filename: 'readmission.html',
+      chunks: ['readmission', 'vendor', 'common'],
+      hash: true, //防止缓存
+      inject: true,
+      minify: {
+        removeAttributeQuotes: true, //压缩 去掉引号
+        removeComments: true, //移除HTML中的注释
+        collapseWhitespace: true //删除空白符与换行符
+      }
+    }),
     new CopyWebpackPlugin([
       {
         from:'src/resource',