Merge branch 'test' into byll

首页详情页参数处理

src/css/console.less

@@ -76,6 +76,7 @@ body.console {
     font-size: 16px;
     font-weight: bold;
     color: @themeFontClr;
+    opacity: .9;
     border-bottom: 1px solid @themeBorderClr;
     height: 40px;
     line-height: 40px;
@@ -125,14 +126,17 @@ body.console {
     display: inline-block;
     font-size: 16px;
     color: @themeFontClr;
+    opacity: .9;
     span {
       font-size: 16px;
       color: #fff;
+      opacity: .9;
     }
   }
   .dateDetail {
     font-size: 12px;
     color: @themeFontClr;
+    opacity: .6;
     margin-right: 30px;
     font-weight: normal;
   }
@@ -157,9 +161,11 @@ body.console {
     .year {
       background-color: #00A1FF;
       color: #fff;
+      opacity: .9;
     }
     .mon {
       color: @themeFontClr;
+      opacity: .6;
     }
   }
 }
@@ -248,6 +254,7 @@ body.console {
         text-overflow: ellipsis;
         white-space: nowrap;
         color: @themeFontClr;
+        opacity: .6;
       }
       .smp {
         width: 100px;
@@ -255,6 +262,7 @@ body.console {
     }
     .deptNum {
       color: @themeFontClr;
+      opacity: .6;
       font-size: 16px;
       font-weight: bold;
       padding-right: 10px;
@@ -263,6 +271,7 @@ body.console {
     }
     .percent {
       color: @themeFontClr;
+      opacity: .6;
       width: 40px;
     }
   }
@@ -282,6 +291,7 @@ body.console {
       float: left;
       width: 33.33%;
       color: #fff;
+      opacity: .9;
       border-left: 3px solid #F2637B;
       height: 72px;
       box-sizing: border-box;
@@ -299,6 +309,9 @@ body.console {
     /*background-color: @themeColor;*/
     height: 410px;
     overflow: hidden;
+    .partTitlePub{
+      opacity: .9;
+    }
     .list {
       padding: 6px 5px;
       width: 100%;
@@ -323,6 +336,7 @@ body.console {
     td {
       padding: 7px 10px;
       color: @themeFontClr;
+      opacity: .9;
       i {
         width: 17px;
         height: 17px;
@@ -330,6 +344,7 @@ body.console {
         border-radius: 8px;
         background-color: #526186;
         color: #fff;
+        opacity: .9;
         display: inline-block;
         text-align: center;
         font-size: 12px;
@@ -347,6 +362,7 @@ body.console {
     .td02name {
       min-width: 113px;
       color: @themeFontClr;
+      opacity: .9;
     }
     .td02 {
     }
@@ -387,6 +403,7 @@ body.console {
     p {
       text-align: center;
       color: @themeFontClr;
+      opacity: .9;
       font-weight: bold;
       font-size: 16px;
       padding-bottom: 5px;
@@ -405,6 +422,7 @@ body.console {
       text-align: center;
       font-size: 12px;
       color: @themeFontClr;
+      opacity: .6;
       font-weight: normal;
       width: 78px;
       position: absolute;
@@ -452,6 +470,7 @@ body.console {
   cursor: pointer;
   span{
     color: @themeFontClr;
+    opacity: .9;
   }
   .name {
     float: left;
@@ -460,6 +479,7 @@ body.console {
   .personNum {
     float: right;
     color: @themeFontClr;
+    opacity: .9;
   }
 }
 
@@ -470,10 +490,12 @@ body.console {
   line-height: 40px;
   font-weight: bold;
   color: @themeFontClr;
+  opacity: .9;
 }
 .explainNum {
   margin-top: 8px;
   color: @themeFontClr;
+  opacity: .6;
 }
 
 .toggleSlide {
@@ -493,6 +515,7 @@ body.console {
     border-radius: 4px;
     span{
       color: @themeFontClr;
+      opacity: .9;
     }
     img {
       width: 10px;

src/css/itemManager.less

@@ -46,9 +46,9 @@
         }
         
     }
-    // .filterBox{
-    //     margin: 0 0 20px 0;
-    // }
+    .filterBox{
+        margin-bottom:10px;
+    }
     .filterItem{
         position: relative;
         display: inline-block;

src/css/login.less

@@ -3,7 +3,6 @@ body {
   background:linear-gradient(133deg,rgba(45,79,139,1) 0%,rgba(20,39,83,1) 100%);
 }
 .login {
-  cursor: pointer;
   height: 100%;
   .bg{
     width: 62%;
@@ -24,6 +23,7 @@ body {
     text-align: center;
     background-color: #00A1FF;
     color: #fff;
+    cursor: pointer;
     border-radius:4px;
     margin: 20px auto 0;
   }

src/css/qcScore.less

@@ -164,7 +164,7 @@
 }
 .tab-container{
   margin-left: @menuWt+15px;
-  height: 100%;
+  /*height: 100%;*/
   .content-box{
     width:78%;
     height: 100%;

src/html/itemManager.html

@@ -13,7 +13,7 @@
     <div class="managerContainer">
         <h2>条目数据维护</h2>
         <div class="main-body">
-            <div class="filterBox">
+            <div class="filterBox clearfix">
                 <span class="filterItem typeFilter">
                     <span>模块名称：</span>
                     <span class="selectModuleType ellipsis">全部 </span>
@@ -43,8 +43,10 @@
                         <li class="usedItem" data-name="否" data-id=0>否</li>
                     </ul>
                 </span>
-                <span class="filter">查询</span>
-                <span class="filterclear abnormalClear">重置</span>
+                <div style="display: inline-block;float: left;">
+                    <span class="filter">查询</span>
+                    <span class="filterclear abnormalClear">重置</span>
+                </div>
             </div>
             <table>
                 <thead>

src/html/mukuai.html

@@ -32,7 +32,7 @@
                     </span>
                 </span>
                 <span class="filterItem typeFilter deptListWrap">
-                    <span style="overflow:hidden">科室：</span>
+                    <span style="overflow:hidden">科室名称：</span>
                     <span class="selectDept ellipsis" data-id=" "><i>--</i></span>
                     <ul class="deptList filterDropList">
                         

src/html/partDetail.html

@@ -29,7 +29,7 @@
                     <input class="patientNumInp" style="width: 148px;" type="text" placeholder="请输入主管医生">
                 </span>
                 <span class="filterItem typeFilter deptListWrap">
-                    <span style="overflow:hidden">科室：</span>
+                    <span style="overflow:hidden">科室名称：</span>
                     <span class="selectDept ellipsis" data-id=""><i>--</i></span>
                     <ul class="deptList filterDropList">
                         

src/html/tiaomu.html

@@ -32,7 +32,7 @@
                     </span>
                 </span>
                 <span class="filterItem typeFilter deptListWrap">
-                    <span style="overflow:hidden">科室：</span>
+                    <span style="overflow:hidden">科室名称：</span>
                     <span class="selectDept ellipsis" data-id=" "><i>--</i></span>
                     <ul class="deptList filterDropList">
                         

src/js/console.js

@@ -70,18 +70,30 @@ function getDetails(){
       $(parent.document).find("#contentIframe").attr("src","./deptScoreDetailControl.html?from=1&dateType="+dateType)
     })
     $(".part03 .partTitlePub").click(function(){
-        focusMenuItem("YH-ZKK-BASYHGLZB_XQ");
-        $(parent.document).find("#contentIframe").attr("src","./partDetailControl.html?from=1&dateType="+dateType)
+        if(hospital=="台州市立"){
+            focusMenuItem("YH-ZKK-GKSJJBLZB_XQ")
+            $(parent.document).find("#contentIframe").attr("src","./jiaji.html?from=1&dateType="+dateType)
+        }else{
+            focusMenuItem("YH-ZKK-BASYHGLZB_XQ");
+            $(parent.document).find("#contentIframe").attr("src","./partDetailControl.html?from=1&dateType="+dateType)
+        }
     })
     $(".paymoney.pubEchart .title").click(function(){
-        focusMenuItem("YH-ZKK-KSPJZYTS_XQ");
-        $(parent.document).find("#contentIframe").attr("src","./dayDetail.html?from=1&dateType="+dateType)
+        if($(this).text().indexOf("花费")!==-1){
+            focusMenuItem("YH-ZKK-KSPJZYHF_XQ");
+            $(parent.document).find("#contentIframe").attr("src","./payDetail.html?from=1&dateType="+dateType)
+        }else{
+            focusMenuItem("YH-ZKK-KSPJZYTS_XQ");
+            $(parent.document).find("#contentIframe").attr("src","./dayDetail.html?from=1&dateType="+dateType)
+        }
     })
     $(".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)
     })
     $(".circleB .title").click(function(){
-      focusMenuItem("YH-ZKK-TMQXZB_XQ");
+        focusMenuItem("YH-ZKK-TMQXZB_XQ");
+        $(parent.document).find("#contentIframe").attr("src","./tiaomuControl.html?from=1&dateType="+dateType)
     })
 }
 
@@ -104,9 +116,11 @@ function dateChange(){
     $(".monthYear .mon").click(function(){
         $(this).css({
             backgroundColor:'#00A1FF',
-            color:'#fff'
+            color:'#fff',
+            opacity:'0.9',
         }).siblings().css({
             color:'#fff',
+            opacity:'0.6',
             backgroundColor:'#203463'
         })
         dateType = 1
@@ -115,9 +129,11 @@ function dateChange(){
     $(".monthYear .year").click(function(){
         $(this).css({
             backgroundColor:'#00A1FF',
-            color:'#fff'
+            color:'#fff',
+            opacity:'0.9',
         }).siblings().css({
             color:'#fff',
+            opacity:'0.6',
             backgroundColor:'#203463'
         })
         dateType = 2

src/js/dayDetail.js

@@ -2,7 +2,7 @@ const $ = require('jquery');
 require("../css/dayDetail.less");
 require('./modal.js');
 const {api} = require('./api.js')
-const {post,getCookie} = require('./utils.js')
+const {post,getCookie,getUrlArgObjectNew} = 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")
@@ -20,6 +20,26 @@ $(".selectDept").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
 let tabList = [], name = "", behospitalCode="", behosDateStart="", level="",behosDateEnd="", scoreSum = 0,statisticsType=2,
   nameTemp = "", behospitalCodeTemp="",levelTemp="", deptId="",deptIdTemp="", doctorName="", doctorNum="",doctorNameTemp="",doctorNumTemp="",
   data_desc=[],data_asc=[];
+let srcUrl = $("#contentIframe",parent.document).attr("src")
+statisticsType = getUrlArgObjectNew("dateType",srcUrl)||""
+
+if(statisticsType == 1){
+    $(".monthYear .mon").css({
+        backgroundColor:'#00A1FF',
+        color:'#fff'
+    }).siblings().css({
+        color:'#00A1FF',
+        backgroundColor:'#fff'
+    })
+}else{
+    $(".monthYear .year").css({
+        backgroundColor:'#00A1FF',
+        color:'#fff'
+    }).siblings().css({
+        color:'#00A1FF',
+        backgroundColor:'#fff'
+    })
+}
 $(".abnormalClear").click(function(){
         behospitalCode = ""
         $(".patientNumInp").val("")
@@ -128,7 +148,7 @@ function renderTab(data,hisId,activePage){
                 <td>${item.name || "-"}</td>
                 <td >${item.averageValue}</td>
                 <td >${item.lastAverageValue}</td>
-                <td style="display:${statisticsType==1?'block':'none'}">${item.lastYearAverageValue}</td>
+                ${statisticsType==1?'<td>'+item.lastYearAverageValue+'</td>':''}
             </tr>
         `
     }

src/js/deptScoreDetail.js

@@ -2,7 +2,7 @@ const $ = require('jquery');
 require("../css/deptScoreDetail.less");
 require('./modal.js');
 const {api} = require('./api.js')
-const {post,getCookie} = require('./utils.js')
+const {post,getCookie,getUrlArgObjectNew} = 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")
@@ -17,13 +17,48 @@ 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=2,deptList=[],
   nameTemp = "", behospitalCodeTemp="",levelTemp="", deptId="",deptIdTemp="", doctorName="", doctorNum="",doctorNameTemp="",doctorNumTemp="",
   data_desc=[],data_asc=[];
-let deptList = JSON.parse(getCookie("deptList"))||[]
+$(function(){
+    deptList = JSON.parse(getCookie("deptList"))||[]
+    let srcUrl = $("#contentIframe",parent.document).attr("src")
+    deptId = deptIdTemp = getUrlArgObjectNew("deptName",srcUrl)||""
+    statisticsType = getUrlArgObjectNew("dateType",srcUrl)||""
+    console.log(deptIdTemp,deptId)
+    if(statisticsType == 1){
+        $(".monthYear .mon").css({
+            backgroundColor:'#00A1FF',
+            color:'#fff'
+        }).siblings().css({
+            color:'#00A1FF',
+            backgroundColor:'#fff'
+        })
+    }else{
+        $(".monthYear .year").css({
+            backgroundColor:'#00A1FF',
+            color:'#fff'
+        }).siblings().css({
+            color:'#00A1FF',
+            backgroundColor:'#fff'
+        })
+    }
+    if(deptId){
+        $(".selectDept").html(deptId).attr({
+            "data-id":deptId,
+            "title":deptId
+        }).append(`<img class="arrow" src=${iconDown} alt="下拉">`)
+        getDeptList()
+    }else{
+        getDeptList(1)
+    }
+    getTabData(1)
+
+  })
+
+
 $(".abnormalClear").click(function(){
-    // window.location.reload()
-    deptId = deptList[0].deptName
+    deptId = deptIdTemp = deptList[0].deptName
     behospitalCode = ""
     $(".patientNumInp").val("")
     $(".selectDept").html(deptId).attr({
@@ -49,13 +84,15 @@ $('.iconCalen').on("click", function(e){
 })
 $('.recordScoreBtn').css("opacity",hasData('FUNC000017')?'1':'0.5')
 //科室处理
-getDeptList()
-function getDeptList(){
+// getDeptList()
+function getDeptList(flg){
     let str = ``
     if(deptList.length<=0)return
-    $(".deptScoreDetail .selectDept ").attr("data-id",deptList[0].deptName).find("i").html(deptList[0].deptName)
-    deptIdTemp = deptList[0].deptName
-    deptId = deptList[0].deptName
+    if(flg){
+        $(".partDetail .selectDept ").attr("data-id",deptList[0].deptName).find("i").html(deptList[0].deptName)
+        deptId = deptIdTemp = deptList[0].deptName
+    }
+    // $(".deptScoreDetail .selectDept ").attr("data-id",deptList[0].deptName).find("i").html(deptList[0].deptName)
     for(let i = 0;i < deptList.length;i++){
         let tmp = deptList[i]
         str += `<li class="deptItem ellipsis" title="${tmp.deptName}" data-id="${tmp.deptName}" data-name="${tmp.deptName}">${tmp.deptName}</li>`
@@ -106,6 +143,7 @@ function dateChange(){
 }
 
 function getTabData(activePage){
+    console.log(deptIdTemp,deptId,7878778)
     const param = {
         "asc": "",
         "deptName": deptId||"",
@@ -135,7 +173,6 @@ function getTabData(activePage){
     })
 }
 
-getTabData(1)
 
 $(".filter").on("click", function(e){
     name = nameTemp
@@ -348,7 +385,7 @@ $('.selectDept').on("click", function(e){
 function rendeDeptList(deptList){
     let str = `<li class="deptItem " 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>`
+        str += `<li class="deptItem ellipsis" title=${deptList[i].deptName} data-id=${deptList[i].deptName} data-name=${deptList[i].deptName}> ${deptList[i].deptName}</li>`
     }
     $('.deptList').html(str)
 }

src/js/deptScoreDetailControl.js

@@ -2,7 +2,7 @@ const $ = require('jquery');
 require("../css/deptScoreDetailControl.less");
 require('./modal.js');
 const {api} = require('./api.js')
-const {post,getCookie} = require('./utils.js')
+const {post,getCookie,getUrlArgObjectNew} = 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")
@@ -20,6 +20,26 @@ $(".selectDept").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
 let tabList = [], name = "", behospitalCode="", behosDateStart="", level="",behosDateEnd="", scoreSum = 0,statisticsType=2,
   nameTemp = "", behospitalCodeTemp="",levelTemp="", deptId="",deptIdTemp="", doctorName="", doctorNum="",doctorNameTemp="",doctorNumTemp="",
   data_desc=[],data_asc=[];
+  let srcUrl = $("#contentIframe",parent.document).attr("src")
+  statisticsType = getUrlArgObjectNew("dateType",srcUrl)||""
+  
+  if(statisticsType == 1){
+      $(".monthYear .mon").css({
+          backgroundColor:'#00A1FF',
+          color:'#fff'
+      }).siblings().css({
+          color:'#00A1FF',
+          backgroundColor:'#fff'
+      })
+  }else{
+      $(".monthYear .year").css({
+          backgroundColor:'#00A1FF',
+          color:'#fff'
+      }).siblings().css({
+          color:'#00A1FF',
+          backgroundColor:'#fff'
+      })
+  }
 $(".abnormalClear").click(function(){
     // window.location.reload()
     behospitalCode = ""

src/js/jiaji.js

@@ -2,7 +2,7 @@ const $ = require('jquery');
 require("../css/jiaji.less");
 require('./modal.js');
 const {api} = require('./api.js')
-const {post,getCookie} = require('./utils.js')
+const {post,getCookie,getUrlArgObjectNew} = 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")
@@ -20,6 +20,26 @@ $(".selectDept").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
 let tabList = [], name = "", behospitalCode="", behosDateStart="", level="",behosDateEnd="", scoreSum = 0,statisticsType=2,
   nameTemp = "", behospitalCodeTemp="",levelTemp="", deptId="",deptIdTemp="", doctorName="", doctorNum="",doctorNameTemp="",doctorNumTemp="",
   data_desc=[],data_asc=[];
+let srcUrl = $("#contentIframe",parent.document).attr("src")
+statisticsType = getUrlArgObjectNew("dateType",srcUrl)||""
+
+if(statisticsType == 1){
+    $(".monthYear .mon").css({
+        backgroundColor:'#00A1FF',
+        color:'#fff'
+    }).siblings().css({
+        color:'#00A1FF',
+        backgroundColor:'#fff'
+    })
+}else{
+    $(".monthYear .year").css({
+        backgroundColor:'#00A1FF',
+        color:'#fff'
+    }).siblings().css({
+        color:'#00A1FF',
+        backgroundColor:'#fff'
+    })
+}
 $(".abnormalClear").click(function(){
     behospitalCode = ""
     $(".patientNumInp").val("")

src/js/mukuaiControl.js

@@ -22,6 +22,7 @@ $(function(){
     dateChange()
     let srcUrl = $("#contentIframe",parent.document).attr("src")
     // deptName = getUrlArgObjectNew("deptName",srcUrl)||""
+    isRejectTemp = isReject = getUrlArgObjectNew("dateType",srcUrl)||""
     from = getUrlArgObjectNew("from",srcUrl)||""
     getTabData(1)//条目缺陷
     
@@ -36,6 +37,24 @@ $(function(){
         $(".patientNumInp").val("")
         getTabData(1)
     })
+    
+    if(isReject == 1){
+        $(".monthYear .mon").css({
+            backgroundColor:'#00A1FF',
+            color:'#fff'
+        }).siblings().css({
+            color:'#00A1FF',
+            backgroundColor:'#fff'
+        })
+    }else{
+        $(".monthYear .year").css({
+            backgroundColor:'#00A1FF',
+            color:'#fff'
+        }).siblings().css({
+            color:'#00A1FF',
+            backgroundColor:'#fff'
+        })
+    }
 })
 function focusMenuItem(code){
     const ele = $(parent.document).find(".menu .page[code="+code+"]");

src/js/partDetail.js

@@ -92,7 +92,6 @@ $('.recordScoreBtn').css("opacity",hasData('FUNC000017')?'1':'0.5')
 
 //科室处理
 function getDeptList(flg){
-    console.log(flg)
     let str = ``
     if(deptList.length<=0)return
     if(flg){

src/js/partDetailControl.js

@@ -2,7 +2,7 @@ const $ = require('jquery');
 require("../css/partDetailControl.less");
 require('./modal.js');
 const {api} = require('./api.js')
-const {post,getCookie} = require('./utils.js')
+const {post,getCookie,getUrlArgObjectNew} = 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")
@@ -20,6 +20,26 @@ $(".selectDept").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
 let tabList = [], name = "", behospitalCode="", behosDateStart="", level="",behosDateEnd="", scoreSum = 0,statisticsType=2,
   nameTemp = "", behospitalCodeTemp="",levelTemp="", deptId="",deptIdTemp="", doctorName="", doctorNum="",doctorNameTemp="",doctorNumTemp="",
   data_desc=[],data_asc=[];
+  let srcUrl = $("#contentIframe",parent.document).attr("src")
+  statisticsType = getUrlArgObjectNew("dateType",srcUrl)||""
+  
+  if(statisticsType == 1){
+      $(".monthYear .mon").css({
+          backgroundColor:'#00A1FF',
+          color:'#fff'
+      }).siblings().css({
+          color:'#00A1FF',
+          backgroundColor:'#fff'
+      })
+  }else{
+      $(".monthYear .year").css({
+          backgroundColor:'#00A1FF',
+          color:'#fff'
+      }).siblings().css({
+          color:'#00A1FF',
+          backgroundColor:'#fff'
+      })
+  }
 $(".abnormalClear").click(function(){
     // window.location.reload()
     $(".patientNumInp").val("")

src/js/payDetail.js

@@ -2,7 +2,7 @@ const $ = require('jquery');
 require("../css/payDetail.less");
 require('./modal.js');
 const {api} = require('./api.js')
-const {post,getCookie} = require('./utils.js')
+const {post,getCookie,getUrlArgObjectNew} = 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")
@@ -20,6 +20,26 @@ $(".selectDept").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
 let tabList = [], name = "", behospitalCode="", behosDateStart="", level="",behosDateEnd="", scoreSum = 0,statisticsType=2,
   nameTemp = "", behospitalCodeTemp="",levelTemp="", deptId="",deptIdTemp="", doctorName="", doctorNum="",doctorNameTemp="",doctorNumTemp="",
   data_desc=[],data_asc=[];
+  let srcUrl = $("#contentIframe",parent.document).attr("src")
+  statisticsType = getUrlArgObjectNew("dateType",srcUrl)||""
+  
+  if(statisticsType == 1){
+      $(".monthYear .mon").css({
+          backgroundColor:'#00A1FF',
+          color:'#fff'
+      }).siblings().css({
+          color:'#00A1FF',
+          backgroundColor:'#fff'
+      })
+  }else{
+      $(".monthYear .year").css({
+          backgroundColor:'#00A1FF',
+          color:'#fff'
+      }).siblings().css({
+          color:'#00A1FF',
+          backgroundColor:'#fff'
+      })
+  }
 $(".abnormalClear").click(function(){
     behospitalCode = ""
     $(".patientNumInp").val("")
@@ -132,7 +152,7 @@ function renderTab(data,hisId,activePage){
                 <td>${item.name || "-"}</td>
                 <td >${item.averageValue}</td>
                 <td >${item.lastAverageValue}</td>
-                <td style="display:${statisticsType==1?'block':'none'}">${item.lastYearAverageValue}</td>
+                ${statisticsType==1?'<td>'+item.lastYearAverageValue+'</td>':''}
             </tr>
         `
     }

src/js/tiaomu.js

@@ -21,8 +21,36 @@ let deptList = JSON.parse(getCookie("deptList"))||[]
 $(function(){
     dateChange()
     let srcUrl = $("#contentIframe",parent.document).attr("src")
-    deptName = getUrlArgObjectNew("deptName",srcUrl)||""
+    deptId = deptIdTemp = deptName = getUrlArgObjectNew("deptName",srcUrl)||""
     from = getUrlArgObjectNew("from",srcUrl)||""
+    isRejectTemp = isReject = getUrlArgObjectNew("dateType",srcUrl)||""
+    
+    if(isReject == 1){
+        $(".monthYear .mon").css({
+            backgroundColor:'#00A1FF',
+            color:'#fff'
+        }).siblings().css({
+            color:'#00A1FF',
+            backgroundColor:'#fff'
+        })
+    }else{
+        $(".monthYear .year").css({
+            backgroundColor:'#00A1FF',
+            color:'#fff'
+        }).siblings().css({
+            color:'#00A1FF',
+            backgroundColor:'#fff'
+        })
+    }
+    if(deptId){
+        $(".selectDept").html(deptId).attr({
+            "data-id":deptId,
+            "title":deptId
+        }).append(`<img class="arrow" src=${iconDown} alt="下拉">`)
+        getDeptList()
+    }else{
+        getDeptList(1)
+    }
     getTabData(1)//条目缺陷
     
     $(".partTitle a").click(function(){
@@ -88,10 +116,14 @@ $('.selectDept').on("click", function(e){
 })
 
 //科室处理
-getDeptList()
-function getDeptList(){
+// getDeptList()
+function getDeptList(flg){
     let str = ``
     if(deptList.length<=0)return
+    if(flg){
+        $(".partDetail .selectDept ").attr("data-id",deptList[0].deptName).find("i").html(deptList[0].deptName)
+        deptId = deptIdTemp = deptList[0].deptName
+    }
     $(".tiaomu .selectDept ").attr("data-id",deptList[0].deptName).find("i").html(deptList[0].deptName)
     for(let i = 0;i < deptList.length;i++){
         let tmp = deptList[i]

src/js/tiaomuControl.js

@@ -22,6 +22,7 @@ $(function(){
     dateChange()
     let srcUrl = $("#contentIframe",parent.document).attr("src")
     deptName = getUrlArgObjectNew("deptName",srcUrl)||""
+    isRejectTemp = isReject = getUrlArgObjectNew("dateType",srcUrl)||""
     from = getUrlArgObjectNew("from",srcUrl)||""
     getTabData(1)//条目缺陷
     
@@ -36,6 +37,24 @@ $(function(){
         $(".patientNumInp").val("")
         getTabData(1)
     })
+    
+    if(isReject == 1){
+        $(".monthYear .mon").css({
+            backgroundColor:'#00A1FF',
+            color:'#fff'
+        }).siblings().css({
+            color:'#00A1FF',
+            backgroundColor:'#fff'
+        })
+    }else{
+        $(".monthYear .year").css({
+            backgroundColor:'#00A1FF',
+            color:'#fff'
+        }).siblings().css({
+            color:'#00A1FF',
+            backgroundColor:'#fff'
+        })
+    }
 })
 bindDeptSelect()
 //科室选择

src/js/utils.js

@@ -170,7 +170,7 @@ $(".modal .close").click(function(){
 function setBoxHeight(){
   const ht=window.innerHeight;
   $(".content-box,.flaw-table").height((ht-75)+'px');
-  $(".content-ht").height((ht-126)+"px");
+  $(".content-ht").height((ht-140)+"px");
 }
 setBoxHeight();
 $(window).resize(function(){