Merge branch 'version1.3.5_zxc' into test

src/css/console.less

@@ -275,7 +275,7 @@ body.console {
       background-color: @activeColor;
       border: 1px solid @activeColor;
       color: @fstColor;
-      border-left: 0 none;
+      // border-left: 0 none;
       border-radius:0 4px 4px 0;
       overflow: hidden;
       box-sizing: border-box;

src/css/deptConsole.less

@@ -245,7 +245,7 @@ body.console {
       background-color: @activeColor;
       border: 1px solid @activeColor;
       color: @fstColor;
-      border-left: 0 none;
+      // border-left: 0 none;
       border-radius:0 4px 4px 0;
       overflow: hidden;
       box-sizing: border-box;

src/css/itemDefectDetail.less

@@ -0,0 +1,341 @@
+@import "./reset.less";
+.container{
+    width: 100%;
+    height: 100%;
+    overflow: auto;
+    background: #fff;
+}
+ul,li{
+    list-style: none;
+}
+.partTitle{
+    height: 54px;
+    border-bottom: 10px @disColor solid;
+}
+h2{
+    .h2;
+    border-bottom: 10px @disColor solid;
+    position: absolute;
+}
+.main-body{
+    .main-body-com;
+    border: none;
+    border-left:10px @disColor solid;
+    margin: 54px 0 0;
+    min-width: 1090px;
+    min-height: calc(100% - 84px);
+    // overflow: auto;
+}
+table{
+    .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;
+    }
+    
+}
+.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: @activeColor;
+}
+.filterBox{
+    position: relative;
+}
+.overAuto{
+    display: table;
+    padding-right: 20px;
+    width: 100%;
+}
+.toggle-item{
+    // display: none;
+}
+.filter-toggler{
+    position: absolute;
+    left: 1008px;
+    top: 8px;
+    color: #777;
+    font-size: 14px;
+    background: url("../images/arrow_up.png") 60px center no-repeat;
+    padding-right: 15px;
+    background-size: 10px 6px;
+    &.up{
+        background: url("../images/arrow_down.png") 60px center no-repeat;
+        background-size: 10px 6px;
+    }
+}
+.filterItem{
+    position: relative;
+    display: inline-block;
+    float: left;
+    height: 40px;
+    line-height: 40px;
+    margin: 0 20px 10px 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{
+    width: 120px;
+    // height: 200px;
+    li:hover{
+        background-color: #EEF4FF;
+        cursor: pointer;
+    }
+}
+.selectLevel,.selectDept{
+    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;
+    }
+}
+.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;
+}
+.selectDefect{
+    min-width: 120px;
+    width: auto;
+    color: #ccc;
+    display: inline-block;
+    position: relative;
+    padding: 0 10px;
+    height:32px;
+    border-radius:4px;
+    border: 1px solid #E2E5EF;
+    box-sizing: border-box;
+    cursor: default;
+}
+
+
+
+

src/css/qcList.less

