Merge branch 'version1.2.1' into byll

src/css/reset.less

@@ -451,7 +451,7 @@ input:-ms-input-placeholder{  /* Internet Explorer 10-11 */
   position: relative;
   top: 2px !important;
 }
-.goHomeDetail {
+.goHomeDetailColor {
   color: #00A1F0;
   cursor: pointer;
 }

src/html/console.html

@@ -125,6 +125,13 @@
         
         <div class="pubEchartB paymoney">
           <p class="title">各科室质控平均分柱状图 <img src="../images/details.png" alt=""></p>
+          <div class="toggleSlide">
+            <p data-str="内科系统" data-type="3"><span>内科系统</span><img src="../images/arrow_down.png" alt=""> </p>
+            <ul>
+              <li class="toggleAverge toggleSlide1" data-str="内科系统" data-type="3">内科系统</li>
+              <li class="toggleAverge toggleSlide2" data-str="外科系统" data-type="4">外科系统</li>
+            </ul>
+          </div>
           <div id="barChartPay" class="barChartPay" style="height: 217px;"></div>
         </div>
       </div>

src/html/qcScore.html

@@ -631,7 +631,7 @@
     <div class="main-part clearfix">
         <div class="sub-menu">
             <div class="logo">
-                <img src="../images/lantone.png" alt="" style="width: 150px">
+                <img src="../images/lantone.png" alt="" style="width: 150px;">
             </div>
             <!--<a href="javescript:void(0);" class="slide-show">
                 <img src="../images/up.png" alt="">

src/js/console.js

@@ -52,13 +52,23 @@ $(function(){
             slideType = 1
             $(".pubEchart .title").html("科室平均住院天数柱状图")
             barChart(dayLis,dateType)
-        }else{
+        }else if(type == 2){
             if(!hasData('FUNC000046')){
                 return
             }
             slideType = 2
             $(".pubEchart .title").html("科室平均住院花费柱状图")
             barChart(payMoney,dateType)
+        }else if(type == 3){//科室平均分内科
+            if(!hasData('FUNC000046')){
+                return
+            }
+            barChartPay(payMoney,dateType)
+        }else if(type == 4){//科室平均分外科
+            if(!hasData('FUNC000046')){
+                return
+            }
+            barChartPay(payMoney,dateType)
         }
         $(this).parent().slideToggle().prev().find("span").html(str)
     })

src/js/deptScoreDetailControl.js

@@ -130,7 +130,7 @@ function getTabData(activePage){
             $.alerModal({"message":res.data.msg,type:"tip",time:'1000',isFather: true, fatherWrapper: $("#mainBox", parent.document)});
         }
     }).catch((e) =>{
-    
+        
     })
 }
 
@@ -152,12 +152,12 @@ function renderTab(data,hisId,activePage){
                 <td  class="textCenter">${(activePage-1)*15 + i+1}</td>
                 <td>${item.deptId || "-"}</td>
                 <td >${item.deptName || "-"}</td>
-                <td class="goHomeDetail" data-dept="${item.deptName || ""}">${item.entryNum || "-"}</td>
+                <td class="goHomeDetailQuexian goHomeDetailColor" data-dept="${item.deptName || ""}">${item.entryNum || "-"}</td>
                 <td >${item.averageValue || "-"}</td>
                 <td >${item.mrNum || "-"}</td>
-                <td >${item.firstLevelNum || "-"}</td>
-                <td >${item.secondLevelNum || "-"}</td>
-                <td >${item.thirdLevelNum || "-"}</td>
+                <td  class="goHomeDetailB goHomeDetailColor" data-type="${item.deptName}" data-c="甲">${item.firstLevelNum || "-"}</td>
+                <td  class="goHomeDetailB goHomeDetailColor" data-type="${item.deptName}" data-c="乙">${item.secondLevelNum || "-"}</td>
+                <td  class="goHomeDetailB goHomeDetailColor" data-type="${item.deptName}" data-c="丙">${item.thirdLevelNum || "-"}</td>
                 <td >${item.firstLevelPercentStr || "-"}</td>
                 <td >${item.secondLevelPercentStr || "-"}</td>
                 <td >${item.thirdLevelPercentStr || "-"}</td>
@@ -169,10 +169,15 @@ function renderTab(data,hisId,activePage){
         <p style="margin-top:20px;margin-bottom:30px;color:#ccc;position:relative;left:5px;">暂无数据~</p>
     </td></tr>`)
     bindScoreDetail(hisId)
-    $(".goHomeDetail").click(function(){
+    $(".goHomeDetailQuexian").click(function(){
         let deptName = $(this).attr("data-dept")
         $(parent.document).find("#contentIframe").attr("src","quexianDetailControl.html?deptName="+deptName+"&from=2"+"&shijian="+statisticsType)
     })
+    $(".goHomeDetailB").click(function(){
+        let deptName = $(this).attr("data-dept")
+        let deptC = $(this).attr("data-c")
+        $(parent.document).find("#contentIframe").attr("src","quexianDetailControl.html?deptName="+deptName+"&from=2"+"&shijian="+statisticsType+"&chengdu="+deptC)
+    })
 }
 
 function scoreDetail(id,age,hid,code){