bug

src/html/deptConsole.html

@@ -10,7 +10,7 @@
     <div class="partDept">
       <ul class="clearfix">
         <div class="partTitle">
-          <p><span></span><i></i>数据概览</p>
+          <p><span class="hosdept"></span>数据概览</p>
           <div class="monthYear clearfix">
             <span class="mon">本月</span>
             <span class="year">本年</span>
@@ -36,7 +36,7 @@
         <!--<div class="grayLine"></div>-->
         <div class="partWrap clearfix">
             <div class="part01 fl">
-              <p class="partTitlePub clearfix">
+              <p class="partTitlePub clearfix numCheck">
                 <span class="name"></span>
                 <span class="personNum"></span>
               </p>

src/js/console.js

@@ -507,6 +507,7 @@ function getBarData(type){
             }
         })
     }else if(hasData('FUNC000049')&&isPlacefile==1){
+        $('.part01 .partTitlePub .name').text('出院人数统计')
         post(api.leaveHosCount,{//出院人数统计
             "type": type||1,//1月2年
             "startDate":behosDateStart,
@@ -635,7 +636,6 @@ function personNum(data){
         </ul>
     
     `)
-    $('.part01 .partTitlePub .name').text('出院人数统计')
     $(".personNum").html("总人数："+data['总人数']).parent(".chuyuannum").attr("data-num",'全部')
     $(".died").html(data['死亡人数']).parent(".chuyuannum").attr("data-num",'死亡人数')
     $(".newborn").html(data['新生儿人数']).parent(".chuyuannum").attr("data-num",'新生儿患者')

src/js/deptConsole.js

@@ -26,7 +26,7 @@ $(function(){
         $(".circleBSingle").css("display","none")
         $(".circleBLis").css("display","block")
     }
-    $(".partTitle p span.hospi").html(hospital)
+    // $(".partTitle p span.hosdept").html(hospital)
     // setInterval(() => {
     //     getTimeDetail()
     // }, 1000);
@@ -79,8 +79,11 @@ function tiaomu(dateType){
         $(parent.document).find("#contentIframe").attr("src","deptScoreDetailControlDept.html?from=2&deptName="+curDept+"&dateType="+dateType+"&curDeptId="+curDeptId+"&startDateParam="+behosDateStart+"&endDateParam="+behosDateEnd)
     });
     $(".part01 .partTitlePub").click(function(){
-        focusMenuItem("YH-KSZR-CYRSTJ_XQ");
-        $(parent.document).find("#contentIframe").attr("src","qcListOutHospitalDept.html?from=2&deptName="+curDept+"&dateType="+dateType+"&curDeptId="+curDeptId+"&startDateParam="+behosDateStart+"&endDateParam="+behosDateEnd)
+        const txt = $(this).find(".name").text()
+        if(txt == "入院人数统计"){
+            focusMenuItem("YH-KSZR-RYRSTJ_XQ");
+            $(parent.document).find("#contentIframe").attr("src","qcListOutHospitalDept.html?from=2&deptName="+curDept+"&dateType="+dateType+"&curDeptId="+curDeptId+"&startDateParam="+behosDateStart+"&endDateParam="+behosDateEnd)
+        }
     });
     $(".part02").on("click",".bingli li.sec",function(){
         focusMenuItem("YH-BLZK-ZKPFKS");
@@ -188,6 +191,7 @@ function getOwnDept(){
                 curDept = result[0].deptName
                 curDeptId = result[0].deptId
                 $(".partTitle p i,.toggleSlide p span").html(curDept).attr({"title":curDept,'data-dept':curDept,'dept-id':curDeptId})
+                $(".partTitle .hosdept").html(hospital+curDept)
                 getBarData(2)//图标数据获取
             }else {
                 $(".partTitle p i,.toggleSlide p span").html('--')
@@ -211,7 +215,8 @@ function renderDeptLis(data){
         curDept = name
         curDeptId = did
         $(this).parent().slideToggle().prev().find("span").html(name).attr({"title":name,'data-dept':curDept,'dept-id':curDeptId})
-        $(".partTitle p i").html(name).attr({"title":name,'data-dept':curDept,'dept-id':curDeptId})
+        $(".partTitle p i").html(hospital+name).attr({"title":name,'data-dept':curDept,'dept-id':curDeptId})
+        $(".partTitle .hosdept").html(hospital+name)
         if(isPlacefile == 0){
             enterHospital(dataFif[name]||[])
         }else{
@@ -237,6 +242,7 @@ function renderDeptLis(data){
 //获取图表数据
 function getBarData(type){
     if(hasData('FUNC000054')&&isPlacefile == 1){
+        $(".part01 .name").html('出院人数统计')
         post(api.leaveHosCountByDept,{//出院人数统计
             "type": type||1,//1月2年
             "startDate":behosDateStart,
@@ -251,6 +257,7 @@ function getBarData(type){
         })
     }
     if(isPlacefile == 0) {//运行入院人数
+        $(".part01 .name").html('入院人数统计').append(`<img class="detailGo" src="${require("../images/details.png")}" alt="">`)
         post(api.beHosCountByDept,{
             "type": type||1,//1月2年
             "startDate":behosDateStart,
@@ -465,7 +472,6 @@ function enterHospital(result){
         dataX.push(result[i].doctorName)
         dataY.push(result[i].num)
     }
-    $(".part01 .name").html('入院人数统计').append(`<img class="detailGo" src="${require("../images/details.png")}" alt="">`)
     if(dataX.length==0){
         $(".chuyuan,.personNum").css("display","none")
         picEmptyData(".chuyuanEmpty")
@@ -575,6 +581,7 @@ function enterHospital(result){
 }
 //part01
 function personNum(data){
+    let flg = JSON.stringify(data)!=='[]'
     if(data['总人数']==0){
         $(".chuyuan,.personNum").css("display","none")
         picEmptyData(".chuyuanEmpty")
@@ -587,20 +594,20 @@ function personNum(data){
         <ul class="clearfix" style="cursor: default;">
             <li>
             <div class="lis">
-                <p class="numShow died">${data['死亡人数']||'--'}</p>
+                <p class="numShow died">${flg?data['死亡人数']+''||'--':'--'}</p>
                 <p class="explainNum">死亡人数</p>
             </div>
             </li>
             <li class="li03">
             <div class="lis li02">
-                <p class="numShow patientNum">${data['手术病人数']||'--'}</p>
+                <p class="numShow patientNum">${flg?data['手术病人数']+''||'--':'--'}</p>
                 <p class="explainNum">手术病人数</p>
             </div>
             </li>
         </ul>
     `
     $(".personNum").html("总人数："+(data['总人数']||'--'))
-    $(".part01 .name").html('出院人数统计').append(`<img class="detailGo" src="${require('@images/details.png')}" alt="">`)
+    $(".part01 .numCheck").css({"cursor":"default"})
     $(".chuyuan").html(str)
 }
 //part02

src/js/qcListDept.js

@@ -109,7 +109,7 @@ function getTabData(activePage,qcCheckMain){
         asc:data_asc,     //升序
         desc:data_desc,       //降序
         doctorName: doctorName,
-        deptName:deptName||'',
+        deptName:deptName=="全部"?"":deptName||'',
         doctorCode: doctorNum,
         leaveHosDateStart: isPlacefile==1?behosDateStart:'', //出院日期--开始时间
         leaveHosDateEnd: isPlacefile==1?behosDateEnd:'', //出院日期--结束时间
@@ -1166,6 +1166,8 @@ $((function($){
             "chTimeEnd": qcCheckDateEnd.replace(/\//g,'-'), //病历核查截止时间
             "mrTimeStart": fpCheckDateStart.replace(/\//g,'-'), //首页核查起始时间
             "mrTimeEnd": fpCheckDateEnd.replace(/\//g,'-'), //首页核查截止时间
+            "deptName":deptName=="全部"?"":deptName||'',
+            "statisticsType":statisticsType,
         }
         $.alerModal({type:"radio",time:'1000',isFather: true, fatherWrapper: $("#mainBox", parent.document)});
         closeRadio()

src/js/utils.js

@@ -3,7 +3,7 @@ const $ = require('jquery');
 const axios = require('axios');
 var Utils = require('./rePromise');
 require('./scrollBar.js');
-const baseUrl = 'http://192.168.2.236:5858';
+const baseUrl = 'http://192.168.2.241:5858';
 //页面映射
 const pageMap = {
   'YH-KZT': 'console.html',