@@ -104,6 +104,7 @@ table{
 .overAuto{
     display: table;
     padding-right: 20px;
+    width: 100%;
 }
 .toggle-item{
     display: none;

src/css/qcListDept.less

@@ -102,6 +102,7 @@ table{
 .overAuto{
     display: table;
     padding-right: 20px;
+    width: 100%;
 }
 .toggle-item{
     display: none;

src/css/qcListPerson.less

@@ -107,6 +107,7 @@ table{
 .overAuto{
     display: table;
     padding-right: 20px;
+    width: 100%;
 }
 .toggle-item{
     display: none;

src/css/tiaomu.less

@@ -258,6 +258,10 @@
         height: 101px !important;
     }
 }
+.goDetail{
+    cursor: pointer;
+    color: @activeColor;
+}
 
 .usrContain .selectReject,.usrContain .selectModuleType ,.managerContainer .selectModuleType  {
     float: right;

src/html/deptScoreDetail.html

@@ -12,10 +12,10 @@
     <div class="container deptScoreDetail">
         <div class="partTitle">
           <p><a href="deptConsole.html">控制台(科室) / </a>科室缺陷占比</p>
-          <div class="monthYear">
+          <!-- <div class="monthYear">
             <span class="mon">本月</span>
             <span class="year">本年</span>
-          </div> 
+          </div>  -->
           <div class="dateDetail fr">
             
           </div>

src/html/deptScoreDetailControl.html

@@ -12,10 +12,10 @@
     <div class="container deptScoreDetailControl">
         <div class="partTitle">
           <p><a href="console.html">控制台 / </a>各科室缺陷占比</p>
-          <div class="monthYear">
+          <!-- <div class="monthYear">
             <span class="mon">本月</span>
             <span class="year">本年</span>
-          </div> 
+          </div>  -->
           <div class="dateDetail fr">
             
           </div>

src/html/itemDefectDetail.html

@@ -0,0 +1,143 @@
+<!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">
+        <!-- <h2>质控评分</h2> -->
+        <div class="partTitle">
+            <p class="titlePic"></p>
+            <!-- <div class="monthYear">
+              <span class="mon">本月</span>
+              <span class="year">本年</span>
+            </div>  -->
+            <div class="dateDetail fr">
+              
+            </div>
+          </div>
+        <div class="main-body">
+            <div class="filterBox">
+                <div class="clearfix">
+                    <span class="filterItem typeFilter deptListWrap">
+                        <span>科室：</span>
+                        <span class="selectDept">
+                            全部
+                        </span>
+
+                        <ul class="deptList filterDropList"></ul>
+                    </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="filter">查询</span>
+                    <!-- <span class="export">导出</span> -->
+                    <span class="filterclear abnormalClear filterclearT">重置</span>
+                </div>
+                <a href="javascript:void(0);" class="filter-toggler down" 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>
+                        <span class="selectDefect"> 
+                        
+                        </span>
+                        <!-- <input class="doctorInp" 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>
+                </div>
+            </div>
+            <div class="overAuto">
+                <table>
+                    <thead>
+                    <!-- <tr>
+                        <td colspan="19" 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> -->
+                    <!-- <th class="textCenter" ></th> -->
+                    <!-- <th class="recordScoreOpera textCenter" style="width: 65px;">操作</th> -->
+                    <th class="beHospitalId textCenter" code="behospitalCode">病人住院序号</th>
+                    <th class="recordLevel textCenter" code="level">病历等级</th>
+                    <th class="recordScore textCenter" code="scoreRes">病历得分</th>
+                 
+                    <!-- <th class="patientNo textCenter" code="file_code">病案号</th> -->
+                    <th class="patientName textCenter" code="patName" style="width: 100px;">病人姓名</th>
+                    <th class="patientSex textCenter" code="sex">性别</th>
+                    <th class="patientage textCenter" code="age">年龄</th>
+                    <!-- <th class="bedNum textCenter" code="bed_code">床号</th> -->
+                    <!-- <th class="inHospitalDate textCenter" code="behospital_date">入院日期</th> -->
+                    <!-- <th class="placefileDate textCenter" code="placefile_date">归档日期</th> -->
+                    <!-- <th class="diagnose textCenter" code="diagnose">主诊断</th> -->
+                    <!-- <th class="doctorName textCenter" code="beh_doctor_name">住院医生</th> -->
+                    <!-- <th class="doctorName textCenter" code="doctor_name">主管医生</th> -->
+                    <!-- <th class="doctorName textCenter" code="director_doctor_name">主任医生</th> -->
+                    <th class="deptName textCenter" code="behDeptName">科室</th>
+                    <th class="outHospitalDate textCenter desc" code="leaveHospitalDate">出院日期</th>
+                    <!-- <th class="scoreTime textCenter" code="grade_time">评分时间</th> -->
+                    </thead>
+                    <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/jiaji.html

@@ -12,10 +12,10 @@
     <div class="container jiaji">
         <div class="partTitle">
           <p><a href="console.html">控制台 / </a>各科室甲级病历占比</p>
-          <div class="monthYear">
+          <!-- <div class="monthYear">
             <span class="mon">本月</span>
             <span class="year">本年</span>
-          </div> 
+          </div>  -->
           <div class="dateDetail fr">
             
           </div>

src/html/mukuai.html

@@ -13,10 +13,10 @@
     <div class="managerContainer mukuai">
         <div class="partTitle">
           <p><a href="deptConsole.html">控制台(科室) / </a>各模块缺陷占比</p>
-          <div class="monthYear">
+          <!-- <div class="monthYear">
             <span class="mon">本月</span>
             <span class="year">本年</span>
-          </div> 
+          </div>  -->
           <div class="dateDetail fr">
             
           </div>

src/html/mukuaiControl.html

@@ -13,10 +13,10 @@
     <div class="managerContainer mukuai">
         <div class="partTitle">
           <p><a href="console.html">控制台 / </a>各模块缺陷占比</p>
-          <div class="monthYear">
+          <!-- <div class="monthYear">
             <span class="mon">本月</span>
             <span class="year">本年</span>
-          </div> 
+          </div>  -->
           <div class="dateDetail fr">
             
           </div>

src/html/partDetail.html

@@ -12,10 +12,10 @@
     <div class="container partDetail">
         <div class="partTitle">
           <p><a href="deptConsole.html">控制台(科室) / </a>病案首页合格率占比</p>
-          <div class="monthYear">
+          <!-- <div class="monthYear">
             <span class="mon">本月</span>
             <span class="year">本年</span>
-          </div> 
+          </div>  -->
           <div class="dateDetail fr">
             
           </div>

src/html/partDetailControl.html

@@ -12,10 +12,10 @@
     <div class="container partDetailControl">
         <div class="partTitle">
           <p><a href="console.html">控制台 / </a>病案首页合格率占比</p>
-          <div class="monthYear">
+          <!-- <div class="monthYear">
             <span class="mon">本月</span>
             <span class="year">本年</span>
-          </div> 
+          </div>  -->
           <div class="dateDetail fr">
             
           </div>

src/html/singleVeto.html

@@ -13,10 +13,10 @@
     <div class="managerContainer tiaomu singleVeto">
         <div class="partTitle">
           <p class="pices"><a href="console.html">控制台 / </a><span>条目缺陷占比</span></p>
-          <div class="monthYear">
+          <!-- <div class="monthYear">
             <span class="mon">本月</span>
             <span class="year">本年</span>
-          </div> 
+          </div>  -->
           <div class="dateDetail fr">
             
           </div>

src/js/api.js

@@ -81,6 +81,8 @@ const api = {
     exportQcListDept:'/qc/behospitalInfo/exportQcresultByDept',//质控评分（科室）导出
     entryRejectPercent:'/console/entryRejectPercent',//单项否决占比
     qcResultLevelPercent:'/console/qcResultLevelPercent',//各科室甲乙丙级占比
+    qcResultDefectList:'/console/qcResultShortPage',//条目缺陷质控评分
+
     getQcListPageSet:'/sys/user/pageset/getPageSet',
     saveQcListPageSet:'/sys/user/pageset/savePageSet',
 }

src/js/console.js

@@ -122,21 +122,21 @@ $(function(){
 function getDetails(){
     $(".pubEchartB.paymoney .title").click(function(){
       focusMenuItem("YH-ZKK-GKSQXZB_XQ");
-      $(parent.document).find("#contentIframe").attr("src","./deptScoreDetailControl.html?from=1&dateType="+dateType+"&deptType="+deptType)
+      $(parent.document).find("#contentIframe").attr("src","./deptScoreDetailControl.html?from=1&dateType="+dateType+"&deptType="+deptType+"&startDateParam="+behosDateStart+"&endDateParam="+behosDateEnd)
     })
     $(".part02 .bingliLis").click(function(){
       focusMenuItem("YH-ZKK-GKSQXZB_XQ");
-      $(parent.document).find("#contentIframe").attr("src","./deptScoreDetailControl.html?from=1&dateType="+dateType)
+      $(parent.document).find("#contentIframe").attr("src","./deptScoreDetailControl.html?from=1&dateType="+dateType+"&startDateParam="+behosDateStart+"&endDateParam="+behosDateEnd)
     })
     $(".part03 .circle .title").click(function(){
       focusMenuItem("YH-ZKK-TMQXZB_XQ");
-      $(parent.document).find("#contentIframe").attr("src","./singleVeto.html?from=1&shijian="+dateType+"&qxName=&selectReject=1")
+      $(parent.document).find("#contentIframe").attr("src","./singleVeto.html?from=1&shijian="+dateType+"&qxName=&selectReject=1"+"&startDateParam="+behosDateStart+"&endDateParam="+behosDateEnd)
     })
     $(".part02").on("click",".bingli li.sec",function(){
       focusMenuItem("YH-BLZK-ZKPF");
       let dataC = $(this).attr("data-c")
       let chengdu = dataC == 1?'甲':dataC==2?'乙':'丙'
-      $(parent.document).find("#contentIframe").attr("src","./qcList.html?from=1&dateType="+dateType+"&chengdu="+chengdu)
+      $(parent.document).find("#contentIframe").attr("src","./qcList.html?from=1&dateType="+dateType+"&chengdu="+chengdu+"&startDateParam="+behosDateStart+"&endDateParam="+behosDateEnd)
     })
     $(".part03 .partTitlePub").click(function(){
         // if(hospital=="台州市立"){
@@ -147,7 +147,8 @@ function getDetails(){
         //     $(parent.document).find("#contentIframe").attr("src","./partDetailControl.html?from=1&dateType="+dateType)
         // }
         focusMenuItem("YH-ZKK-BASYHGLZB_XQ");
-        $(parent.document).find("#contentIframe").attr("src","./partDetailControl.html?from=1&dateType="+dateType+"&lineType="+lineType)
+
+        $(parent.document).find("#contentIframe").attr("src","./partDetailControl.html?from=1&dateType="+dateType+"&lineType="+lineType+"&startDateParam="+behosDateStart+"&endDateParam="+behosDateEnd)
     })
     $(".paymoney.pubEchart .title").click(function(){
         // if($(this).text().indexOf("花费")!==-1){
@@ -158,15 +159,15 @@ function getDetails(){
         //     $(parent.document).find("#contentIframe").attr("src","./dayDetail.html?from=1&dateType="+dateType)
         // }
         focusMenuItem("YH-ZKK-GKSQXZB_XQ");
-        $(parent.document).find("#contentIframe").attr("src","./deptScoreDetailControl.html?from=1&dateType="+dateType)
+        $(parent.document).find("#contentIframe").attr("src","./deptScoreDetailControl.html?from=1&dateType="+dateType+"&startDateParam="+behosDateStart+"&endDateParam="+behosDateEnd)
     })
     $(".defect .partTitlePub").click(function(){    //from 1 console / 2  deptConsole
         focusMenuItem("YH-ZKK-GMKQXZB_XQ");
-        $(parent.document).find("#contentIframe").attr("src","./mukuaiControl.html?from=1&dateType="+dateType)
+        $(parent.document).find("#contentIframe").attr("src","./mukuaiControl.html?from=1&dateType="+dateType+"&startDateParam="+behosDateStart+"&endDateParam="+behosDateEnd)
     })
     $(".circleB .title").click(function(){
         focusMenuItem("YH-ZKK-TMQXZB_XQ");
-        $(parent.document).find("#contentIframe").attr("src","./singleVeto.html?from=1&special=1&shijian="+dateType)
+        $(parent.document).find("#contentIframe").attr("src","./singleVeto.html?from=1&special=1&shijian="+dateType+"&startDateParam="+behosDateStart+"&endDateParam="+behosDateEnd)
     })
 }
 
@@ -1643,7 +1644,7 @@ function queList(data){
     $(".homegodetail").click(function(){
         let name = $(this).attr("data-name")
         focusMenuItem("YH-ZKK-TMQXZB_XQ");
-        $(parent.document).find("#contentIframe").attr("src","./singleVeto.html?from=1&special=1&shijian="+dateType+"&model="+name)
+        $(parent.document).find("#contentIframe").attr("src","./singleVeto.html?from=1&special=1&shijian="+dateType+"&model="+name+"&startDateParam="+behosDateStart+"&endDateParam="+behosDateEnd)
     })
 }
 //饼图列表注释渲染
@@ -1666,7 +1667,7 @@ function panDetail(data){
         let deptName = $(this).attr("data-dept")
         let deptId = $(this).attr("dept-id")
         focusMenuItem("YH-ZKK-TMQXZB_XQ");
-        $(parent.document).find("#contentIframe").attr("src","singleVeto.html?from=1&shijian="+dateType+"&qxName="+deptName)
+        $(parent.document).find("#contentIframe").attr("src","singleVeto.html?from=1&shijian="+dateType+"&qxName="+deptName+"&startDateParam="+behosDateStart+"&endDateParam="+behosDateEnd)
     })
 }
 function panDetailB(data){
@@ -1706,6 +1707,17 @@ $(".sureDate").click(function(){
     getBarData(dateType)
     getEveryDeptLevel()
     getHomeData('firstLevelPercent')
+    $(".monthYear .year").css({
+        "border-color":'#A5ADBF',
+        color:'#A5ADBF',
+        backgroundColor:'#203463'
+    })
+    $(".monthYear .mon").css({
+        "border-color":'#A5ADBF',
+        color:'#A5ADBF',
+        backgroundColor:'#203463'
+    })
+    dateType = 3
 })
 //日期联动
 function dateConsole(dateType){
@@ -1717,7 +1729,7 @@ function dateConsole(dateType){
     }else if(dateType == '2'){
         startDate = new Date(`${year}-01-01`)
     } else {
-        startDate = "-1m"
+        startDate = "-6d"
     }
     $( "#datepicker" ).datepicker({
         yearRange: "2015:"+year,

src/js/deptConsole.js

@@ -52,25 +52,25 @@ $(function(){
 function tiaomu(){
     $(".defect .partTitlePub").click(function(){
         focusMenuItem("YH-KSZR-GMKQXZB_XQ");
-        $(parent.document).find("#contentIframe").attr("src","mukuai.html?from=2&deptName="+curDept+"&dateType="+dateType)
+        $(parent.document).find("#contentIframe").attr("src","mukuai.html?from=2&deptName="+curDept+"&dateType="+dateType+"&startDateParam="+behosDateStart+"&endDateParam="+behosDateEnd)
     });
     $(".circleBSingle .title,.homePageNo .title").click(function(){
         focusMenuItem("YH-KSZR-TMQXZB_XQ");
-        $(parent.document).find("#contentIframe").attr("src","singleVeto.html?from=2&deptName="+curDept+"&shijian="+dateType)
+        $(parent.document).find("#contentIframe").attr("src","singleVeto.html?from=2&deptName="+curDept+"&shijian="+dateType+"&startDateParam="+behosDateStart+"&endDateParam="+behosDateEnd)
     });
     $(".homePage .title").click(function(){
         focusMenuItem("YH-KSZR-BASYHGLZB_XQ")
-        $(parent.document).find("#contentIframe").attr("src","partDetail.html?from=2&deptName="+curDept+"&dateType="+dateType)
+        $(parent.document).find("#contentIframe").attr("src","partDetail.html?from=2&deptName="+curDept+"&dateType="+dateType+"&startDateParam="+behosDateStart+"&endDateParam="+behosDateEnd)
     });
     $(".part02 .bingliLis").click(function(){
         focusMenuItem("YH-KSZR-KSQXZB_XQ");
-        $(parent.document).find("#contentIframe").attr("src","deptScoreDetail.html?from=2&deptName="+curDept+"&dateType="+dateType+"&curDeptId="+curDeptId)
+        $(parent.document).find("#contentIframe").attr("src","deptScoreDetail.html?from=2&deptName="+curDept+"&dateType="+dateType+"&curDeptId="+curDeptId+"&startDateParam="+behosDateStart+"&endDateParam="+behosDateEnd)
     });
     $(".part02").on("click",".bingli li.sec",function(){
         focusMenuItem("YH-BLZK-ZKPFKS");
         let dataC = $(this).attr("data-c")
         let chengdu = dataC == 1?'甲':dataC==2?'乙':'丙'
-        $(parent.document).find("#contentIframe").attr("src","./qcListDept.html?from=1&dateType="+dateType+"&chengdu="+chengdu+"&deptName="+curDept+"&deptId="+curDeptId)
+        $(parent.document).find("#contentIframe").attr("src","./qcListDept.html?from=1&dateType="+dateType+"&chengdu="+chengdu+"&deptName="+curDept+"&deptId="+curDeptId+"&startDateParam="+behosDateStart+"&endDateParam="+behosDateEnd)
     });
 }
 //判断有无某一权限
@@ -760,7 +760,7 @@ function queList(data){
     $(".homegodetail").click(function(){
         let name = $(this).attr("data-name")
         focusMenuItem("YH-KSZR-TMQXZB_XQ");
-        $(parent.document).find("#contentIframe").attr("src","./singleVeto.html?from=2&special=1&shijian="+dateType+"&model="+name)
+        $(parent.document).find("#contentIframe").attr("src","./singleVeto.html?from=2&special=1&shijian="+dateType+"&model="+name+"&startDateParam="+behosDateStart+"&endDateParam="+behosDateEnd)
     })
 }
 //饼图列表注释渲染
@@ -824,6 +824,17 @@ $(".sureDate").click(function(){
         return
     }
     getBarData(dateType)
+    dateType = 3
+    $(".monthYear .year").css({
+        "border-color":'#A5ADBF',
+        color:'#A5ADBF',
+        backgroundColor:'#203463'
+    })
+    $(".monthYear .mon").css({
+        "border-color":'#A5ADBF',
+        color:'#A5ADBF',
+        backgroundColor:'#203463'
+    })
 })
 //日期联动
 function dateConsole(dateType){

src/js/deptScoreDetail.js

@@ -15,16 +15,18 @@ const arrowRight = require("./../images/arrow_right.png")
 
 $(".selectLevel").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
 $(".selectDept").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
-let tabList = [], name = "", behospitalCode="", behosDateStart="", level="",behosDateEnd="", scoreSum = 0,statisticsType=2,deptList=[],
+let tabList = [], name = "", behospitalCode="", behosDateStart="", level="",behosDateEnd="", scoreSum = 0,statisticsType="",deptList=[],
   nameTemp = "", behospitalCodeTemp="",levelTemp="",curDeptId="", deptId="",deptIdTemp="", doctorName="", doctorNum="",doctorNameTemp="",doctorNumTemp="",
   data_desc=[],data_asc=[];
 $(function(){
     deptList = JSON.parse(getCookie("deptList"))||[]
     let srcUrl = $("#contentIframe",parent.document).attr("src")
     deptId = deptIdTemp = getUrlArgObjectNew("deptName",srcUrl)||""
-    statisticsType = getUrlArgObjectNew("dateType",srcUrl)||"2"
+    statisticsType = getUrlArgObjectNew("dateType",srcUrl)||""
     from = getUrlArgObjectNew("from",srcUrl)||"1"
     curDeptId = getUrlArgObjectNew("curDeptId",srcUrl)||""
+    let startDateParam = getUrlArgObjectNew("startDateParam",srcUrl)||""
+    let endDateParam = getUrlArgObjectNew("endDateParam",srcUrl)||""
     if(statisticsType == 1){
         $(".monthYear .mon").css({
             backgroundColor:'#00A1FF',
@@ -34,7 +36,7 @@ $(function(){
             backgroundColor:'#fff'
         })
         setDatePicker($("#datepicker"),$("#datepicker2"),1)
-    }else{
+    }else if(statisticsType == 2){
         $(".monthYear .year").css({
             backgroundColor:'#00A1FF',
             color:'#fff'
@@ -43,6 +45,13 @@ $(function(){
             backgroundColor:'#fff'
         })
         setDatePicker($("#datepicker"),$("#datepicker2"),2)
+    }else if(statisticsType == 3){
+        setDatePicker($("#datepicker"),$("#datepicker2"),3,new Date(startDateParam),new Date(endDateParam))
+    }else{
+        setDatePicker($("#datepicker"),$("#datepicker2"),"default")
+    }
+    if(!statisticsType){
+        setDatePicker($("#datepicker"),$("#datepicker2"),"default")
     }
     if(deptId){
         $(".selectDept").html(deptId).attr({
@@ -60,10 +69,10 @@ $(function(){
 
 
 $(".abnormalClear").click(function(){
-    deptId = deptIdTemp = deptList[0].deptName
-    curDeptId = deptList[0].deptId
+    deptId = deptIdTemp = deptList[0]&&deptList[0].deptName
+    curDeptId = deptIdTemp = deptList[0]&&deptList[0].deptId
     behospitalCode=behospitalCodeTemp = ""
-    setDatePicker($("#datepicker"),$("#datepicker2"),statisticsType||2)
+    setDatePicker($("#datepicker"),$("#datepicker2"),"default")
     $(".patientNumInp").val("")
     $(".selectDept").html(deptId).attr({
         "data-id":deptId,
@@ -158,10 +167,12 @@ function getTabData(activePage){
         "desc": "",
         "level": "",
         "name": behospitalCode||"",
-        "type": statisticsType||2,
+        "type": 0, //1-本月，2-本年,0-自定义时间（现在 都是自定义时间，都会传具体时间进去）
         "startDate":dateStatrt,
         "endDate":dateEnd
     }
+    startDateParam = dateStatrt
+    endDateParam = dateEnd
     post(api.levelStatisticsByDept,param).then(res =>{
         if(res.data.code == '0'){
             const data = res.data.data;
@@ -215,13 +226,13 @@ function renderTab(data,hisId,activePage){
     bindScoreDetail(hisId)
     $(".goHomeDetail").click(function(){
         let docName = $(this).attr("data-doc")
-        $(parent.document).find("#contentIframe").attr("src","quexianDetail.html?from=2&deptName="+deptIdTemp+"&docName="+docName+"&shijian="+statisticsType)
+        $(parent.document).find("#contentIframe").attr("src","quexianDetail.html?from=2&deptName="+deptIdTemp+"&docName="+docName+"&shijian=3"+"&startDateParam="+startDateParam+"&endDateParam="+endDateParam)
     })
     $(".goHomeDetailB").click(function(){
         let docName = $(this).attr("data-dept")
         let deptC = $(this).attr("data-c")
         focusMenuItem("YH-BLZK-ZKPFKS");
-        $(parent.document).find("#contentIframe").attr("src","qcListDept.html?from=2&deptName="+deptIdTemp+"&docName="+docName+"&shijian="+statisticsType+"&chengdu="+deptC+"&deptId="+curDeptId)
+        $(parent.document).find("#contentIframe").attr("src","qcListDept.html?from=2&deptName="+deptIdTemp+"&docName="+docName+"&shijian=3"+"&chengdu="+deptC+"&deptId="+curDeptId+"&startDateParam="+startDateParam+"&endDateParam="+endDateParam)
     })
 }
 

src/js/deptScoreDetailControl.js

@@ -15,12 +15,14 @@ const arrowRight = require("./../images/arrow_right.png")
 
 $(".selectLevel").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
 $(".selectDept").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
-let tabList = [], name = "", behospitalCode="", behosDateStart="", level="",behosDateEnd="", scoreSum = 0,statisticsType=2,deptType = "",
+let tabList = [], name = "", behospitalCode="", behosDateStart="", level="",behosDateEnd="", scoreSum = 0,statisticsType="",deptType = "",
   nameTemp = "", behospitalCodeTemp="",levelTemp="", deptId="",deptIdTemp="", doctorName="", doctorNum="",doctorNameTemp="",doctorNumTemp="",
   data_desc=[],data_asc=[],hospital=getCookie("hospital");
   let srcUrl = $("#contentIframe",parent.document).attr("src")
-  statisticsType = getUrlArgObjectNew("dateType",srcUrl)||"2"
+  statisticsType = getUrlArgObjectNew("dateType",srcUrl)||""
   deptType = getUrlArgObjectNew("deptType",srcUrl)||""
+  let startDateParam = getUrlArgObjectNew("startDateParam",srcUrl)||""
+  let endDateParam = getUrlArgObjectNew("endDateParam",srcUrl)||""
   if(hospital == '台州市立'){
     $(".deptListWrap").css("display","inline-block")
     $(".deptListWrap .selectDept").html(deptType?(deptType+'系统'):"全部").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
@@ -37,7 +39,7 @@ let tabList = [], name = "", behospitalCode="", behosDateStart="", level="",beho
           backgroundColor:'#fff'
       })
       setDatePicker($("#datepicker"),$("#datepicker2"),1)
-  }else{
+  }else if(statisticsType == 2){
       $(".monthYear .year").css({
           backgroundColor:'#00A1FF',
           color:'#fff'
@@ -46,9 +48,16 @@ let tabList = [], name = "", behospitalCode="", behosDateStart="", level="",beho
           backgroundColor:'#fff'
       })
       setDatePicker($("#datepicker"),$("#datepicker2"),2)
+  }else if(statisticsType == 3){
+    setDatePicker($("#datepicker"),$("#datepicker2"),3,new Date(startDateParam),new Date(endDateParam))
+  }else{
+    setDatePicker($("#datepicker"),$("#datepicker2"),"default")
+  }
+  if(!statisticsType){
+     setDatePicker($("#datepicker"),$("#datepicker2"),"default")
   }
 $(".abnormalClear").click(function(){
-    setDatePicker($("#datepicker"),$("#datepicker2"),statisticsType||2)
+    setDatePicker($("#datepicker"),$("#datepicker2"),"default")
     behospitalCode=behospitalCodeTemp = ""
     deptId =deptIdTemp= ""
     $(".selectDept").attr({'title':"全部",'data-id':''}).html("全部").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
@@ -122,7 +131,7 @@ function getTabData(activePage){
         "desc": "",
         "name": behospitalCode||"",
         "deptClass": deptId||'',
-        "type": statisticsType||2, //1-本月，2-本年
+        "type": 0, //1-本月，2-本年,0-自定义时间（现在 都是自定义时间，都会传具体时间进去）
         "startDate":dateStatrt,
         "endDate":dateEnd
     }
@@ -135,6 +144,8 @@ function getTabData(activePage){
     }else{
         return
     }
+    startDateParam = dateStatrt
+    endDateParam = dateEnd
     post(url,param).then(res =>{
         if(res.data.code == '0'){
             const data = res.data.data;
@@ -208,14 +219,14 @@ function renderTab(data,hisId,activePage){
     $(".goHomeDetailQuexian").click(function(){
         let deptName = $(this).attr("data-dept")
         // focusMenuItem("YH-ZKK-GKSQXZB_XQ");
-        $(parent.document).find("#contentIframe").attr("src","quexianDetailControl.html?deptName="+deptName+"&from=2"+"&shijian="+statisticsType)
+        $(parent.document).find("#contentIframe").attr("src","quexianDetailControl.html?deptName="+deptName+"&from=2"+"&shijian=3"+"&startDateParam="+startDateParam+"&endDateParam="+endDateParam)
     })
     $(".goHomeDetailB").click(function(){
         let deptName = $(this).attr("data-dept")
         let deptC = $(this).attr("data-c")
         let deptIds = $(this).attr("dept-id")
         focusMenuItem("YH-BLZK-ZKPF");
-        $(parent.document).find("#contentIframe").attr("src","qcList.html?deptName="+deptName+"&from=2"+"&shijian="+statisticsType+"&chengdu="+deptC+"&deptId="+deptIds)
+        $(parent.document).find("#contentIframe").attr("src","qcList.html?deptName="+deptName+"&from=2"+"&shijian=3&chengdu="+deptC+"&deptId="+deptIds+"&startDateParam="+startDateParam+"&endDateParam="+endDateParam)
     })
 }
 

src/js/itemDefectDetail.js

@@ -0,0 +1,636 @@
+const $ = require('jquery');
+require("../css/itemDefectDetail.less");
+require('./modal.js');
+const {api} = require('./api.js')
+const {post,getCookie,getUrlArgObjectNew,emptyBox,downloadExportedData,expJson} = 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  iconCalenBlue= require("./../images/icon_calen_blue.png")
+const  iconCalenGrey= require("./../images/icon_calen_grey.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 srcUrl = $("#contentIframe",parent.document).attr("src")
+let statisticsType = getUrlArgObjectNew("dateType",srcUrl)||getUrlArgObjectNew("shijian",srcUrl) || ""
+let chengdu = getUrlArgObjectNew("chengdu",srcUrl)||""
+let deptIdPram = getUrlArgObjectNew("deptId",srcUrl)||""
+let deptNamePram = getUrlArgObjectNew("deptName",srcUrl)||""
+let docName = getUrlArgObjectNew("docName",srcUrl)||""
+let startDateParam =  getUrlArgObjectNew("startDate",srcUrl)||""
+let endDateParam =  getUrlArgObjectNew("endDate",srcUrl)||""
+let defectName = getUrlArgObjectNew("defectName",srcUrl)||""
+
+$(".selectLevel").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
+$(".selectDept").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
+let tabList = [], name = "", behospitalCode="", behosDateStart="", level="",behosDateEnd="", scoreSum = 0,
+  nameTemp = "", behospitalCodeTemp="",levelTemp="", deptId="",deptIdTemp="",deptName="",deptNameTemp ="", doctorName="", doctorNum="",doctorNameTemp="",doctorNumTemp="",casesEntryName=""
+  data_desc=["leaveHospitalDate"],data_asc=[];
+if(chengdu){
+    levelTemp = chengdu
+    level = chengdu
+    $('.selectLevel').html(chengdu)
+    $(".levelList").css("display", "none")
+    $(".selectLevel").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
+}
+if(docName){
+    doctorNameTemp = docName
+    doctorName = docName
+    $('.doctorInp').val(docName)
+}
+if(defectName){
+    casesEntryName=defectName
+    $('.selectDefect').html(casesEntryName)
+}
+if(deptIdPram&&deptNamePram){
+    deptIdTemp = deptIdPram
+    deptId = deptIdPram
+    deptName = deptNamePram
+    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="下拉">`)
+}
+$('.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()
+})
+$('.recordScoreBtn').css("opacity",hasData('FUNC000017')?'1':'0.5')
+
+$("#filterToggler").click(function(){
+    const text = $(this).text();
+    $(".toggle-item").slideToggle();
+    $(this).text(text==="收起筛选"?"展开筛选":"收起筛选").toggleClass("up");
+});
+//判断有无某一权限
+  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 param = {
+        current:activePage,
+        behospitalCode: behospitalCode,
+        patName: name, //病人姓名
+        level:level,//病历等级
+        behDeptName: deptName,
+        ascs:data_asc,     //升序
+        descs:data_desc,       //降序
+        startDate: behosDateStart, //出院日期--开始时间
+        endDate: behosDateEnd, //出院日期--结束时间
+        casesEntryName: casesEntryName,
+        size: 15,
+    }
+    post(api.qcResultDefectList,param).then(res =>{
+        if(res.data.code == '0'){
+            const data = res.data.data;
+            tabList = data.records;
+            const totalPage = data.pages;
+            const totalNum = data.total;
+            renderTab(tabList,data.hospitalId);
+            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){
+    behosDateStart = $("#datepicker").val().trim()
+    behosDateEnd = $("#datepicker2").val().trim()
+    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)});
+        return
+    }
+    if(behosDateStart){
+        behosDateStart = behosDateStart.replace(/\//g,'-') + ' 00:00:00'
+    }
+    if(behosDateEnd){
+        behosDateEnd = behosDateEnd.replace(/\//g,'-') + ' 23:59:59'
+    }
+    console.log('deptNameTemp',deptNameTemp)
+    name = nameTemp
+    behospitalCode = behospitalCodeTemp
+    level = levelTemp==="全部"?"":levelTemp
+    deptId = deptIdTemp
+    deptName = deptNameTemp==="全部"?"":deptNameTemp 
+    doctorName = doctorNameTemp
+    doctorNum = doctorNumTemp
+    getTabData(1)
+})
+$(".abnormalClear").on("click", function(e){
+    tabList = []; 
+    name = ""; 
+    behospitalCode="";  
+    level=""; 
+    scoreSum = 0; 
+    nameTemp = "";  
+    behospitalCodeTemp=""; 
+    levelTemp="";  
+    deptId=""; 
+    deptIdTemp="";  
+    deptName="";
+    deptNameTmp="";
+    doctorName=""; 
+    doctorNum=""; 
+    doctorNameTemp=""; 
+    doctorNumTemp=""; 
+    data_desc=[]; 
+    data_asc=[];
+    $('.patientNumInp').val('')
+    $('.patientNameInp').val('')
+    $('.doctorInp').val('')
+    $('.doctorNumInp').val('')
+    $('.doctorInp').val('')
+    // $('#datepicker').val('')
+    // $('#datepicker2').val('')
+    //默认日期为近一个月
+    $( "#datepicker" ).datepicker({
+        changeMonth: true,
+        changeYear: true,
+        dateFormat:"yy/mm/dd",
+    }).datepicker( "setDate", "-6d");
+    $( "#datepicker2" ).datepicker({
+        changeMonth: true,
+        changeYear: true,
+        dateFormat:"yy/mm/dd"
+    }).datepicker( "setDate",new Date());
+    $('.selectDept ').html('全部')
+    $(".deptList").css("display", "none")
+    $(".selectDept").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
+    // $('.selectDept ').addClass('unSelect')
+    $('.selectLevel').html('全部')
+    $(".levelList").css("display", "none")
+    $(".selectLevel").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
+    // $('.selectLevel ').addClass('unSelect')
+    $("th[code]").removeClass("asc desc")
+    behosDateStart = $("#datepicker").val().trim()
+    behosDateEnd = $("#datepicker2").val().trim()
+    if(behosDateStart){
+        behosDateStart = behosDateStart.replace(/\//g,'-') + ' 00:00:00'
+    }
+    if(behosDateEnd){
+        behosDateEnd = behosDateEnd.replace(/\//g,'-') + ' 23:59:59'
+    }
+   
+    getTabData(1)
+})
+function renderTab(data,hisId){
+    let str = ``
+    let hasSelectAll = true;
+    if(data.length===0){
+      $('tbody').html(emptyBox())
+      return;
+    }
+    for(let i = 0; i < data.length; i++){
+        const item = data[i]
+        if(!item.hasSelect){
+            hasSelectAll = false
+        }
+        str += `
+            <tr  data-index=${i}>
+                <td >${item.behospitalCode || "-"}</td>
+                <td  class="textCenter">${item.level || "-"}</td>
+                <td  class="textCenter">${item.scoreRes || "-"}</td>
+                <td  class="textCenter"><span data-index=${i} class="patientNameSpan">${item.patName || "-"}<span></td>
+                <td  class="textCenter">${item.sex || "-"}</td>
+                <td  class="textCenter">${item.age || "-"}</td>
+                <td  class="textCenter">${item.behDeptName || "-"}</td>
+                <td  class="textCenter">${item.leaveHospitalDate&&item.leaveHospitalDate.slice(0,10)|| "-"}</td>
+            </tr>
+        `
+    }
+    if(data.length === 0){
+        hasSelectAll = false
+    }
+    if(hasSelectAll){
+        $('.scoreOpera img').attr("src" ,iconCheck)
+        $('.scoreOpera').attr("data-selectall",true)
+    }else{
+        $('.scoreOpera img').attr("src" ,iconUnCheck)
+        $('.scoreOpera').attr("data-selectall",false)
+    }
+    $('tbody').html(str)
+    bindScoreOperaItem()
+    bindRecordScoreOper()
+    bindScoreDetail(hisId)
+}
+
+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 index = $(this).attr("data-index")
+        const id = tabList[index].behospitalCode
+        const age = tabList[index].age;
+        const noScore = tabList[index].level == '未评分'
+        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].patName)
+        }
+       
+    })
+}
+
+//选择病历等级
+$('.selectLevel').on("click", function(e){
+    e.stopPropagation()
+    $(".deptList ").css("display", "none")
+    $(".selectDept .arrow").attr("src",iconDown)
+    const showList =  $(".levelList ").css("display")
+    if(showList == "none" ||!showList){
+        $(".levelList ").css("display","block")
+        $(".selectLevel .arrow").attr("src",iconUp)
+    }else{
+        $(".levelList ").css("display", "none")
+        $(".selectLevel .arrow").attr("src",iconDown)
+    }
+})
+
+bindLeveldSelect()
+//是否启用选择
+function bindLeveldSelect(){
+    $('.levelItem').on("click",function(){
+        const levelItemName = $(this).attr("data-name")
+        const levelItemItemId = $(this).attr("data-id")
+        levelTemp =levelItemItemId
+        $('.selectLevel').html(levelItemName)
+        $(".levelList").css("display", "none")
+        $(".selectLevel").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
+        $('.selectLevel').removeClass('unSelect')
+    })
+}
+
+//全选绑定
+bindOperaAll()
+function bindScoreOperaItem(){
+    $(".scoreOperaItem").on("click",  function(e){
+        const index = $(this).parent().attr("data-index")
+        tabList[index].hasSelect = tabList[index].hasSelect ? false:true
+        renderTab(tabList)
+    })
+}
+function bindRecordScoreOper(){
+    $(".recordScoreOperaBtn").on("click",  function(e){
+        if(!hasData('FUNC000017')){
+            return
+        }
+        const index = $(this).parent().attr("data-index")
+        const behospitalCode = tabList[index].behospitalCode
+        loading()
+        recordScore(behospitalCode,1,true)
+    })
+}
+function bindOperaAll(){
+    $('.scoreOpera').on("click", function(e){
+        const hasSelectAll = $('.scoreOpera').attr("data-selectall")
+        if(hasSelectAll == 'true'){
+
+            for(let i = 0; i < tabList.length; i++){
+                tabList[i].hasSelect = false
+            }
+        }else{
+            for(let i = 0; i < tabList.length; i++){
+                tabList[i].hasSelect = true
+            }
+        }
+        renderTab(tabList)
+    })
+}
+
+$('.selectDept').on("click", function(e){
+    e.stopPropagation()
+    $(".levelList ").css("display","none")
+    $(".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 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
+        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()
+}
+$('.recordScoreBtn').on("click",function(e){
+    if(!hasData('FUNC000017')){
+        return
+    }
+    let scoreList = []
+    for(let i = 0; i <tabList.length; i++){
+        if(tabList[i].hasSelect){
+            scoreList.push(tabList[i].behospitalCode)
+        }
+    }
+    if(scoreList.length === 0){
+        $.alerModal({"message":'请选择要评分的项！',type:"tip",time:'1000',isFather: true, fatherWrapper: $("#mainBox", parent.document)});
+        return
+    } else{
+        loading()
+        for(let j = 0; j < scoreList.length; j++){
+            recordScore(scoreList[j],scoreList.length,true)
+        }
+    }
+})
+$("th[code]").on("click",function(e){
+    const code=$(this).attr("code");
+    if(data_asc[0]===code){
+      data_desc=[code];
+      data_asc=[];
+      $("th[code]").removeClass("asc desc");
+      $(this).addClass("desc");
+    }else{
+      data_desc=[];
+      data_asc=[code];
+      $("th[code]").removeClass("asc desc");
+      $(this).addClass("asc");
+    }
+    getTabData(1);
+    // console.log(code)
+});
+function recordScore(behospitalCode,totalNum,hasToast){
+    const param = {
+        behospitalCode: behospitalCode
+    }
+    post(api.recordScore,param).then(res =>{
+        if(res.data.code == '0'){
+            scoreSum++
+            if(scoreSum === totalNum){
+                hideLoading()
+                scoreSum = 0
+                const activePage = $(".activePage").attr('data-page') || 1
+
+                getTabData(activePage)
+                if(hasToast){
+                  $.alerModal({"message":'评分成功',type:"tip",time:'1000',isFather: true, fatherWrapper: $("#mainBox", parent.document)});
+                }
+            }
+            
+        }else{
+            hideLoading()
+            if(hasToast){
+                $.alerModal({"message":'评分失败',type:"tip",time:'1000',isFather: true, fatherWrapper: $("#mainBox", parent.document)});
+            }
+        }
+    }).catch((e) =>{
+        hideLoading()
+        if(hasToast){
+            $.alerModal({"message":'评分失败',type:"tip",time:'1000',isFather: true, fatherWrapper: $("#mainBox", parent.document)});
+        }
+    })
+}
+$(".patientNumInp").on("input", function(e){
+    const val = $(this).val().trim()
+    behospitalCodeTemp = val
+})
+$(".patientNameInp").on("input", function(e){
+    const val = $(this).val().trim()
+    nameTemp = val
+})
+$(".doctorInp").on("input", function(e){
+    const val = $(this).val().trim()
+    doctorNameTemp = val
+})
+$(".doctorNumInp").on("input", function(e){
+  const val = $(this).val().trim();
+    doctorNumTemp = val
+})
+$(function() {
+    $.datepicker.regional['zh-CN'] = {
+    clearText: '清除',
+    clearStatus: '清除已选e799bee5baa6e59b9ee7ad9431333361303131日期',
+    closeText: '关闭',
+    closeStatus: '不改变当前选择',
+    prevText: '<上月',
+    prevStatus: '显示上月',
+    prevBigText: '<<',
+    prevBigStatus: '显示上一年',
+    nextText: '下月>',
+    nextStatus: '显示下月',
+    nextBigText: '>>',
+    nextBigStatus: '显示下一年',
+    currentText: '今天',
+    currentStatus: '显示本月',
+    monthNames: ['一月','二月','三月','四月','五月','六月', '七月','八月','九月','十月','十一月','十二月'],
+    monthNamesShort: ['一月','二月','三月','四月','五月','六月', '七月','八月','九月','十月','十一月','十二月'],
+    yearNamesShort: ['一月','二月','三月','四月','五月','六月', '七月','八月','九月','十月','十一月','十二月'],
+    monthStatus: '选择月份',
+    yearStatus: '选择年份',
+    weekHeader: '周',
+    weekStatus: '年内周次',
+    dayNames: ['星期日','星期一','星期二','星期三','星期四','星期五','星期六'],
+    dayNamesShort: ['周日','周一','周二','周三','周四','周五','周六'],
+    dayNamesMin: ['日','一','二','三','四','五','六'],
+    dayStatus: '设置 DD 为一周起始',
+    dateStatus: '选择 m月 d日, DD',
+    dateFormat: 'yy-mm-dd',
+    firstDay: 1,
+    initStatus: '请选择日期',
+    isRTL: false};
+    $.datepicker.setDefaults($.datepicker.regional['zh-CN']);
+    let startDate = "", endDate=new Date()
+    let year = new Date().getFullYear()
+    let month = new Date().getMonth() + 1
+    if(statisticsType == '1'){
+        startDate = new Date(`${year}-${month}-01`)
+    }else if(statisticsType == '2'){
+        startDate = new Date(`${year}-01-01`)
+    } else {
+        startDate =new Date(startDateParam)
+        endDate = new Date(endDateParam) || new Date()
+    }
+    $( "#datepicker" ).datepicker({
+        changeMonth: true,
+        changeYear: true,
+        dateFormat:"yy/mm/dd",
+    }).datepicker( "setDate", startDate);
+    $( "#datepicker2" ).datepicker({
+        changeMonth: true,
+        changeYear: true,
+        dateFormat:"yy/mm/dd"
+    }).datepicker( "setDate",endDate);
+    $(".filter").click();   //初始查询
+    $(".partTitle .titlePic ").html(`<a class="consoleD" href="console.html">控制台 / </a><a class="consoleP" href="singleVeto.html">条目缺陷占比 / </a>缺陷详情`)
+    $(".partTitle .consoleD").click(function(){
+        $(".menu .page",parent.document).removeClass("active").eq(0).addClass("active");
+        $(".container",parent.document).addClass("console-cont");
+    })
+});
+
+//分页渲染
+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)
+        }
+    })
+    
+}
+
+$(document).on("click", function(){
+    $(".levelList ").css("display", "none")
+    $(".deptList").css("display", "none")
+    $(".selectLevel .arrow").attr("src",iconDown)
+    
+})
+$((function($){
+
+    $('.export').click(function(){
+        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
+        }
+        const param = {
+            "behospitalCode": behospitalCode,
+            "deptId": deptId,
+            "doctorCode":doctorNum,
+            "doctorName": doctorName,
+            "leaveHosDateEnd": '2020-04-03 00:00:00'||behosDateEnd,
+            "leaveHosDateStart": '2020-04-01 00:00:00'||behosDateStart,
+            "level": 2||level,
+            "name": name
+        }
+        expJson(api.exportQcList,param).then(res =>{
+            downloadExportedData(res.data, behosDateStart.slice(0,10).replace(/-/g,"")+"-"+behosDateEnd.slice(0,10).replace(/-/g,"")+"抽查住院病历质量情况.xls")
+        })
+      
+    })
+})($));

src/js/jiaji.js

@@ -17,7 +17,7 @@ const arrowRight = require("./../images/arrow_right.png")
 
 $(".selectLevel").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
 $(".selectDept").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
-let tabList = [], name = "", behospitalCode="", behosDateStart="", level="",behosDateEnd="", scoreSum = 0,statisticsType=2,
+let tabList = [], name = "", behospitalCode="", behosDateStart="", level="",behosDateEnd="", scoreSum = 0,statisticsType="",
   nameTemp = "", behospitalCodeTemp="",levelTemp="", deptId="",deptIdTemp="", doctorName="", doctorNum="",doctorNameTemp="",doctorNumTemp="",
   data_desc=[],data_asc=[];
 let srcUrl = $("#contentIframe",parent.document).attr("src")
@@ -32,7 +32,7 @@ if(statisticsType == 1){
         backgroundColor:'#fff'
     })
     setDatePicker($("#datepicker"),$("#datepicker2"),1)
-}else{
+}else if(statisticsType == 2){
     $(".monthYear .year").css({
         backgroundColor:'#00A1FF',
         color:'#fff'
@@ -41,10 +41,12 @@ if(statisticsType == 1){
         backgroundColor:'#fff'
     })
     setDatePicker($("#datepicker"),$("#datepicker2"),2)
+} else{
+    setDatePicker($("#datepicker"),$("#datepicker2"),"default")
 }
 $(".abnormalClear").click(function(){
     behospitalCode =behospitalCodeTemp= ""
-    setDatePicker($("#datepicker"),$("#datepicker2"),statisticsType||2)
+    setDatePicker($("#datepicker"),$("#datepicker2"),"default")
     $(".patientNumInp").val("")
     getTabData(1)
 })
@@ -121,7 +123,7 @@ function getTabData(activePage){
         current:activePage,
         size: 15,
         name: behospitalCode||"",
-        type: statisticsType||2, //1-本月，2-本年
+        type: 0, //1-本月，2-本年,0-自定义时间（现在 都是自定义时间，都会传具体时间进去）
         dateType: level||"",//(3-上月，4-去年本月，5-去年(必填))
         "startDate":dateStatrt,
         "endDate":dateEnd

src/js/mukuai.js

@@ -12,7 +12,7 @@ const arrowLeft= require("./../images/arrow_left.png")
 const arrowRight = require("./../images/arrow_right.png")
 
 
-let casesId="", name="", isReject ="2", isUsed ="",casesIdTemp="", nameTemp="", isRejectTemp ="2", isUsedTemp ="",from="",deptIdTemp="",deptItemId="",deptId=""
+let casesId="", name="", isReject ="", isUsed ="",casesIdTemp="", nameTemp="", isRejectTemp ="", isUsedTemp ="",from="",deptIdTemp="",deptItemId="",deptId=""
 $(".selectModuleType").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
 $(".selectReject").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
 $(".selectDept").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
@@ -21,10 +21,12 @@ let deptList = JSON.parse(getCookie("deptList"))||[]
 $(function(){
     dateChange()
     let srcUrl = $("#contentIframe",parent.document).attr("src")
-    isReject = getUrlArgObjectNew("dateType",srcUrl)||2
+    isReject = getUrlArgObjectNew("dateType",srcUrl)||""
     deptId = deptIdTemp = getUrlArgObjectNew("deptName",srcUrl)||""
     from = getUrlArgObjectNew("from",srcUrl)||""
     name =nameTemp = getUrlArgObjectNew("name",srcUrl)||""
+    let startDateParam = getUrlArgObjectNew("startDateParam",srcUrl)||""
+    let endDateParam = getUrlArgObjectNew("endDateParam",srcUrl)||""
     if(name){
         $(".moduleItemInp").val(name)
     }
@@ -37,7 +39,7 @@ $(function(){
             backgroundColor:'#fff'
         })
         setDatePicker($("#datepicker"),$("#datepicker2"),1)
-    }else{
+    }else if(isReject == 2){
         $(".monthYear .year").css({
             backgroundColor:'#00A1FF',
             color:'#fff'
@@ -46,7 +48,15 @@ $(function(){
             backgroundColor:'#fff'
         })
         setDatePicker($("#datepicker"),$("#datepicker2"),2)
+    }else if(isReject == 3){
+        setDatePicker($("#datepicker"),$("#datepicker2"),3,new Date(startDateParam),new Date(endDateParam))
+    }else{
+        setDatePicker($("#datepicker"),$("#datepicker2"),"default")
+    }
+    if(!isReject){
+        setDatePicker($("#datepicker"),$("#datepicker2"),"default")
     }
+
     if(deptId){
         $(".selectDept").html(deptId).attr({
             "data-id":deptId,
@@ -62,8 +72,8 @@ $(function(){
         $(".container",parent.document).addClass("console-cont");
     })
     $(".abnormalClear").click(function(){
-        setDatePicker($("#datepicker"),$("#datepicker2"),isReject||2)
-        deptId =deptIdTemp= deptList[0].deptName
+        setDatePicker($("#datepicker"),$("#datepicker2"),"default")
+        deptId =deptIdTemp= deptList[0]&&deptList[0].deptName
         name = ""
         $(".patientNumInp").val("")
         $(".selectDept").html(deptId).attr({
@@ -177,13 +187,16 @@ function getTabData(activePage){
     }
     const param = {
         current:activePage,
-        type: isReject,
+        type: 0, //1-本月，2-本年,0-自定义时间（现在 都是自定义时间，都会传具体时间进去）
         name: name, //条目名
         deptName: deptId||(deptList.length>0?deptList[0].deptName:''), //科室名
         size: 15,
         "startDate":dateStatrt,
         "endDate":dateEnd
     }
+
+    startDateParam = dateStatrt
+    endDateParam = dateEnd
     post(from == 1?api.entryCountGroupByCasePage:api.entryCountGroupByCaseAndDeptPage,param).then(res =>{
         if(res.data.code == '0'){
             const data = res.data.data.records
@@ -277,7 +290,7 @@ function renderTab(data,activePage){
     $(".goHomeDetail").click(function(){
         let model = $(this).attr("data-model")
         focusMenuItem("YH-KSZR-TMQXZB_XQ");
-        $(parent.document).find("#contentIframe").attr("src","./singleVeto.html?from=2&special=1&model="+model+"&shijian="+isReject)
+        $(parent.document).find("#contentIframe").attr("src","./singleVeto.html?from=2&special=1&model="+model+"&shijian=3"+"&startDateParam="+startDateParam+"&endDateParam="+endDateParam)
     })
 }
 

src/js/mukuaiControl.js

@@ -12,7 +12,7 @@ const arrowLeft= require("./../images/arrow_left.png")
 const arrowRight = require("./../images/arrow_right.png")
 
 
-let casesId="", name="", isReject ="2", isUsed ="",casesIdTemp="", nameTemp="", isRejectTemp ="2", isUsedTemp ="",from="",deptIdTemp="",deptItemId="",deptId="",data_asc=[], data_desc=['percentStr']    
+let casesId="", name="", isReject ="", isUsed ="",casesIdTemp="", nameTemp="", isRejectTemp ="", isUsedTemp ="",from="",deptIdTemp="",deptItemId="",deptId="",data_asc=[], data_desc=['percentStr'],startDateParam="", endDateParam=""   
 
 $(".selectModuleType").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
 $(".selectReject").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
@@ -23,9 +23,11 @@ $(function(){
     dateChange()
     let srcUrl = $("#contentIframe",parent.document).attr("src")
     // deptName = getUrlArgObjectNew("deptName",srcUrl)||""
-    isRejectTemp = isReject = getUrlArgObjectNew("dateType",srcUrl)||"2"
+    isRejectTemp = isReject = getUrlArgObjectNew("dateType",srcUrl)||""
     from = getUrlArgObjectNew("from",srcUrl)||""
     name =nameTemp = getUrlArgObjectNew("name",srcUrl)||""
+    let startDateParam = getUrlArgObjectNew("startDateParam",srcUrl)||""
+    let endDateParam = getUrlArgObjectNew("endDateParam",srcUrl)||""
     if(name){
         $(".moduleItemInp").val(name)
     }
@@ -37,7 +39,7 @@ $(function(){
     })
     $(".abnormalClear").click(function(){
         // window.location.reload()
-        setDatePicker($("#datepicker"),$("#datepicker2"),isReject||2)
+        setDatePicker($("#datepicker"),$("#datepicker2"),"default")
         name=nameTemp = ""
         data_asc=[],
         data_desc=['percentStr']
@@ -56,7 +58,7 @@ $(function(){
             backgroundColor:'#fff'
         })
         setDatePicker($("#datepicker"),$("#datepicker2"),1)
-    }else{
+    }else if(isReject == 2){
         $(".monthYear .year").css({
             backgroundColor:'#00A1FF',
             color:'#fff'
@@ -65,8 +67,15 @@ $(function(){
             backgroundColor:'#fff'
         })
         setDatePicker($("#datepicker"),$("#datepicker2"),2)
+    } else if(isReject == 3){
+        setDatePicker($("#datepicker"),$("#datepicker2"),3,new Date(startDateParam),new Date(endDateParam))
+    }else{
+        setDatePicker($("#datepicker"),$("#datepicker2"),"default")
+    }
+    if(!isReject){
+        console.log("isRejectisRejectisReject")
+        setDatePicker($("#datepicker"),$("#datepicker2"),"default")
     }
-    
     getTabData(1)//条目缺陷
 })
 function focusMenuItem(code){
@@ -189,7 +198,7 @@ function getTabData(activePage){
     }
     const param = {
         current:activePage,
-        type: isReject,
+        type: 0,
         name: name, //条目名
         deptName: deptId, //科室名
         size: 15,
@@ -198,6 +207,8 @@ function getTabData(activePage){
         "startDate":dateStatrt,
         "endDate":dateEnd
     }
+    startDateParam=dateStatrt
+    endDateParam=dateEnd
     post(from == 1?api.entryCountGroupByCasePage:api.entryCountGroupByCaseAndDeptPage,param).then(res =>{
         if(res.data.code == '0'){
             const data = res.data.data.records
@@ -292,7 +303,7 @@ function renderTab(data,activePage){
         let model = $(this).attr("data-model")
         focusMenuItem("YH-ZKK-TMQXZB_XQ");
         // $(parent.document).find("#contentIframe").attr("src","quexianDetailControlHome.html?deptName="+deptName+"&from=1&casesId=243"+"&shijian="+statisticsType+"&ruleType="+ruleType)
-        $(parent.document).find("#contentIframe").attr("src","./singleVeto.html?from=1&special=1&model="+model+"&shijian="+isReject)
+        $(parent.document).find("#contentIframe").attr("src","./singleVeto.html?from=1&special=1&model="+model+"&shijian=3&startDateParam="+startDateParam+"&endDateParam="+endDateParam)
     })
 }
 

src/js/partDetail.js

@@ -17,14 +17,16 @@ const arrowRight = require("./../images/arrow_right.png")
 
 $(".selectLevel").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
 $(".selectDept").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
-let tabList = [], name = "", behospitalCode="", behosDateStart="", level="",behosDateEnd="", scoreSum = 0,statisticsType=2,
+let tabList = [], name = "", behospitalCode="", behosDateStart="", level="",behosDateEnd="", scoreSum = 0,statisticsType="",
   nameTemp = "", behospitalCodeTemp="",levelTemp="", deptId="",deptIdTemp="", doctorName="", doctorNum="",doctorNameTemp="",doctorNumTemp="",
   data_desc='',data_asc='';
 let deptList = JSON.parse(getCookie("deptList"))||[]
 $(function(){
     let srcUrl = $("#contentIframe",parent.document).attr("src")
-    statisticsType = getUrlArgObjectNew("dateType",srcUrl)||2
+    statisticsType = getUrlArgObjectNew("dateType",srcUrl)||""
     deptId = deptIdTemp = getUrlArgObjectNew("deptName",srcUrl)||""
+    let startDateParam = getUrlArgObjectNew("startDateParam",srcUrl)||""
+    let endDateParam = getUrlArgObjectNew("endDateParam",srcUrl)||""
     if(statisticsType == 1){
         $(".monthYear .mon").css({
             backgroundColor:'#00A1FF',
@@ -34,7 +36,7 @@ $(function(){
             backgroundColor:'#fff'
         })
         setDatePicker($("#datepicker"),$("#datepicker2"),1)
-    }else{
+    }else if(statisticsType == 2){
         $(".monthYear .year").css({
             backgroundColor:'#00A1FF',
             color:'#fff'
@@ -43,6 +45,13 @@ $(function(){
             backgroundColor:'#fff'
         })
         setDatePicker($("#datepicker"),$("#datepicker2"),2)
+    }else if(statisticsType == 3){
+        setDatePicker($("#datepicker"),$("#datepicker2"),3,new Date(startDateParam),new Date(endDateParam))
+    }else{
+        setDatePicker($("#datepicker"),$("#datepicker2"),"default")
+    }
+    if(!statisticsType){
+        setDatePicker($("#datepicker"),$("#datepicker2"),"default")
     }
     if(deptId){
         $(".selectDept").html(deptId).attr({
@@ -56,9 +65,9 @@ $(function(){
 })
 
 $(".abnormalClear").click(function(){
-    deptId=deptIdTemp = deptList[0].deptName
+    deptId=deptIdTemp = deptList[0]&&deptList[0].deptName
     behospitalCode=behospitalCodeTemp = ""
-    setDatePicker($("#datepicker"),$("#datepicker2"),statisticsType||2)
+    setDatePicker($("#datepicker"),$("#datepicker2"),"default")
     $(".patientNumInp").val("")
     $(".selectDept").html(deptId).attr({
         "data-id":deptId,
@@ -172,10 +181,12 @@ function getTabData(activePage){
         "desc": data_desc,
         "deptName": deptId||"",
         "name": behospitalCode||"",
-        "type": statisticsType||2, //1-本月，2-本年
+        "type": 0, //1-本月，2-本年,0-自定义时间（现在 都是自定义时间，都会传具体时间进去）
         "startDate":dateStatrt,
         "endDate":dateEnd
     }
+   startDateParam = dateStatrt
+   endDateParam = dateEnd
     post(api.homePageLevelByDeptLimit,param).then(res =>{
         if(res.data.code == '0'){
             const data = res.data.data||[];
@@ -226,7 +237,7 @@ function renderTab(data,hisId,activePage){
     $(".goHomeDetail").click(function(){
         let docName = $(this).attr("data-doc")
         let ruleType = $(this).attr("data-ruleType")
-        $(parent.document).find("#contentIframe").attr("src","quexianDetailHome.html?from=1&casesId=243&deptName="+deptIdTemp+"&docName="+docName+"&shijian="+statisticsType+"&ruleType="+ruleType)
+        $(parent.document).find("#contentIframe").attr("src","quexianDetailHome.html?from=1&casesId=243&deptName="+deptIdTemp+"&docName="+docName+"&shijian=3"+"&ruleType="+ruleType+"&startDateParam="+startDateParam+"&endDateParam="+endDateParam)
     })
 }
 

src/js/partDetailControl.js

@@ -14,13 +14,15 @@ const arrowLeft= require("./../images/arrow_left.png")
 const arrowRight = require("./../images/arrow_right.png")
 $(".selectLevel").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
 $(".selectDept").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
-let tabList = [], name = "", behospitalCode="", behosDateStart="", level="",behosDateEnd="", scoreSum = 0,statisticsType=2,
+let tabList = [], name = "", behospitalCode="", behosDateStart="", level="",behosDateEnd="", scoreSum = 0,statisticsType="",
   nameTemp = "", behospitalCodeTemp="",levelTemp="", deptId="",deptIdTemp="", doctorName="", doctorNum="",doctorNameTemp="",doctorNumTemp="",
   data_desc="",data_asc="";
   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)||""
   data_desc = (lineType == "合格率")?"firstLevelPercent":(lineType=="完整率"?"emptyPercent":"errorPercent")
   if(lineType){
         $("th[code="+data_desc+"]").addClass("desc");
@@ -35,7 +37,7 @@ let tabList = [], name = "", behospitalCode="", behosDateStart="", level="",beho
           backgroundColor:'#fff'
       })
       setDatePicker($("#datepicker"),$("#datepicker2"),1)
-  }else{
+  }else if(statisticsType == 2){
       $(".monthYear .year").css({
           backgroundColor:'#00A1FF',
           color:'#fff'
@@ -44,11 +46,18 @@ let tabList = [], name = "", behospitalCode="", behosDateStart="", level="",beho
           backgroundColor:'#fff'
       })
       setDatePicker($("#datepicker"),$("#datepicker2"),2)
+  }else if(statisticsType == 3){
+    setDatePicker($("#datepicker"),$("#datepicker2"),3,new Date(startDateParam),new Date(endDateParam))
+  }else{
+    setDatePicker($("#datepicker"),$("#datepicker2"),'default')
+  }
+  if(!statisticsType){
+    setDatePicker($("#datepicker"),$("#datepicker2"),'default')
   }
 $(".abnormalClear").click(function(){
     data_desc=""
     data_asc=""
-    setDatePicker($("#datepicker"),$("#datepicker2"),statisticsType||2)
+    setDatePicker($("#datepicker"),$("#datepicker2"),"default")
     $(".patientNumInp").val("")
     behospitalCode =behospitalCodeTemp= ""
     getTabData(1)
@@ -118,10 +127,12 @@ function getTabData(activePage){
         "name": behospitalCode||"",
         "asc":data_asc,     //升序
         "desc":data_desc,       //降序
-        "type": statisticsType||2, //1-本月，2-本年
+        "type": 0, //1-本月，2-本年,0-自定义时间（现在所有都是自定义时间，都会传开始日期和结束日期）
         "startDate":dateStatrt,
         "endDate":dateEnd
     }
+    startDateParam = dateStatrt
+    endDateParam = dateEnd
     post(api.homePageLevelStatistics,param).then(res =>{
         if(res.data.code == '0'){
             const data = res.data.data||[];
@@ -173,7 +184,7 @@ function renderTab(data,hisId,activePage){
     $(".goHomeDetail").click(function(){
         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="+statisticsType+"&ruleType="+ruleType)
+        $(parent.document).find("#contentIframe").attr("src","quexianDetailControlHome.html?deptName="+deptName+"&from=1&casesId=243"+"&shijian=3"+"&ruleType="+ruleType+"&startDateParam="+startDateParam+"&endDateParam="+endDateParam)
     })
 }
 

src/js/qcList.js

@@ -26,7 +26,8 @@ let chengdu = getUrlArgObjectNew("chengdu",srcUrl)||""
 let deptIdPram = getUrlArgObjectNew("deptId",srcUrl)||""
 let deptNamePram = getUrlArgObjectNew("deptName",srcUrl)||""
 let docName = getUrlArgObjectNew("docName",srcUrl)||""
-
+let startDateParam = getUrlArgObjectNew("startDateParam",srcUrl)||""
+let endDateParam = getUrlArgObjectNew("endDateParam",srcUrl)||""
 $(".selectLevel").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
 $(".selectDept").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
 let tabList = [], name = "", behospitalCode="", behosDateStart="", level="",behosDateEnd="", scoreSum = 0,
@@ -762,7 +763,10 @@ $(function() {
         startDate = new Date(`${year}-${month}-01`)
     }else if(statisticsType == '2'){
         startDate = new Date(`${year}-01-01`)
-    } else {
+    } else if(statisticsType == '3') {
+        startDate = new Date(startDateParam)
+        endDate =  new Date(endDateParam)
+    }else{
         startDate = "-6d"
     }
     $( "#datepicker" ).datepicker({

src/js/qcListDept.js

@@ -29,6 +29,8 @@ let chengdu = getUrlArgObjectNew("chengdu",srcUrl)||""
 let deptIdPram = getUrlArgObjectNew("deptId",srcUrl)||""
 let deptNamePram = getUrlArgObjectNew("deptName",srcUrl)||""
 let docName = getUrlArgObjectNew("docName",srcUrl)||""
+let startDateParam = getUrlArgObjectNew("startDateParam",srcUrl)||""
+let endDateParam = getUrlArgObjectNew("endDateParam",srcUrl)||""
 let tabList = [], name = "", behospitalCode="", behosDateStart="", level="",behosDateEnd="", scoreSum = 0,nameTemp = "",
   behospitalCodeTemp="",levelTemp="", deptId="",deptIdTemp="", doctorName="", doctorNameTemp="", doctorNum="", doctorNumTemp="",data_desc=["leave_hospital_date"],data_asc=[];
 
@@ -757,7 +759,10 @@ $(function() {
         startDate = new Date(`${year}-${month}-01`)
     }else if(statisticsType == '2'){
         startDate = new Date(`${year}-01-01`)
-    } else {
+    } else if(statisticsType == '3') {
+        startDate = new Date(startDateParam)
+        endDate =  new Date(endDateParam)
+    }else{
         startDate = "-6d"
     }
     $( "#datepicker" ).datepicker({

src/js/quexianDetail.js

@@ -12,7 +12,7 @@ const arrowLeft= require("./../images/arrow_left.png")
 const arrowRight = require("./../images/arrow_right.png")
 
 
-let casesId="", name="", isReject ="2",deptName="", isUsed ="",casesIdTemp="", data_asc=[],data_desc=["casesName"],nameTemp="",casesIds="", isRejectTemp ="2", isUsedTemp ="",from="",deptIdTemp="",deptItemId="",deptId=""
+let casesId="", name="", isReject ="",deptName="", isUsed ="",casesIdTemp="", data_asc=[],data_desc=["casesName"],nameTemp="",casesIds="", isRejectTemp ="", isUsedTemp ="",from="",deptIdTemp="",deptItemId="",deptId=""
 $(".selectModuleType").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
 $(".selectReject").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
 $(".selectUsed").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
@@ -25,7 +25,9 @@ $(function(){
     deptId = deptIdTemp = getUrlArgObjectNew("chengdu",srcUrl)||""
     docName = getUrlArgObjectNew("docName",srcUrl)||""
     casesIds = getUrlArgObjectNew("casesId",srcUrl)||""
-    isReject= isRejectTemp= getUrlArgObjectNew("shijian",srcUrl)||"2"
+    isReject= isRejectTemp= getUrlArgObjectNew("shijian",srcUrl)||""
+    let startDateParam = getUrlArgObjectNew("startDateParam",srcUrl)||""
+    let endDateParam = getUrlArgObjectNew("endDateParam",srcUrl)||""
     if(isReject == 1){
         $(".monthYear .mon").css({
             backgroundColor:'#00A1FF',
@@ -35,7 +37,7 @@ $(function(){
             backgroundColor:'#fff'
         })
         setDatePicker($("#datepicker"),$("#datepicker2"),1)
-    }else{
+    }else if(isReject == 2){
         $(".monthYear .year").css({
             backgroundColor:'#00A1FF',
             color:'#fff'
@@ -44,6 +46,14 @@ $(function(){
             backgroundColor:'#fff'
         })
         setDatePicker($("#datepicker"),$("#datepicker2"),2)
+    }else if(isReject == 3){
+        setDatePicker($("#datepicker"),$("#datepicker2"),3,new Date(startDateParam),new Date(endDateParam))
+    }else{
+        setDatePicker($("#datepicker"),$("#datepicker2"),"default")
+    }
+
+    if(!isReject){
+        setDatePicker($("#datepicker"),$("#datepicker2"),"default")
     }
     $(".selectDepts").html(deptName)   
     from = getUrlArgObjectNew("from",srcUrl)||""
@@ -67,7 +77,7 @@ $(function(){
         })
     }
     $(".abnormalClear").click(function(){
-        setDatePicker($("#datepicker"),$("#datepicker2"),isReject||2)
+        setDatePicker($("#datepicker"),$("#datepicker2"),"default")
         name =nameTemp= ""
         deptIdTemp=deptId =''
         $(".selectDept").html("全部").attr("data-id","").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
@@ -170,7 +180,7 @@ function getTabData(activePage){
     }
     const param = {
         current:activePage,
-        type: isReject,
+        type: 0, //1-本月，2-本年,0-自定义时间（现在 都是自定义时间，都会传具体时间进去）
         name: name, //条目名
         doctorName:docName||"",
         deptName:deptName||"",
@@ -182,6 +192,9 @@ function getTabData(activePage){
         "startDate":dateStatrt,
         "endDate":dateEnd
     }
+
+    startDateParam = dateStatrt
+   endDateParam = dateEnd
     post(api.entryCountGroupByEntryAndDeptPage,param).then(res =>{
         if(res.data.code == '0'){
             const data = res.data.data.records

src/js/quexianDetailControl.js

@@ -11,7 +11,7 @@ const iconUp = require("./../images/arrow_up.png")
 const arrowLeft= require("./../images/arrow_left.png")
 const arrowRight = require("./../images/arrow_right.png")
 
-let casesId="", name="", isReject ="2",deptName="",data_asc=[],data_desc=["casesName"], isUsed ="",casesIdTemp="",casesIds="", nameTemp="", isRejectTemp ="2", isUsedTemp ="",from="",deptIdTemp="",deptItemId="",deptId=""
+let casesId="", name="", isReject ="",deptName="",data_asc=[],data_desc=["casesName"], isUsed ="",casesIdTemp="",casesIds="", nameTemp="", isRejectTemp ="", isUsedTemp ="",from="",deptIdTemp="",deptItemId="",deptId=""
 $(".selectModuleType").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
 $(".selectReject").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
 $(".selectUsed").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
@@ -23,8 +23,10 @@ $(function(){
     deptName = getUrlArgObjectNew("deptName",srcUrl)||""
     deptId = deptIdTemp = getUrlArgObjectNew("caseName",srcUrl)||""
     from = getUrlArgObjectNew("from",srcUrl)||""
-    isReject = isRejectTemp = getUrlArgObjectNew("shijian",srcUrl)||"2"
+    isReject = isRejectTemp = getUrlArgObjectNew("shijian",srcUrl)||""
     casesIds = getUrlArgObjectNew("casesId",srcUrl)||""
+    let startDateParam = getUrlArgObjectNew("startDateParam",srcUrl)||""
+    let endDateParam = getUrlArgObjectNew("endDateParam",srcUrl)||""
     if(isReject == 1){
         $(".monthYear .mon").css({
             backgroundColor:'#00A1FF',
@@ -34,7 +36,7 @@ $(function(){
             backgroundColor:'#fff'
         })
         setDatePicker($("#datepicker"),$("#datepicker2"),1)
-    }else{
+    }else if(isReject == 2){
         $(".monthYear .year").css({
             backgroundColor:'#00A1FF',
             color:'#fff'
@@ -43,6 +45,11 @@ $(function(){
             backgroundColor:'#fff'
         })
         setDatePicker($("#datepicker"),$("#datepicker2"),2)
+    }else if(isReject == 3){
+        setDatePicker($("#datepicker"),$("#datepicker2"),3,new Date(startDateParam),new Date(endDateParam))
+    }
+    if(!isReject){
+        setDatePicker($("#datepicker"),$("#datepicker2"),'default')
     }
     $(".selectDepts").html(deptName)
     // if(from == 1){
@@ -62,7 +69,7 @@ $(function(){
     getTabData(1)//条目缺陷
     
     $(".abnormalClear").click(function(){
-        setDatePicker($("#datepicker"),$("#datepicker2"),isReject||2)
+        setDatePicker($("#datepicker"),$("#datepicker2"),"default")
         name =nameTemp= ""
         deptId = deptIdTemp = ""
         $(".selectDept").html("全部").attr("data-id","").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
@@ -156,7 +163,7 @@ function getTabData(activePage){
     }
     const param = {
         current:activePage,
-        type: isReject,
+        type: 0,//1-本月，2-本年,0-自定义时间（现在 都是自定义时间，都会传具体时间进去）
         name: name, //条目名
         doctorName:"",
         casesName:deptId,

src/js/quexianDetailControlHome.js

@@ -12,7 +12,7 @@ const arrowLeft= require("./../images/arrow_left.png")
 const arrowRight = require("./../images/arrow_right.png")
 
 
-let casesId="", name="", isReject ="2",deptName="",data_asc=[],data_desc=["casesName"], isUsed ="",ruleType="",casesIdTemp="",casesIds="", nameTemp="", isRejectTemp ="2", isUsedTemp ="",from="",deptIdTemp="",deptItemId="",deptId=""
+let casesId="", name="", isReject ="",deptName="",data_asc=[],data_desc=["casesName"], isUsed ="",ruleType="",casesIdTemp="",casesIds="", nameTemp="", isRejectTemp ="", isUsedTemp ="",from="",deptIdTemp="",deptItemId="",deptId=""
 $(".selectModuleType").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
 $(".selectReject").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
 $(".selectUsed").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
@@ -24,9 +24,11 @@ $(function(){
     deptName = getUrlArgObjectNew("deptName",srcUrl)||""
     deptId = deptIdTemp = getUrlArgObjectNew("caseName",srcUrl)||""
     from = getUrlArgObjectNew("from",srcUrl)||""
-    isReject = isRejectTemp = getUrlArgObjectNew("shijian",srcUrl)||"2"
+    isReject = isRejectTemp = getUrlArgObjectNew("shijian",srcUrl)||""
     casesIds = getUrlArgObjectNew("casesId",srcUrl)||""
     ruleType = getUrlArgObjectNew("ruleType",srcUrl)||""
+    let startDateParam = getUrlArgObjectNew("startDateParam",srcUrl)||""
+    let endDateParam = getUrlArgObjectNew("endDateParam",srcUrl)||""
     $('.selectDept').html(deptName).attr("title",deptName)
     if(isReject == 1){
         $(".monthYear .mon").css({
@@ -37,7 +39,7 @@ $(function(){
             backgroundColor:'#fff'
         })
         setDatePicker($("#datepicker"),$("#datepicker2"),1)
-    }else{
+    }else if(isReject == 2){
         $(".monthYear .year").css({
             backgroundColor:'#00A1FF',
             color:'#fff'
@@ -46,6 +48,13 @@ $(function(){
             backgroundColor:'#fff'
         })
         setDatePicker($("#datepicker"),$("#datepicker2"),2)
+    }else if(isReject == 3){
+        setDatePicker($("#datepicker"),$("#datepicker2"),3,new Date(startDateParam),new Date(endDateParam))
+    }else{
+        setDatePicker($("#datepicker"),$("#datepicker2"),"default")
+    }
+    if(!isReject){
+        setDatePicker($("#datepicker"),$("#datepicker2"),"default")
     }
     if(from == 1){
         $(".partTitle .titlePic ").html(`<a class="consoleD" href="console.html">控制台 / </a><a class="consoleP" href="partDetailControl.html">病案首页合格率占比 / </a>缺陷详情`)
@@ -64,7 +73,7 @@ $(function(){
     
     $(".abnormalClear").click(function(){
         name = ""
-        setDatePicker($("#datepicker"),$("#datepicker2"),isReject||2)
+        setDatePicker($("#datepicker"),$("#datepicker2"),"default")
         $(".patientNumInp").val("")
         getTabData(1)
     })
@@ -155,7 +164,7 @@ function getTabData(activePage){
     }
     const param = {
         current:activePage,
-        type: isReject,
+        type: 0,
         name: name, //条目名
         doctorName:"",
         casesName:deptId,

src/js/quexianDetailHome.js

@@ -14,7 +14,7 @@ const arrowLeft= require("./../images/arrow_left.png")
 const arrowRight = require("./../images/arrow_right.png")
 
 
-let casesId="", name="", isReject ="2",deptName="", isUsed ="",ruleType="",casesIdTemp="", data_asc=[],data_desc=["casesName"],nameTemp="",casesIds="", isRejectTemp ="2", isUsedTemp ="",from="",deptIdTemp="",deptItemId="",deptId=""
+let casesId="", name="", isReject ="",deptName="", isUsed ="",ruleType="",casesIdTemp="", data_asc=[],data_desc=["casesName"],nameTemp="",casesIds="", isRejectTemp ="", isUsedTemp ="",from="",deptIdTemp="",deptItemId="",deptId=""
 $(".selectModuleType").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
 $(".selectReject").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
 $(".selectUsed").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
@@ -27,8 +27,10 @@ $(function(){
     deptId = deptIdTemp = getUrlArgObjectNew("chengdu",srcUrl)||""
     docName = getUrlArgObjectNew("docName",srcUrl)||""
     casesIds = getUrlArgObjectNew("casesId",srcUrl)||""
-    isReject= isRejectTemp= getUrlArgObjectNew("shijian",srcUrl)||"2"
+    isReject= isRejectTemp= getUrlArgObjectNew("shijian",srcUrl)||""
     ruleType= getUrlArgObjectNew("ruleType",srcUrl)||""
+    let startDateParam = getUrlArgObjectNew("startDateParam",srcUrl)||""
+    let endDateParam = getUrlArgObjectNew("endDateParam",srcUrl)||""
     if(isReject == 1){
         $(".monthYear .mon").css({
             backgroundColor:'#00A1FF',
@@ -38,7 +40,7 @@ $(function(){
             backgroundColor:'#fff'
         })
         setDatePicker($("#datepicker"),$("#datepicker2"),1)
-    }else{
+    }else if(isReject == 2){
         $(".monthYear .year").css({
             backgroundColor:'#00A1FF',
             color:'#fff'
@@ -47,7 +49,14 @@ $(function(){
             backgroundColor:'#fff'
         })
         setDatePicker($("#datepicker"),$("#datepicker2"),2)
-    }   
+    }else if(isReject == 3){
+        setDatePicker($("#datepicker"),$("#datepicker2"),3,new Date(startDateParam),new Date(endDateParam))
+    }else {
+        setDatePicker($("#datepicker"),$("#datepicker2"),"default")
+    }
+    if(!isReject){
+        setDatePicker($("#datepicker"),$("#datepicker2"),"default")
+    }
     from = getUrlArgObjectNew("from",srcUrl)||""
     if(from == 1){
         $(".partTitle .titlePic ").html(`<a class="consoleD" href="deptConsole.html">控制台(科室) / </a><a class="consoleP" href="partDetail.html">病案首页合格率占比 / </a>缺陷详情`)
@@ -69,7 +78,7 @@ $(function(){
         })
     }
     $(".abnormalClear").click(function(){
-        setDatePicker($("#datepicker"),$("#datepicker2"),isReject||2)
+        setDatePicker($("#datepicker"),$("#datepicker2"),"default")
         name = ""
         $(".patientNumInp").val("")
         getTabData(1)
@@ -170,7 +179,7 @@ function getTabData(activePage){
     }
     const param = {
         current:activePage,
-        type: isReject,
+        type: 0, //1-本月，2-本年,0-自定义时间（现在 都是自定义时间，都会传具体时间进去）
         name: name, //条目名
         doctorName:docName||"",
         deptName:deptName||"",
@@ -183,6 +192,8 @@ function getTabData(activePage){
         "startDate":dateStatrt,
         "endDate":dateEnd
     }
+    startDateParam = dateStatrt
+    endDateParam = dateEnd
     post(api.entryCountGroupByEntryAndDeptPage,param).then(res =>{
         if(res.data.code == '0'){
             const data = res.data.data.records

src/js/singleVeto.js

@@ -12,7 +12,7 @@ const arrowLeft= require("./../images/arrow_left.png")
 const arrowRight = require("./../images/arrow_right.png")
 
 
-let casesId="", name="", isReject ="2",deptName="", isUsed ="",casesIdTemp="", nameTemp="", isRejectTemp ="2",model='', isUsedTemp ="",from="",deptIdTemp="",deptItemId="",deptId="",isSingleReject="", isSingleRejectTemp="",casesName="",casesNameTemp=""
+let casesId="", name="", isReject ="",deptName="", isUsed ="",casesIdTemp="", nameTemp="", isRejectTemp ="",model='', isUsedTemp ="",from="",deptIdTemp="",deptItemId="",deptId="",isSingleReject="", isSingleRejectTemp="",casesName="",casesNameTemp="",paramObj={}
 $(".selectModuleType").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
 $(".selectReject").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
 $(".selectUsed").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
@@ -22,12 +22,14 @@ $(function(){
     dateChange()
     let srcUrl = $("#contentIframe",parent.document).attr("src")
     deptName = getUrlArgObjectNew("deptName",srcUrl)||""
-    isRejectTemp = isReject = getUrlArgObjectNew("shijian",srcUrl)||"2"
+    isRejectTemp = isReject = getUrlArgObjectNew("shijian",srcUrl)||""
     selectReject = getUrlArgObjectNew("selectReject",srcUrl)||""
     from = getUrlArgObjectNew("from",srcUrl)||""
     special = getUrlArgObjectNew("special",srcUrl)||""
     name=nameTemp = getUrlArgObjectNew("qxName",srcUrl)||""
     casesName =casesNameTemp = getUrlArgObjectNew("model",srcUrl)||""
+    let startDateParam = getUrlArgObjectNew("startDateParam",srcUrl)||""
+    let endDateParam = getUrlArgObjectNew("endDateParam",srcUrl)||""
     if(name){
         $(".moduleItemInp").attr("title",name).val(name)
         selectReject=1
@@ -57,7 +59,7 @@ $(function(){
     })
     $(".abnormalClear").click(function(){
         // window.location.reload()
-        setDatePicker($("#datepicker"),$("#datepicker2"),isReject||2)
+        setDatePicker($("#datepicker"),$("#datepicker2"),"default")
         $(".selectModuleType").html("全部")
         $(".selectReject").html("全部")
         $(".selectModuleType").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
@@ -79,7 +81,7 @@ $(function(){
             backgroundColor:'#fff'
         })
         setDatePicker($("#datepicker"),$("#datepicker2"),1)
-    }else{
+    }else if(isReject == 2){
         $(".monthYear .year").css({
             backgroundColor:'#00A1FF',
             color:'#fff'
@@ -88,7 +90,14 @@ $(function(){
             backgroundColor:'#fff'
         })
         setDatePicker($("#datepicker"),$("#datepicker2"),2)
+    }else if(isReject == 3){
+        setDatePicker($("#datepicker"),$("#datepicker2"),3,new Date(startDateParam),new Date(endDateParam))
+    }else{
+        setDatePicker($("#datepicker"),$("#datepicker2"),"default")
     }
+    if(!isReject){
+        setDatePicker($("#datepicker"),$("#datepicker2"),"default")
+      }
     getTabData(1)//条目缺陷
 })
 bindDeptSelect()
@@ -146,9 +155,11 @@ function getTabData(activePage){
         $.alerModal({"message":'开始时间不能大于结束时间~',type:"tip",time:'1000',isFather: true, fatherWrapper: $("#mainBox", parent.document)});
         return
     }
+    startDateParam=dateStatrt
+    endDateParam=dateEnd
     const param = {
         current:activePage,
-        type: isReject,
+        type: 0,
         casesId:casesId, //模块Id
         casesName:casesName=='全部'?'':casesName, //模块Id
         isReject:isSingleReject, //是否单项否决
@@ -158,6 +169,7 @@ function getTabData(activePage){
         "startDate":dateStatrt,
         "endDate":dateEnd
     }
+    paramObj = param
     post(from == 1?api.entryGroupByEntryInnerPage:api.entryGroupByEntryAndDeptInnerPage,param).then(res =>{
         if(res.data.code == '0'){
             const data = res.data.data.records
@@ -280,16 +292,25 @@ function renderTab(data,activePage){
             <tr data-id=${item.id} data-index=${i}>
                 <td  class="textCenter">${(activePage-1)*15 + i+1}</td>
                 <td class="textCenter">${item.casesName||'-'}</td>
-                <td>${item.name||'-'}</td>
+                <td data-name=${item.name} class="goDetail">${item.name||'-'}</td>
                 <td  class="textCenter">${item.score+''||'-'}</td>
                 <td  class="textCenter">${item.isReject == '1'?'是':'否'}</td>
-                <td class="textCenter">${item.num+''||'-'}</td>
+                <td data-name=${item.name} class="textCenter goDetail">${item.num+''||'-'}</td>
                 <td  class="textCenter">${item.percentStr||'-'}</td>
             </tr>
         `
     }
     $('tbody').html(str?str:emptyBox())
     bindEdit(data,activePage)
+    goDetail()
+}
+
+function goDetail(){
+    $(".goDetail").click(function(){
+        let defectName = $(this).attr("data-name")
+        // focusMenuItem("YH-ZKK-GKSQXZB_XQ");
+        $(parent.document).find("#contentIframe").attr("src",`./itemDefectDetail.html?defectName=${defectName}&startDate=${startDateParam}&endDate=${endDateParam}`)
+    })
 }
 
 function bindEdit(data,activePage){

src/js/utils.js

@@ -2,7 +2,7 @@ const qs = require('qs');
 const $ = require("jquery");
 const axios = require("axios")
 var Utils = require('./rePromise');
-const baseUrl = "http://192.168.2.241:5858"
+const baseUrl = "http://192.168.2.236:5858"
 //页面映射
 const pageMap={
   'YH-KZT':'console.html',
@@ -297,7 +297,7 @@ function setTitleTxt(dom,from){
   }
 }
 
-//mode=1:本月，mode=2:本年 startDateDefault：mode不等于1和2开始日期，endDateDefault：mode不等于1和2结束日期
+//mode=1:本月，mode=2:本年，mode="default":默认情况（1周） startDateDefault：mode不等于1和2开始日期，endDateDefault：mode不等于1和2结束日期
 function setDatePicker(picker1,picker2,mode,startDateDefault,endDateDefault){
   $.datepicker.regional['zh-CN'] = {
     clearText: '清除',
@@ -339,7 +339,10 @@ function setDatePicker(picker1,picker2,mode,startDateDefault,endDateDefault){
         startDate = new Date(`${year}-${month}-01`)
     }else if(mode == '2'){
         startDate = new Date(`${year}-01-01`)
-    } else {
+    } else if(mode == 'default'){
+      startDate = "-6d"
+      endDate =new Date()
+    }else {
         startDate = startDateDefault || new Date()
         endDate = endDateDefault || new Date()
     }

webpack.config.js

@@ -44,6 +44,7 @@ module.exports = {
     assertType: path.resolve(__dirname, 'src/js', 'assertType.js'),
     assertTypeDetail: path.resolve(__dirname, 'src/js', 'assertTypeDetail.js'),
     singleVeto:path.resolve(__dirname, 'src/js', 'singleVeto.js'),
+    itemDefectDetail:path.resolve(__dirname, 'src/js', 'itemDefectDetail.js'),
     vendor: 'lodash'// 多个页面所需的公共库文件，防止重复打包带入
   },
   output: {
@@ -485,7 +486,19 @@ module.exports = {
         collapseWhitespace: true //删除空白符与换行符
       }
     }),
-    
+    new HtmlWebpackPlugin({
+      title: 'itemDefectDetail.html', //单项否决详情页
+      template: path.resolve(__dirname, 'src/html', 'itemDefectDetail.html'),
+      filename: 'itemDefectDetail.html',
+      chunks: ['itemDefectDetail', 'vendor', 'common'],
+      hash: true, //防止缓存
+      inject: true,
+      minify: {
+        removeAttributeQuotes: true, //压缩 去掉引号
+        removeComments: true, //移除HTML中的注释
+        collapseWhitespace: true //删除空白符与换行符
+      }
+    }),
     new CopyWebpackPlugin([
       {
         from:'src/resource',