Prechádzať zdrojové kódy

Merge branch 'master' into referMaster

zhangxc 4 rokov pred
rodič
commit
b67f8a896b

+ 3 - 0
src/css/assertTypeDetail.less

@@ -48,6 +48,9 @@
             -moz-box-shadow: @activeColor  0px 0px 2px;
             box-shadow: @activeColor  0px 0px 2px;
         }
+        .patientNumInp{
+            position: absolute;
+        }
     }
     
     .selectLevel,.selectDept{

+ 3 - 0
src/css/common.less

@@ -149,6 +149,9 @@ th[code]{
     height: 30px;
     line-height: 30px;
 }
+.ui-widget{
+    z-index: 9999 !important;
+}
 .ui-state-default, .ui-widget-content .ui-state-default, .ui-widget-header .ui-state-default {
     border: 0;
     background-color: #fff;

+ 6 - 0
src/css/console.less

@@ -650,6 +650,12 @@ div.console {
   span{
     color: @themeFontClr;
   }
+  img {
+    width: 16px;
+    position: relative;
+    top: 3px;
+    left: 7px;
+  }
   .name {
     float: left;
     font-size: 16px;

+ 23 - 0
src/css/index.less

@@ -81,6 +81,29 @@
     font-size: 16px;
     text-indent: 15px;
   }
+  .title .qiehuan {
+    border: 1px solid #506597;
+    height: 28px;
+    line-height: 28px;
+    font-size: 14px;
+    border-radius: 14px;
+    padding: 0 15px 0 0;
+    margin-left: 20px;
+    cursor: pointer;
+    i {
+      color: #A5ADBF;
+    }
+    img {
+      width: 12px;
+      margin-right: 5px;
+    }
+    &:hover {
+      i {
+        color: #00A1FF;
+      }
+      border: 1px solid #00A1FF;
+    }
+  }
 }
 .console-cont {
   .header {

+ 2 - 1
src/css/qcListCopy.less

@@ -289,7 +289,8 @@ h2{
     color: #777;
     cursor: pointer;
     display: inline-block;
-    margin: 10px 0 0  0px;
+    // margin: 10px 0 0  0px;
+    margin: 0 0 0  50px;
 }
 .iconSetting{
     width: 18px;

+ 2 - 1
src/css/qcListOutHospital.less

@@ -296,7 +296,8 @@ h2{
     color: #777;
     cursor: pointer;
     display: inline-block;
-    margin: 10px 0 0  0px;
+    // margin: 10px 0 0  0px;
+    margin: 0 0 0  50px;
 }
 .iconSetting{
     width: 18px;

+ 2 - 1
src/css/uccDetail.less

@@ -289,7 +289,8 @@ h2{
     color: #777;
     cursor: pointer;
     display: inline-block;
-    margin: 10px 0 0  0px;
+    // margin: 10px 0 0  0px;
+     margin: 0 0 0  50px;
 }
 .iconSetting{
     width: 18px;

+ 7 - 10
src/html/console.html

@@ -32,11 +32,12 @@
                 
                   <div class="part01 fl">
                     <p class="partTitlePub clearfix" style="cursor: default;" data-type="0">
-                      <span class="name">出院人数统计</span>
+                      <span class="name"></span>
+                      <img src="../images/details.png" alt="">
                       <span class="personNum">总人数:</span>
                     </p>
-                    <div class="chuyuan">
-                      <ul class="clearfix" style="cursor: default;">
+                    <div class="chuyuan" id="chuyuan">
+                      <!-- <ul class="clearfix" style="cursor: default;">
                         <li class="topLis chuyuannum" data-type="1">
                           <p class="numShow died"></p>
                           <p class="explainNum">死亡人数</p>
@@ -57,18 +58,14 @@
                           <p class="numShow againNum"></p>
                           <p class="explainNum">31日再入院病人数</p>
                         </li>
-                        <!-- <li class="li05 li04again" data-type="5">
-                          <p class="numShow againNum"></p>
-                          <p class="explainNum">31日再入院病人数</p>
-                        </li> -->
-                      </ul>
+                      </ul> -->
                     </div>
                     <div class="chuyuanEmpty"></div>
                     <div class="defect">
                       <p class="partTitlePub">各模块缺陷占比排名 <img class="detailGo" src="../images/details.png" alt=""></p>
                       <div class="list">
                         <table class="qtable">
-              
+                          
                         </table>
                         <div class="qtableEmpty">
             
@@ -153,7 +150,7 @@
                       <div class="barChartLineEmpty"></div>
                     </div> -->
                     
-                    <div class="bldjss">
+                    <div class="bldjss" id="bldjss">
                       <div class="bingliLis clearfix">
                         <div class="panPartPub panPart02 binganhome" data-level="合格率">
                           <div class="fen" id="fen05"></div>

+ 16 - 3
src/html/index.html

@@ -17,7 +17,13 @@
     {{/if}}
         <ul>
             {{each subMenuList}}
-            <li class="page" code="${code}">${name}</li>
+                {{if isPlacefile!=1&&code!='YH-ZKK-BASYHGLZB_XQ'&&code!='YH-ZKK-CYRSTJ'&&code!='YH-ZKK-ZKHCTJ'}}
+                    <li class="page" code="${code}">${name}</li>
+                {{else}}
+                    {{if isPlacefile==1&&code!='YH-ZKK-RYRSTJ'}}
+                        <li class="page" code="${code}">${name}</li>
+                    {{/if}}
+                {{/if}}
             {{/each}}
         </ul>
     </li>
@@ -32,7 +38,13 @@
         {{if subMenuList.length}}
         <ul>
             {{each subMenuList}}
-            <li class="page" code="${code}">${name}</li>
+                {{if isPlacefile!=1&&code!='YH-ZKK-BASYHGLZB_XQ'&&code!='YH-ZKK-CYRSTJ'&&code!='YH-ZKK-ZKHCTJ'}}
+                    <li class="page" code="${code}">${name}</li>
+                {{else}}
+                    {{if isPlacefile==1&&code!='YH-ZKK-RYRSTJ'}}
+                        <li class="page" code="${code}">${name}</li>
+                    {{/if}}
+                {{/if}}
             {{/each}}
         </ul>
         {{/if}}
@@ -65,7 +77,8 @@
               <div class="header clearfix">
                   <div class="title fl">
                       <!--<img src="../images/logo.png" alt="logo" />-->
-                      <span>AI病案质控平台</span>
+                      <span class="subtitle">AI病案质控平台</span>
+                      <span class="qiehuan"><img src="../images/qiehuan2.png" alt=""><i>切换运行质控</i></span>
                   </div>
                   <div class="login fr">
                       <a class="setting" id="userName" href="javascript:void(0);">***</a>

+ 1 - 0
src/html/keyItemFlawControl.html

@@ -51,6 +51,7 @@
                 <th class="beHospitalId textCenter textBreak" code="operationTimePercentStr">病案首页手术时<br/>间不匹配率</th>
                 <th class="beHospitalId textCenter textBreak" code="crisisNum">未在6小时内书<br/>写危急值记录数</th>
                 <th class="beHospitalId textCenter textBreak" code="crisisPercentStr">未在6小时内书<br/>写危急值记录率</th>
+                <th class="beHospitalId textCenter textBreak" code="beHosGT31DaysMRNum">住院超过31日<br/>病人数</th>
                 <th class="beHospitalId textCenter textBreak" code="stageSummaryNum">阶段小结未书写<br/>数</th>
                 <th class="beHospitalId textCenter textBreak" code="stageSummaryPercentStr">阶段小结未书写<br/>率</th>
                 </thead>

+ 1 - 1
src/html/qcListOutHospital.html

@@ -18,7 +18,7 @@
         <div class="main-body">
             <div class="filterBox">
                 <div class="clearfix">
-                    <span class="filterItem">
+                    <span class="filterItem inorout">
                         <span>出院人数:</span>
                         <span class="selectLeaveHosType">全部</span>
                         <ul class="leaveHosTypeList filterDropList">

+ 1 - 1
src/html/uncorrectedCasesStatistics.html

@@ -11,7 +11,7 @@
 <body>
 <div class="container partDetailControl">
     <div class="partTitle">
-        <p>时效性相关统计</p>
+        <p><a href="console.html">控制台 / </a>时效性相关统计</p>
         <div class="dateDetail fr">
 
         </div>

BIN
src/images/qiehuan1.png


BIN
src/images/qiehuan2.png


+ 2 - 0
src/js/advice.js

@@ -10,6 +10,7 @@ const iconDown= require("./../images/arrow_down.png")
 const iconUp = require("./../images/arrow_up.png")
 const arrowLeft= require("./../images/arrow_left.png")
 const arrowRight = require("./../images/arrow_right.png")
+let isPlacefile = getCookie('isPlacefile')||1
 
 const currentPage=$(window.parent.document).find(".menu .page.active").attr("code");
 if(currentPage==="YH-ZKK-TMQXZB_XQ"){
@@ -615,6 +616,7 @@ $(function() {
       isReject:isSingleReject, //是否单项否决
       name: name, //条目名
       deptName: deptId, //科室名
+      "isPlacefile":isPlacefile,
       "startDate":startDateParam,
       "endDate":endDateParam
     };

+ 4 - 0
src/js/api.js

@@ -115,6 +115,10 @@ const api = {
     unModifyMRPageExport:'/console/export/unModifyMRPageExport',//未整改病历详情页导出
     unModifyMRStatisticsExport:'/console/export/unModifyMRStatisticsExport', //未整改病历统计导出
     reHos31DaysPageExport:'/console/export/reHos31DaysPageExport', //31天再入院统计导出
+
+
+    casesEntryStatisticsById:'/console/casesEntryStatisticsById', //入院记录24小时未完成
+    beHosCount:'/console/beHosCount', //入院人数
 }
 module.exports = {
     api

+ 3 - 0
src/js/checkControl.js

@@ -15,6 +15,8 @@ const arrowRight = require("./../images/arrow_right.png")
 $(".selectLevel").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
 $(".selectDept").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
 listenScroll()
+let isPlacefile = getCookie('isPlacefile')||1
+
 let tabList = [], name = "", behospitalCode="", behosDateStart="", level="",behosDateEnd="", scoreSum = 0,statisticsType="",
   nameTemp = "", behospitalCodeTemp="",levelTemp="", deptId="",deptIdTemp="", doctorName="", doctorNum="",doctorNameTemp="",doctorNumTemp="",
   data_desc="deptName",data_asc="";
@@ -569,6 +571,7 @@ $(function() {
         "desc":data_desc,       //降序
         "type": statisticsType||2, //1-本月,2-本年
         "startDate":startDateParam,
+        "isPlacefile":isPlacefile,
         "endDate":endDateParam
         }
         expJson(api.qcCheckStatisticsExport,param).then(res =>{

+ 185 - 81
src/js/console.js

@@ -15,11 +15,30 @@ require('./../resource/jquery-ui/jquery-ui.min.css');
 const {post,setCookie,delCookie,getCookie,focusMenuItem,picEmptyData, initScroll,listenScroll} = require('../js/utils.js');
 const { get } = require('jquery');
 let payMoney = [],behosDateStart="",ownSelectDate='',behosDateEnd="",dayLis = [],dateType = 2,slideType = 1,hospital=getCookie("hospital"),deptType="内科",deptId="",level="甲",lineType="all",lineType1=[],lineType2=[],lineType3=[],lineType4=[];
+let isPlacefile = getCookie('isPlacefile')||1
 listenScroll(".partWrap")
+if(isPlacefile == 1){
+    $(".part01 .partTitlePub").css('cursor','default')
+    $(".part01 .partTitlePub img").css('display','none')
+}else{
+    $(".part01 .partTitlePub img").css('display','inline-block')
+    $(".part01 .partTitlePub").css('cursor','pointer')
+}
 $(function(){
     if(!hasData('YH-KZT')){
         $("body").html('')
     }
+
+    const firstM = $(".menu .page",parent.document).eq(0);
+    $('.page',parent.document).removeClass("active")
+    firstM.addClass("active");
+    if(firstM.is(".YH-KZT")||firstM.is(".YH-KZTKS")){
+        $(".container",parent.document).addClass("console-cont");
+        $('.qiehuan',parent.document).css("display","inline-block")
+    }else{
+        $('.qiehuan',parent.document).css("display","none")
+    }
+
     // if(hospital == "台州市立"){
     //     $(".part03 .partTitlePub .name").html('各科室甲级病例占比')
     //     $(".innerOuter").css("display","block")
@@ -33,15 +52,16 @@ $(function(){
     // getBarData(2)//图标数据获取
     dateChange()
     $(window).resize(function(){
+        console.log('窗口大小改变');
         resizeBox()
     })
     $(window).click(function(){
         window.parent.userActionHide()
-        $(".toggleSlide ul").css("display","none")
+        $(".part02 .toggleSlide ul").css("display","none")
     })
     let sildeIS = true
     if(!hasData('FUNC000045')&&!hasData('FUNC000046')){
-        $(".toggleSlide").css("opacity","0.5")
+        $(".part02 .toggleSlide").css("opacity","0.5")
         sildeIS = false
     }
     $(".toggleSlide p").click(function(e){
@@ -137,15 +157,19 @@ function getDetails(dateType){
       $(parent.document).find("#contentIframe").attr("src","./qcList.html?from=1&dateType="+dateType+"&chengdu="+chengdu+"&startDateParam="+behosDateStart+"&endDateParam="+behosDateEnd)
     })
     $(".part03 .partTitlePub").click(function(){
-        // 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)
-        // }
-        focusMenuItem("YH-ZKK-BASYHGLZB_XQ");
-        $(parent.document).find("#contentIframe").attr("src","./partDetailControl.html?from=1&dateType="+dateType+"&lineType="+lineType+"&startDateParam="+behosDateStart+"&endDateParam="+behosDateEnd)
+        if(isPlacefile == 1){
+            focusMenuItem("YH-ZKK-BASYHGLZB_XQ");
+            $(parent.document).find("#contentIframe").attr("src","./partDetailControl.html?from=1&dateType="+dateType+"&lineType="+lineType+"&startDateParam="+behosDateStart+"&endDateParam="+behosDateEnd)
+        }else{
+            focusMenuItem("YH-ZKK-WZGBLTJ");
+            $(parent.document).find("#contentIframe").attr("src","./uncorrectedCasesStatistics.html?from=1&dateType="+dateType+"&lineType="+lineType+"&startDateParam="+behosDateStart+"&endDateParam="+behosDateEnd)
+        }
+    })
+    $(".part01 .partTitlePub").click(function(){
+        if(isPlacefile == 0){
+            focusMenuItem("YH-ZKK-RYRSTJ");
+            $(parent.document).find("#contentIframe").attr("src","./qcListOutHospital.html?inner=2&from=1&dateType="+dateType+"&lineType="+lineType+"&startDateParam="+behosDateStart+"&endDateParam="+behosDateEnd)
+        }
     })
     $(".paymoney.pubEchart .title").click(function(){
         // if($(this).text().indexOf("花费")!==-1){
@@ -348,40 +372,61 @@ function getHomeData(name){
         //         lineChartHome(dataX,datay)
         //     }
         // })
-        post(api.homePageMRCount,{//病案首页
-            "type": dateType||2,//1月2年
-            "startDate":behosDateStart,
-            "endDate":behosDateEnd,
-        }).then((res)=>{
-            let data = res.data;
-            if(data.code == 0){
-                let result1 = data.data||[]
-                let data1=result1['合格率'],data2=result1['完整率'],data3=result1['改善率'],tmp1=[],tmp2=[],tmp3=[]
-                // console.log("data1",data1)
-                if(data1&&data1.totleNum == 0){
-                   
-                    $(".binganshouye").css("display","block")
-                    $(".bldjss").css("display","none")
-                    picEmptyData(".binganshouyeEmpty")
-                    return
-                }else{
-                    $(".bldjss").css("display","block")
-                    $(".binganshouye").css("display","none")
+        if(isPlacefile == '0'){
+            // $('.bldjss').html('')
+            $(".part03 .partTitlePub .name").html('入院记录24h内未完成')
+            post(api.casesEntryStatisticsById,{
+                startDate:behosDateStart, //起始时间
+                endDate:behosDateEnd, //截止时间
+            }).then((res)=>{
+                let data = res.data;
+                if(data.code == 0){
+                    let result1 = data.data||[]
+                    let dataX1=[],dataY1=[]
+                    for(let i = 0;i < result1.length;i++){
+                        dataX1.push(result1[i].name)
+                        dataY1.push(result1[i].num)
+                    }
+                    lineChartSpecial(dataX1,dataY1,'bldjss')
                 }
-                data1.value = data1.num
-                tmp1.push(data1)
-                tmp1.push({percentStr:(1-data1.percent)*100+'%',value:data1.totleNum - data1.num})
-                part03pan(tmp1,'fen05')
-                data2.value = data2.num
-                tmp2.push(data2)
-                tmp2.push({percentStr:(1-data2.percent)*100+'%',value:data2.totleNum - data2.num})
-                part03pan(tmp2,'fen06')
-                data3.value = data3.num
-                tmp3.push(data3)
-                tmp3.push({percentStr:(1-data3.percent)*100+'%',value:data3.totleNum - data3.num})
-                part03pan(tmp3,'fen07')
-            }
-        })
+            })
+        }else{
+            post(api.homePageMRCount,{//病案首页
+                "type": dateType||2,//1月2年
+                "startDate":behosDateStart,
+                "endDate":behosDateEnd,
+            }).then((res)=>{
+                let data = res.data;
+                if(data.code == 0){
+                    let result1 = data.data||[]
+                    let data1=result1['合格率'],data2=result1['完整率'],data3=result1['改善率'],tmp1=[],tmp2=[],tmp3=[]
+                    // console.log("data1",data1)
+                    if(data1&&data1.totleNum == 0){
+                       
+                        $(".binganshouye").css("display","block")
+                        $(".bldjss").css("display","none")
+                        picEmptyData(".binganshouyeEmpty")
+                        return
+                    }else{
+                        $(".bldjss").css("display","block")
+                        $(".binganshouye").css("display","none")
+                    }
+                    data1.value = data1.num
+                    tmp1.push(data1)
+                    tmp1.push({percentStr:(1-data1.percent)*100+'%',value:data1.totleNum - data1.num})
+                    part03pan(tmp1,'fen05')
+                    data2.value = data2.num
+                    tmp2.push(data2)
+                    tmp2.push({percentStr:(1-data2.percent)*100+'%',value:data2.totleNum - data2.num})
+                    part03pan(tmp2,'fen06')
+                    data3.value = data3.num
+                    tmp3.push(data3)
+                    tmp3.push({percentStr:(1-data3.percent)*100+'%',value:data3.totleNum - data3.num})
+                    part03pan(tmp3,'fen07')
+                }
+            })
+        }
+            
     // }
 }
 //获取图表数据
@@ -434,23 +479,26 @@ function getBarData(type){
     //         }
     //     })
     // }
-    // if(hasData('FUNC000075')&&hospital=="长兴医院"){
-    //     post(api.homePageLevelLimit,{//病案首页
-    //         "type": type||1//1月2年
-    //     }).then((res)=>{
-    //         let data = res.data;
-    //         if(data.code == 0){
-    //             let result1 = data.data||[]
-    //             let dataX1=[],dataY1=[]
-    //             for(let i = 0;i < result1.length;i++){
-    //                 dataX1.push(result1[i].deptName)
-    //                 dataY1.push(result1[i].firstLevelPercentStr.replace('%',''))
-    //             }
-    //             lineChartSpecial(dataX1,dataY1)
-    //         }
-    //     })
-    // }
-    if(hasData('FUNC000049')){
+    
+    if(isPlacefile==0){
+        $(".part01 .partTitlePub .name").html('入院人数统计')
+        post(api.beHosCount,{
+            startDate:behosDateStart, //起始时间
+            endDate:behosDateEnd, //截止时间
+        }).then((res)=>{
+            let data = res.data;
+            if(data.code == 0){
+                let result1 = data.data||[]
+                let dataX1=[],dataY1=[]
+                for(let i = 0;i < result1.length;i++){
+                    dataX1.push(result1[i].name)
+                    dataY1.push(result1[i].num)
+                }
+                $(".personNum").html("总人数:"+dataY1[0]).parent(".chuyuannum").attr("data-num",'全部')
+                lineChartSpecial(dataX1,dataY1,'chuyuan')
+            }
+        })
+    }else if(hasData('FUNC000049')&&isPlacefile==1){
         post(api.leaveHosCount,{//出院人数统计
             "type": type||1,//1月2年
             "startDate":behosDateStart,
@@ -554,6 +602,32 @@ function personNum(data){
         $(".chuyuanEmpty").css("display","none")
         $(".chuyuan,.personNum").css("display","block")
     }
+    $('.chuyuan').html(`
+        <ul class="clearfix" style="cursor: default;">
+        <li class="topLis chuyuannum" data-type="1">
+            <p class="numShow died"></p>
+            <p class="explainNum">死亡人数</p>
+        </li>
+        <li class="li02 topLis chuyuannum" data-type="2">
+            <p class="numShow newborn"></p>
+            <p class="explainNum">新生儿患者</p>
+        </li>
+        <li class="li03 topLis chuyuannum" data-type="3">
+            <p class="numShow patientNum"></p>
+            <p class="explainNum">手术病人数</p>
+        </li>
+        <li class="li04 chuyuannum" data-type="4">
+            <p class="numShow goAwayNum"></p>
+            <p class="explainNum">非医嘱离院病人数</p>
+        </li>
+        <li class="li04 li04again" data-type="5">
+            <p class="numShow againNum"></p>
+            <p class="explainNum">31日再入院病人数</p>
+        </li>
+        </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",'新生儿患者')
@@ -846,21 +920,43 @@ function lineChart(dataX,dataY){
     myCharts.setOption(option);
 }
 
-function lineChartSpecial(dataX,dataY){
-    if(dataX.length==0&&dataY.length==0){
-        $(".barChartLine").css("display","none")
-        picEmptyData(".barChartLineEmpty")
-        return
+function lineChartSpecial(dataX,dataY,dom){
+    // if(dataX.length==0&&dataY.length==0){
+    //     $(".barChartLine").css("display","none")
+    //     picEmptyData(".barChartLineEmpty")
+    //     return
+    // }else{
+    //     $(".barChartLine").css("display","block")
+    //     $(".barChartLineEmpty").css("display","none")
+    // }
+    if(dom == 'chuyuan'){
+        if(dataX.length==0){
+            $(".chuyuan,.personNum").css("display","none")
+            picEmptyData(".chuyuanEmpty")
+            return
+        }else{
+            $(".chuyuanEmpty").css("display","none")
+            $(".chuyuan,.personNum").css("display","block")
+        }
     }else{
-        $(".barChartLine").css("display","block")
-        $(".barChartLineEmpty").css("display","none")
+        if(dataX.length==0){
+            $(".binganshouye").css("display","block")
+            $(".bldjss").css("display","none")
+            picEmptyData(".binganshouyeEmpty")
+            return
+        }else{
+            $(".bldjss").css("display","block")
+            $(".binganshouye").css("display","none")
+        }
     }
-    var myCharts = echarts.init(document.getElementById('lineChart'));
+    // console.log(999,dataX,dataY,dom)
+
+    var myCharts = echarts.init(document.getElementById(dom));
     $(window).resize(function(){
         myCharts.resize()
     });
     option = {
-        color: ['#37C4FC'],
+        color: dom=='chuyuan'?['#37CBCB']:['#37C4FC'],
         tooltip: {
             trigger: 'axis',
             position: 'right',
@@ -868,7 +964,7 @@ function lineChartSpecial(dataX,dataY){
                 type: 'line'        // 默认为直线,可选为:'line' | 'shadow'
             },
             formatter: function(param) {           
-                return '<div style="color:#fff;">'+ param[0].name + "<br>" +'<i style="background:#37C4FC;margin-right:5px;display:inline-block;width:8px;height:8px;border-radius:50%"></i>病案首页合格率:'+ param[0].value+"%" + "<br>"
+                return '<div style="color:#fff;">'+ param[0].name + "<br>" +'<i style="background:#37C4FC;margin-right:5px;display:inline-block;width:8px;height:8px;border-radius:50%"></i>'+(dom=="chuyuan"?"入院人数:":"入院记录24h内未完成:")+ param[0].value+ "<br>"
                 '</div>'
             }
         },
@@ -876,6 +972,7 @@ function lineChartSpecial(dataX,dataY){
             left: '3%',
             right: '4%',
             bottom: '3%',
+            top:dom == 'chuyuan'?'25':'45',
             containLabel: true
         },
         xAxis: [
@@ -892,7 +989,9 @@ function lineChartSpecial(dataX,dataY){
                     rotate:45,
                     formatter: function (value) {
                         //x轴的文字改为竖版显示
-                        if(value.length>7){
+                        if(dom == 'chuyuan'&&value.length>3){
+                            return value.slice(0,3)+'...'
+                        }else if(value.length>7){
                             return value.slice(0,7)+'...'
                         }
                         return value;
@@ -928,8 +1027,8 @@ function lineChartSpecial(dataX,dataY){
             
         ],
         title:[{
-            text: '合格率',
-            top: 15,
+            text: '数量',
+            top: dom == 'chuyuan'?0:10,
             left: 10,
             textStyle: {
                 fontSize: 14,
@@ -1096,15 +1195,17 @@ function lineChartHome(dataX,dataY){
 }
 //柱状图住院费用
 function barChartPay(dataX,dataY){
-    // console.log(dataX,dataY,78787878)
     if(dataX.length==0&&dataY.length==0){
         $("#barChartPay,.innerOuter").css("display","none")
         picEmptyData('.barChartPayEmptys')
         return
     }else{
-        if(hospital == "台州市立"){
+        if(getCookie("hospital") == "台州市立"){
+            console.log($(".innerOuter")[0],88989898)
+
             $(".innerOuter").css("display","block")
         }else{
+            console.log($(".innerOuter")[0])
             $(".innerOuter").css("display","none")
         }
         $("#barChartPay").css("display","block")
@@ -1203,14 +1304,16 @@ function barChartPay(dataX,dataY){
 function barChartLevel(dataX,dataY){
     // console.log(dataX,dataY,7887878787)
     if(dataX.length==0&&dataY.length==0){
-        $("#barChart,.toggleSlide").css("display","none")
+        $("#barChart,.part02 .toggleSlide").css("display","none")
         picEmptyData('.barChartPayEmpty')
-        return
     }else{
-        $("#barChart,.toggleSlide").css("display","block")
+        // $("#barChart,.part02 .toggleSlide").css("display","block")
+        $("#barChart,.part02 .toggleSlide").show()
         $(".barChartPayEmpty").css("display","none")
     }
     var myCharts = echarts.init(document.getElementById('barChart'));
+    // console.log(myCharts,'myCharts');
+    setTimeout(function () { myCharts.resize()},0)  // 处理 #5737bug,暂时处理方法,需后续优化
     $(window).resize(function(){
         myCharts.resize()
     });
@@ -1305,16 +1408,17 @@ function barChartLevel(dataX,dataY){
             }
         ]
     };
+    // setTimeout(function () { myCharts.setOption(option);},200)
     myCharts.setOption(option);
 }
 function barChart(data,type){
     // console.log(data,type,78787888787787)
     if(data.length==0){
-        $(".toggleSlide,#barChart").css("display","none")
+        $(".part02 .toggleSlide,#barChart").css("display","none")
         picEmptyData('.barChartPayEmpty')
         return
     }else{
-        $(".toggleSlide,#barChart").css("display","block")
+        $(".part02 .toggleSlide,#barChart").css("display","block")
         $(".barChartPayEmpty").css("display","none")
     }
     var myChart = echarts.init(document.getElementById('barChart'));

+ 2 - 0
src/js/dayDetail.js

@@ -14,6 +14,7 @@ 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 isPlacefile = getCookie('isPlacefile')||1
 
 $(".selectLevel").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
 $(".selectDept").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
@@ -570,6 +571,7 @@ $(document).on("click", function(){
 $(function($){
     $('.exportData').click(function(){
         const param = {
+            isPlacefile:isPlacefile,
             name: behospitalCode||"",
             type: statisticsType||2, //1-本月,2-本年
             dateType: "",//(3-上月,4-去年本月,5-去年(必填))

+ 3 - 0
src/js/deptScoreDetailControl.js

@@ -12,6 +12,8 @@ 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 isPlacefile = getCookie('isPlacefile')||1
+
 listenScroll()
 $(".selectLevel").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
 $(".selectDept").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
@@ -595,6 +597,7 @@ $(function() {
       "deptClass": deptId||'',
       "type": statisticsType||2, //1-本月,2-本年
       "startDate":startDateParam,
+      "isPlacefile":isPlacefile,
       "endDate":endDateParam
     };
     const url = hospital == '台州市立'?api.exportDeptFlawsTz:api.exportDeptFlaws;

+ 45 - 6
src/js/index.js

@@ -6,8 +6,9 @@ require("./modal.js")
 const {api} = require('./api.js')
 const {post,pageMap,delCookie,setCookie,getCookie,focusMenuItem,initScroll} = require('./utils.js');
 let userInfo={};
+let isPlacefile = getCookie('isPlacefile')||1
+
 $(function(){
-  getMenu();
   getOwnDept();
   setInterval(() => {
       getTimeDetail()
@@ -31,8 +32,35 @@ $(function(){
   $("#changeWord").css("opacity",hasData('FUNC000002')?'1':'0.5').hover(function(){
     $(this).css("color","#777777")
   })
-  // $("#contentIframe").attr("src",hasData('YH-KZT')?'console.html':hasData('YH-KZTKS')?'deptConsole.html':'console.html');
-  
+  if(isPlacefile==0){
+    $(this).find('i').html('切换病案质控')
+    $('.subtitle').html('AI运行质控平台')
+    getMenu()
+  }else if(isPlacefile==1){
+    $(this).find('i').html('切换运行质控')
+    $('.subtitle').html('AI病案质控平台')
+    getMenu()
+  }
+  $(".header .title .qiehuan").click(function(){
+    let txt = $(this).find('i').html()
+    if(txt == '切换运行质控'){
+      $(this).find('i').html('切换病案质控')
+      $('.subtitle').html('AI运行质控平台')
+      setCookie("isPlacefile",0)
+    }else{
+      $(this).find('i').html('切换运行质控')
+      $('.subtitle').html('AI病案质控平台')
+      setCookie("isPlacefile",1)
+    }
+    $('#contentIframe').attr('src', $('#contentIframe').attr('src'));
+    getMenu();
+  })
+  $(".header .title .qiehuan").mouseenter(function(){
+    $(this).parent().find('img').attr('src',require('../images/qiehuan1.png'))
+  })
+  $(".header .title .qiehuan").mouseleave(function(){
+    $(this).parent().find('img').attr('src',require('../images/qiehuan2.png'))
+  })
 });
 //判断有无某一权限
 function hasData(data,list){
@@ -55,6 +83,8 @@ window.userActionHide = userActionHide
 
 function initMenu(data,userInfo){
   //菜单数据填充
+  $(".menu ul").html("");
+  $(".menu-mini ul").html("");
   $("#menuTmpl").tmpl(data).appendTo(".menu ul");
   $("#miniMenuTmpl").tmpl(data).appendTo(".menu-mini ul");
   //用户数据填充
@@ -65,10 +95,12 @@ function initMenu(data,userInfo){
   if(firstM.is(".YH-KZT")||firstM.is(".YH-KZTKS")){
   // if($(".menu .page").eq(0).is(".YH-KZT")){
     $(".container").addClass("console-cont");
+    $('.qiehuan').css("display","inline-block")
+  }else{
+    $('.qiehuan').css("display","none")
   }
   //菜单收起展开
   $(".menu .list-1").on("click",function(){
-
     if($(this).is(".list-1-show")){
       $(this).removeClass("list-1-show")
       $(this).find("ul").slideToggle();
@@ -90,7 +122,7 @@ function initMenu(data,userInfo){
     // },300)
   });
 //收起菜单
-  $(".slide-hide").click(function(){
+$(".slide-hide").off("click").click(function(){
     $(".menu,.copy-right").animate({"width":"60px"},function(){
       $(this).hide();
       $(".menu-mini").show();
@@ -98,7 +130,7 @@ function initMenu(data,userInfo){
     $(".main").animate({"margin-left":"60px"});
   });
   //展开菜单
-  $(".slide-show").click(function(){
+  $(".slide-show").off("click").click(function(){
     $(".menu-mini").hide();
     $(".menu,.copy-right").show().animate({"width":"205px"},function(){
     });
@@ -115,7 +147,9 @@ function initMenu(data,userInfo){
     if(code === 'YH-KZT'||code === 'YH-KZTKS'){
       // if(code === 'YH-KZT'){
       $(".container").addClass("console-cont");
+      $('.qiehuan').css("display","inline-block")
     }else{
+      $('.qiehuan').css("display","none")
       $(".container").removeClass("console-cont");
     }
     const mItems = $(".menu .page[code="+code+"],.menu-mini .page[code="+code+"]");
@@ -148,9 +182,14 @@ function getOwnDept(){
   // }
 }
 function getMenu(){
+  // console.log(api.getMenu)
+  isPlacefile = getCookie('isPlacefile')||1
   post(api.getMenu).then(function(res){
     if(res.data.code==='0'){
       const data = res.data.data;
+      for(let i = 0;i<data.menuWrappers.length;i++){
+        data.menuWrappers[i].isPlacefile = isPlacefile
+      }
       initMenu(data.menuWrappers,data.userLoginDTO);
       userInfo = data.userLoginDTO
       setCookie("hospital",data.basHospitalInfoDTO.name)

+ 2 - 0
src/js/itemDefectDetail.js

@@ -14,6 +14,7 @@ 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 isPlacefile = getCookie('isPlacefile')||1
 
 let srcUrl = $("#contentIframe",parent.document).attr("src")
 let statisticsType = getUrlArgObjectNew("dateType",srcUrl)||getUrlArgObjectNew("shijian",srcUrl) || "";
@@ -658,6 +659,7 @@ $(function(){
         }
         const param = {
             behospitalCode: behospitalCode,
+            isPlacefile: isPlacefile, 
             patName: name, //病人姓名
             level:level,//病历等级
             behDeptName: deptName,

+ 2 - 0
src/js/jiaji.js

@@ -14,6 +14,7 @@ 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 isPlacefile = getCookie('isPlacefile')||1
 
 $(".selectLevel").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
 $(".selectDept").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
@@ -589,6 +590,7 @@ $(function() {
         }
         const param = {
             name: behospitalCode||"",
+            isPlacefile:isPlacefile,
             type: 0, //1-本月,2-本年,0-自定义时间(现在 都是自定义时间,都会传具体时间进去)
             dateType: level||"",//(3-上月,4-去年本月,5-去年(必填))
             "startDate":startDateParam,

+ 9 - 3
src/js/keyItemFlawControl.js

@@ -25,6 +25,8 @@ $(".selectDept").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
 }*/
 //setTitleTxt('',from)         //导航栏面包屑
 listenScroll()
+let isPlacefile = getCookie('isPlacefile')||1
+
 if(statisticsType == 1){
   setDatePicker($("#datepicker"),$("#datepicker2"),1)
 }else if(statisticsType == 2){
@@ -135,6 +137,7 @@ function renderTab(data,hisId,activePage){
                 <td >${item.operationTimePercentStr+'' || "-"}</td>
                 <td class="goHomeDetail" dept-id="${item.deptId || ""}" dept-name="${item.deptName || ""}" data-id="${item.crisisEntryId || ""}" data-name="${item.crisisEntryName || ""}">${item.crisisNum+'' || "-"}</td>
                 <td >${item.crisisPercentStr+'' || "-"}</td>
+                <td class="goHomeDetail" dept-id="${item.deptId || ""}" dept-name="${item.deptName || ""}" data-fromDays="1">${item.beHosGT31DaysMRNum + '' || "-"}</td>
                 <td class="goHomeDetail" dept-id="${item.deptId || ""}" dept-name="${item.deptName || ""}" data-id="${item.stageSummaryEntryId || ""}" data-name="${item.stageSummaryEntryName || ""}">${item.stageSummaryNum+'' || "-"}</td>
                 <td >${item.stageSummaryPercentStr+'' || "-"}</td>
             </tr>
@@ -148,7 +151,9 @@ function renderTab(data,hisId,activePage){
     let name=$(this).attr("dept-name");
     name=name==="全院"?"全部":name;
     let id=$(this).attr("dept-id");
-    $(parent.document).find("#contentIframe").attr("src","qcListCopy.html?from=3&deptName="+name+"&deptId="+id+"&casesEntryId="+casesId+"&defectName="+casesName+"&startDate="+startDateParam+"&endDate="+endDateParam)
+    // 确定31天处跳转
+    let fromDays = $(this).attr("data-fromDays");
+    $(parent.document).find("#contentIframe").attr("src", "qcListCopy.html?from=3&deptName=" + name + "&deptId=" + id + "&casesEntryId=" + casesId + "&defectName=" + casesName + "&startDate=" + startDateParam + "&endDate=" + endDateParam + "&fromDays=" + fromDays)
   })
   // initScroll("partDetailControl","YX",1)
 }
@@ -319,11 +324,12 @@ $(function() {
           return
       }
       const param = {
+        "isPlacefile":isPlacefile,
         "deptName": deptName,
         "asc":data_asc,     //升序
         "desc":data_desc,       //降序
-        "startDate":startDateParam,
-        "endDate":endDateParam
+        "startDate":startDateParam.replace(/\//g,'-'),
+        "endDate":endDateParam.replace(/\//g,'-')
       }
       expJson(api.entryStatisticsExport,param).then(res =>{
           downloadExportedData(res.data, "关键条目缺陷占比.xls")

+ 1 - 1
src/js/login.js

@@ -52,7 +52,7 @@ function sureLogin(){
     const data = res.data;
     if(data.code == 0){
       setCookie('accessToken',data.data.accessToken)
-     
+      setCookie('isPlacefile',1)
       localStorage.setItem('accessToken',data.data.accessToken)
       $(".divModal").remove()
       $.alerModal({"message":"登录成功",type:"tip",time:'1000',win:true});

+ 3 - 3
src/js/mukuaiControl.js

@@ -10,8 +10,7 @@ const iconDown= require("./../images/arrow_down.png")
 const iconUp = require("./../images/arrow_up.png")
 const arrowLeft= require("./../images/arrow_left.png")
 const arrowRight = require("./../images/arrow_right.png")
-
-
+let isPlacefile = getCookie('isPlacefile')||1
 let casesId="", name="", isReject ="", isUsed ="",casesIdTemp="", nameTemp="", isRejectTemp ="", isUsedTemp ="",from="",deptIdTemp="",deptItemId="",deptId="",data_asc=[], data_desc=['percent'],startDateParam="", endDateParam=""   
 
 $(".selectModuleType").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
@@ -578,7 +577,8 @@ $(function() {
             asc:data_asc,     //升序
             desc: data_desc,       //降序
             "startDate":startDateParam,
-            "endDate":endDateParam
+            "endDate":endDateParam,
+            "isPlacefile":isPlacefile
         }
         expJson(api.entryCountGroupByCaseExport,param).then(res =>{
             downloadExportedData(res.data, "各模块缺陷占比.xls")

+ 3 - 0
src/js/partDetailControl.js

@@ -15,6 +15,8 @@ const arrowRight = require("./../images/arrow_right.png")
 $(".selectLevel").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
 $(".selectDept").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
 listenScroll()
+let isPlacefile = getCookie('isPlacefile')||1
+
 let tabList = [], name = "", behospitalCode="", behosDateStart="", level="",behosDateEnd="", scoreSum = 0,statisticsType="",
   nameTemp = "", behospitalCodeTemp="",levelTemp="", deptId="",deptIdTemp="", doctorName="", doctorNum="",doctorNameTemp="",doctorNumTemp="",
   data_desc="deptName",data_asc="";
@@ -562,6 +564,7 @@ $(function() {
         return
         }
         const param = {
+        "isPlacefile":isPlacefile,
         "level": deptId||"",
         "name": behospitalCode||"",
         "asc":data_asc,     //升序

+ 2 - 0
src/js/payDetail.js

@@ -14,6 +14,7 @@ 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 isPlacefile = getCookie('isPlacefile')||1
 
 $(".selectLevel").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
 $(".selectDept").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
@@ -573,6 +574,7 @@ $(document).on("click", function(){
 $(function($){
     $('.exportData').click(function(){
         const param = {
+            isPlacefile:isPlacefile,
             name: behospitalCode||"",
             type: statisticsType||2, //1-本月,2-本年
             dateType: "",//(3-上月,4-去年本月,5-去年(必填))

+ 35 - 12
src/js/qcList.js

@@ -36,6 +36,10 @@ let tabList = [], name = "", behospitalCode="", behosDateStart="", level="",beho
   nameTemp = "", behospitalCodeTemp="",levelTemp="", deptId="",deptIdTemp="", doctorName="", doctorNum="",doctorNameTemp="",doctorNumTemp="",
   fpCheckStatus="",fpCheckStatusTemp="",fpCheckName="",fpCheckNameTemp="",qcCheckName="",qcCheckNameTemp="",qcCheckStatus="",qcCheckStatusTemp="",fpCheckDateStart="",fpCheckDateEnd="",
   qcCheckDateStart="",qcCheckDateEnd="",data_desc=["leave_hospital_date"],data_asc=[];
+let isPlacefile = getCookie('isPlacefile')||1
+if(isPlacefile != 1){
+    data_desc=["behospital_date"]
+}
 if(chengdu){
     levelTemp = chengdu
     level = chengdu
@@ -100,8 +104,10 @@ function getTabData(activePage){
         desc:data_desc,       //降序
         doctorName: doctorName,
         doctorCode: doctorNum,
-        leaveHosDateStart: behosDateStart, //出院日期--开始时间
-        leaveHosDateEnd: behosDateEnd, //出院日期--结束时间
+        leaveHosDateStart: isPlacefile==1?behosDateStart:'', //出院日期--开始时间
+        leaveHosDateEnd: isPlacefile==1?behosDateEnd:'', //出院日期--结束时间
+        "behosDateStart": isPlacefile==1?'':behosDateStart, //出院日期--开始时间
+        "behosDateEnd": isPlacefile==1?'':behosDateEnd, //出院日期--结束时间
         size: 15,
         statisticsType:statisticsType,
         checkStatus: qcCheckStatus?Number(qcCheckStatus):qcCheckStatus, //病历核查状态
@@ -217,6 +223,9 @@ $(".abnormalClear").on("click", function(e){
     qcCheckStatus="";
     qcCheckStatusTemp=""
     data_desc=["leave_hospital_date"];
+    if(isPlacefile != 1){
+        data_desc=["behospital_date"]
+    }
     data_asc=[];
     $('.patientNumInp').val('')
     $('.patientNameInp').val('')
@@ -273,7 +282,11 @@ $(".abnormalClear").on("click", function(e){
     $(".qcCheckList").css("display", "none")
     $(".qcSelectCheck").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
     $("th[code]").removeClass("asc desc")
-    $(".leaveHospitalDate").addClass(" desc")
+    if(isPlacefile == 1){
+        $(".leaveHospitalDate").addClass(" desc")
+    }else{
+        $(".behospitalDate").addClass(" desc")
+    }
     behosDateStart = $("#datepicker").val()
     behosDateEnd = $("#datepicker2").val()
     if(behosDateStart){
@@ -301,10 +314,12 @@ function renderTab(data,hisId){
         if(!item.hasSelect){
             hasSelectAll = false
         }
+
+        // <td  class="recordScoreOperaBtn textCenter" style="opacity:${hasData('FUNC000017')?'1':'0.5'}">评分</td>
         str += `
             <tr  data-index=${i}>
                 <td class="scoreOperaItem textCenter">${item.hasSelect ? `<img class="iconCheck" src=${iconCheck} />`:`<img class="iconCheck" src=${iconUnCheck} />`}</td>
-                <td  class="recordScoreOperaBtn textCenter" style="opacity:${hasData('FUNC000017')?'1':'0.5'}">评分</td>`
+                `
         for(let j = 0; j < pageSet.length; j++){
             if(pageSet[j].status == 1){
                 if(pageSet[j].val === "checkStatus" || pageSet[j].val === "mrStatus" ){
@@ -563,13 +578,14 @@ function getPageSet(){
 }
 
 function renderTabTitle(data){
-    let str = ` <th class="textCenter" ></th>
-    <th class="recordScoreOpera textCenter" style="width: 65px;">操作</th>`
+    // <th class="recordScoreOpera textCenter" style="width: 65px;">操作</th>
+    let str = `<th class="textCenter" ></th>`
+    let defaultOrder = isPlacefile == 1 ? 'leaveHospitalDate':'behospitalDate'
     for(let i = 0; i < data.length; i++){
         const item = data[i]
         if(item.status == 1){
             showNum++
-            str += `<th class="textCenter ${item.val} ${item.val =='leaveHospitalDate' ? 'desc':''}" code="${item.val.replace(/([A-Z])/g,function(match) {
+            str += `<th class="textCenter ${item.val} ${item.val == defaultOrder ? 'desc':''}" code="${item.val.replace(/([A-Z])/g,function(match) {
                 return '_' + match.toLowerCase()    
             })}">${item.name}</th>`
         }
@@ -636,6 +652,7 @@ function hideLoading(){
 
 function bindRecordScoreBtn(){
     $('.recordScoreBtn').off("click").on("click",function(e){
+        scoreSum = 0;   // 解决全选评分之后  再单选 toast不隐藏的bug
         if(!hasData('FUNC000017')){
             return
         }
@@ -682,22 +699,25 @@ function recordScore(behospitalCode,totalNum,hasToast){
         behospitalCode: behospitalCode
     }
     post(api.recordScore,param).then(res =>{
-        if(res.data.code == '0'){
+        // hideLoading()
+        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',win:true,isFather: true, fatherWrapper: $("#mainBox", parent.document)});
+                //   $.alerModal({"message":'评分成功',type:"tip",time:'1000',win:true,isFather: true, fatherWrapper: $("#mainBox", parent.document)});
+                  $.alerModal({"message":'评分成功',type:"tip",time:'1000',isFather: true, fatherWrapper: $("#mainBox", parent.document)});
                 }
             }
             
         }else{
+            
             hideLoading()
             if(hasToast){
+                // $.alerModal({"message":res.data.msg || '评分失败',type:"tip",time:'1000',isFather: true, fatherWrapper: $("#mainBox", parent.document)});
                 $.alerModal({"message":'评分失败',type:"tip",time:'1000',isFather: true, fatherWrapper: $("#mainBox", parent.document)});
             }
         }
@@ -1079,8 +1099,11 @@ $((function($){
             "doctorName": doctorName,
             "asc":data_asc,     //升序
             "desc":data_desc,       //降序
-            "leaveHosDateEnd": behosDateEnd,
-            "leaveHosDateStart": behosDateStart,
+            "leaveHosDateStart": isPlacefile==1?behosDateStart:'', //出院日期--开始时间
+            "leaveHosDateEnd": isPlacefile==1?behosDateEnd:'', //出院日期--结束时间
+            "behosDateStart": isPlacefile==1?'':behosDateStart, //出院日期--开始时间
+            "behosDateEnd": isPlacefile==1?'':behosDateEnd, //出院日期--结束时间
+            "isPlacefile": isPlacefile,
             "level": level,
             "name": name,
             "checkStatus": qcCheckStatus?Number(qcCheckStatus):qcCheckStatus, //病历核查状态

+ 47 - 9
src/js/qcListCopy.js

@@ -18,6 +18,7 @@ const goUpG= require("./../images/arrow_up_grey.png")
 const goUpB = require("./../images/arrow_up_blue.png")
 const goDownG= require("./../images/arrow_down_grey.png")
 const goDownB = require("./../images/arrow_down_blue.png")
+let isPlacefile = getCookie('isPlacefile')||1
 
 let pageSet = [],pageSetCopy = [], showNum = 0, scrollTop=0;
 let srcUrl = $("#contentIframe",parent.document).attr("src")
@@ -30,11 +31,13 @@ let startDateParam = getUrlArgObjectNew("startDate",srcUrl)||""
 let endDateParam = getUrlArgObjectNew("endDate",srcUrl)||""
 let from = getUrlArgObjectNew("from",srcUrl)||""
 let defectName = getUrlArgObjectNew("defectName",srcUrl)||"";
-let casesEntryId = getUrlArgObjectNew("defectId",srcUrl)|| "";
+let casesEntryId = getUrlArgObjectNew("casesEntryId",srcUrl)|| "";
 let casesId = getUrlArgObjectNew("casesId",srcUrl)|| "";
 let  ruleType = getUrlArgObjectNew("ruleType",srcUrl)||""
 let isSingleReject = getUrlArgObjectNew("isSingleReject",srcUrl)||""
+let fromDays = getUrlArgObjectNew("fromDays", srcUrl) || ""
 let deptListDept = JSON.parse(getCookie("deptList"))||[]
+
 let currentPage;
 $(".selectLevel").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
 $(".selectDept").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
@@ -43,9 +46,12 @@ $(".qcSelectCheck").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
 let tabList = [], name = "", behospitalCode="", behosDateStart="", level="",behosDateEnd="", scoreSum = 0,
   nameTemp = "", behospitalCodeTemp="",levelTemp="", deptId="",deptIdTemp="", doctorName="", deptName="", deptNameTemp="",doctorNum="",doctorNameTemp="",doctorNumTemp="",
   fpCheckStatus="",fpCheckStatusTemp="",fpCheckName="",fpCheckNameTemp="",qcCheckName="",qcCheckNameTemp="",qcCheckStatus="",qcCheckStatusTemp="",fpCheckDateStart="",fpCheckDateEnd="",
-  qcCheckDateStart="",qcCheckDateEnd="",
+    qcCheckDateStart = "", qcCheckDateEnd = "", casesEntryName="",
   data_desc=["leaveHospitalDate"],data_asc=[];
 listenScroll('.qcListCopy')
+if(isPlacefile != 1){
+    data_desc=["behospitalDate"]
+}
 if(chengdu){
     levelTemp = chengdu
     level = chengdu
@@ -53,7 +59,7 @@ if(chengdu){
     $(".levelList").css("display", "none")
     $(".selectLevel").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
 }
-if(defectName){
+if (defectName && defectName !== 'undefined'){
     casesEntryName=defectName
     $('.selectDefect').html(casesEntryName)
 }
@@ -133,6 +139,14 @@ $("#filterToggler").click(function(){
     return false;
 }
 function getTabData(activePage){
+    // 判断是否是 住院超过31日病人数   
+    let beHosGT31Days = null
+    if (fromDays && fromDays === "1") {
+       beHosGT31Days = 1
+    }
+    if (casesEntryId === 'undefined') {
+        casesEntryId = ""
+    }
     const param = {
         current:activePage,
         behospitalCode: behospitalCode,
@@ -144,8 +158,9 @@ function getTabData(activePage){
         startDate: behosDateStart.replace(/\//g,'-'), //出院日期--开始时间
         endDate: behosDateEnd.replace(/\//g,'-'), //出院日期--结束时间
         casesEntryName: casesEntryName,
-        casesEntryId:"",
+        casesEntryId: casesEntryId,
         casesId:casesId,
+        beHosGT31Days,
         size: 15,
         ruleType:ruleType,
         isReject: isSingleReject,
@@ -267,6 +282,9 @@ $(".abnormalClear").on("click", function(e){
     qcCheckStatus="";
     qcCheckStatusTemp=""
     data_desc=["leaveHospitalDate"]
+    if(isPlacefile != 1){
+        data_desc=["behospitalDate"]
+    }
     data_asc=[];
     if(from == 2){
         deptId=deptListDept[0]&&deptListDept[0].deptId; 
@@ -348,7 +366,11 @@ $(".abnormalClear").on("click", function(e){
     $(".qcCheckList").css("display", "none")
     $(".qcSelectCheck").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
     $("th[code]").removeClass("asc desc")
-    $(".leaveHospitalDate").addClass(" desc")
+    if(isPlacefile == 1){
+        $(".leaveHospitalDate").addClass(" desc")
+    }else{
+        $(".behospitalDate").addClass(" desc")
+    }
     behosDateStart = $("#datepicker").val()
     behosDateEnd = $("#datepicker2").val()
     if(behosDateStart){
@@ -376,9 +398,13 @@ function renderTab(data,hisId){
         if(!item.hasSelect){
             hasSelectAll = false
         }
+        // str += `
+        //     <tr  data-index=${i}>
+        //         <td  class="textCenter">${(currentPage-1)*15 + i+1}</td>`
         str += `
             <tr  data-index=${i}>
-                <td  class="textCenter">${(currentPage-1)*15 + i+1}</td>`
+                <td class="scoreOperaItem textCenter">${item.hasSelect ? `<img class="iconCheck" src=${iconCheck} />` : `<img class="iconCheck" src=${iconUnCheck} />`}</td>
+                `
         for(let j = 0; j < pageSet.length; j++){
             if(pageSet[j].status == 1){
                 if(pageSet[j].val === "checkStatus" || pageSet[j].val === "mrStatus"  ){
@@ -636,17 +662,21 @@ function getPageSet(){
 }
 
 function renderTabTitle(data){
-    let str = `
-    <th class="textCenter" style="width: 65px;">序号</th>`
+    // let str = `
+    // <th class="textCenter" style="width: 65px;">序号</th>`
+    let str = ` <th class="textCenter" ></th>`
+    let defaultOrder = isPlacefile == 1 ? 'leaveHospitalDate':'behospitalDate'
     for(let i = 0; i < data.length; i++){
         const item = data[i]
         if(item.status == 1){
             showNum++
-            str += `<th class="textCenter ${item.val} ${item.val =='leaveHospitalDate' ? 'desc':''}" code="${item.val}">${item.name}</th>`
+            str += `<th class="textCenter ${item.val} ${item.val ==defaultOrder ? 'desc':''}" code="${item.val}">${item.name}</th>`
         }
     }
     let operStr=`<td colspan="${showNum+2}" style="background: #fff">
         <div class="tabFoot">
+            <span class="scoreOpera" data-selectAll=false><img class="iconCheck" src="${iconUnCheck}" alt="checkbox">全选</span>
+            <span class="recordScoreBtn">评分</span>
             <span class="setCol"><img class="iconSetting" src=${require('./../images/setting.png')} alt="关闭" />列设置</span>
         </div>
     </td>`
@@ -709,6 +739,7 @@ function hideLoading(){
 
 function bindRecordScoreBtn(){
     $('.recordScoreBtn').off("click").on("click",function(e){
+        scoreSum = 0;   // 解决全选评分之后  再单选 toast不隐藏的bug
         if(!hasData('FUNC000017')){
             return
         }
@@ -1142,6 +1173,11 @@ $(function($){
             $.alerModal({"message":"最多只能导出7天",type:"tip",time:'1000',isFather: true, fatherWrapper: $("#mainBox", parent.document)});
             return
         }
+        // 判断是否是 住院超过31日病人数   
+        let beHosGT31Days = null
+        if (fromDays && fromDays === "1") {
+            beHosGT31Days = 1
+        }
         const param = {
             behospitalCode: behospitalCode,
             patName: name, //病人姓名
@@ -1153,8 +1189,10 @@ $(function($){
             startDate: behosDateStart.replace(/\//g,'-'), //出院日期--开始时间
             endDate: behosDateEnd.replace(/\//g,'-'), //出院日期--结束时间
             casesEntryName: casesEntryName,
+            isPlacefile: isPlacefile,
             casesEntryId:"",
             casesId:casesId,
+            beHosGT31Days,
             isReject: isSingleReject,
             doctorName: doctorName,
             doctorId: doctorNum,

+ 26 - 10
src/js/qcListDept.js

@@ -36,6 +36,7 @@ let tabList = [], name = "", behospitalCode="", behosDateStart="", level="",beho
   behospitalCodeTemp="",levelTemp="", deptId="",deptIdTemp="", doctorName="", doctorNameTemp="", doctorNum="", doctorNumTemp="",
   fpCheckStatus="",fpCheckStatusTemp="",fpCheckName="",fpCheckNameTemp="",qcCheckName="",qcCheckNameTemp="",qcCheckStatus="",qcCheckStatusTemp="",fpCheckDateStart="",fpCheckDateEnd="",
   qcCheckDateStart="",qcCheckDateEnd="",data_desc=["leave_hospital_date"],data_asc=[];
+let isPlacefile = getCookie('isPlacefile')||1
 
 $("#filterToggler").click(function(){
   const text = $(this).text();
@@ -43,7 +44,9 @@ $("#filterToggler").click(function(){
   $(this).text(text==="收起筛选"?"展开筛选":"收起筛选").toggleClass("up");
 });
 
-console.log('docName',docName)
+if(isPlacefile != 1){
+    data_desc=["behospital_date"]
+}
 if(chengdu){
     levelTemp = chengdu
     level = chengdu
@@ -103,8 +106,10 @@ function getTabData(activePage){
         desc:data_desc,       //降序
         doctorName: doctorName,
         doctorCode: doctorNum,
-        leaveHosDateStart: behosDateStart, //1-单项否决 0-非
-        leaveHosDateEnd: behosDateEnd, //0-未启用 1-启用
+        leaveHosDateStart: isPlacefile==1?behosDateStart:'', //出院日期--开始时间
+        leaveHosDateEnd: isPlacefile==1?behosDateEnd:'', //出院日期--结束时间
+        "behosDateStart": isPlacefile==1?'':behosDateStart, //出院日期--开始时间
+        "behosDateEnd": isPlacefile==1?'':behosDateEnd, //出院日期--结束时间
         size: 15,
         statisticsType:statisticsType,
         checkStatus: qcCheckStatus?Number(qcCheckStatus):qcCheckStatus, //病历核查状态
@@ -218,6 +223,9 @@ $(".abnormalClear").on("click", function(e){
     qcCheckStatus="";
     qcCheckStatusTemp=""
     data_desc=["leave_hospital_date"]
+    if(isPlacefile != 1){
+        data_desc=["behospital_date"]
+    }
     data_asc=[];
     $('.patientNumInp').val('')
     $('.patientNameInp').val('')
@@ -274,7 +282,11 @@ $(".abnormalClear").on("click", function(e){
     $(".qcCheckList").css("display", "none")
     $(".qcSelectCheck").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
     $("th[code]").removeClass("asc desc")
-    $(".leaveHospitalDate").addClass(" desc")
+    if(isPlacefile == 1){
+        $(".leaveHospitalDate").addClass(" desc")
+    }else{
+        $(".behospitalDate").addClass(" desc")
+    }
     behosDateStart = $("#datepicker").val()
     behosDateEnd = $("#datepicker2").val()
     if(behosDateStart){
@@ -320,10 +332,11 @@ function renderTab(data){
         if(!item.hasSelect){
             hasSelectAll = false
         }
+        // <td  class="recordScoreOperaBtn textCenter" style="opacity:${hasData('FUNC000017')?'1':'0.5'}">评分</td>
         str += `
             <tr  data-index=${i}>
                 <td class="scoreOperaItem textCenter">${item.hasSelect ? `<img class="iconCheck" src=${iconCheck} />`:`<img class="iconCheck" src=${iconUnCheck} />`}</td>
-                <td  class="recordScoreOperaBtn textCenter" style="opacity:${hasData('FUNC000017')?'1':'0.5'}">评分</td>`
+                `
         for(let j = 0; j < pageSet.length; j++){
             if(pageSet[j].status == 1){
                 if(pageSet[j].val === "checkStatus" || pageSet[j].val === "mrStatus" ){
@@ -584,13 +597,13 @@ function getPageSet(){
 }
 
 function renderTabTitle(data){
-    let str = ` <th class="textCenter" ></th>
-    <th class="recordScoreOpera textCenter" style="width: 65px;">操作</th>`
+    let str = ` <th class="textCenter" ></th>`
+    let defaultOrder = isPlacefile == 1 ? 'leaveHospitalDate':'behospitalDate'
     for(let i = 0; i < data.length; i++){
         const item = data[i]
         if(item.status == 1){
             showNum++
-            str += `<th class="textCenter ${item.val} ${item.val =='leaveHospitalDate' ? 'desc':''}" code="${item.val.replace(/([A-Z])/g,function(match) {
+            str += `<th class="textCenter ${item.val} ${item.val == defaultOrder ? 'desc':''}" code="${item.val.replace(/([A-Z])/g,function(match) {
                 return '_' + match.toLowerCase()    
             })}">${item.name}</th>`
         }
@@ -1076,8 +1089,11 @@ $((function($){
             "doctorName": doctorName,
             "asc":data_asc,     //升序
             "desc":data_desc,       //降序
-            "leaveHosDateEnd": behosDateEnd,
-            "leaveHosDateStart": behosDateStart,
+            "leaveHosDateStart": isPlacefile==1?behosDateStart:'', //出院日期--开始时间
+            "leaveHosDateEnd": isPlacefile==1?behosDateEnd:'', //出院日期--结束时间
+            "behosDateStart": isPlacefile==1?'':behosDateStart, //出院日期--开始时间
+            "behosDateEnd": isPlacefile==1?'':behosDateEnd, //出院日期--结束时间
+            "isPlacefile": isPlacefile,
             "level": level,
             "name": name,
             "checkStatus": qcCheckStatus?Number(qcCheckStatus):qcCheckStatus, //病历核查状态

+ 26 - 10
src/js/qcListDocteam.js

@@ -33,13 +33,16 @@ let tabList = [], name = "", behospitalCode="", behosDateStart="", level="",beho
   behospitalCodeTemp="",levelTemp="", deptId="",deptIdTemp="", doctorName="", doctorNameTemp="", doctorNum="", doctorNumTemp="",
   fpCheckStatus="",fpCheckStatusTemp="",fpCheckName="",fpCheckNameTemp="",qcCheckName="",qcCheckNameTemp="",qcCheckStatus="",qcCheckStatusTemp="",fpCheckDateStart="",fpCheckDateEnd="",
   qcCheckDateStart="",qcCheckDateEnd="",data_desc=["leave_hospital_date"],data_asc=[];
+let isPlacefile = getCookie('isPlacefile')||1
 
 $("#filterToggler").click(function(){
   const text = $(this).text();
   $(".toggle-item").slideToggle();
   $(this).text(text==="收起筛选"?"展开筛选":"收起筛选").toggleClass("up");
 });
-
+if(isPlacefile != 1){
+    data_desc=["behospital_date"]
+}
 if(chengdu){
     levelTemp = chengdu
     level = chengdu
@@ -86,8 +89,10 @@ function getTabData(activePage){
         desc:data_desc,       //降序
         doctorName: doctorName,
         doctorCode: doctorNum,
-        leaveHosDateStart: behosDateStart, //1-单项否决 0-非
-        leaveHosDateEnd: behosDateEnd, //0-未启用 1-启用
+        "leaveHosDateStart": isPlacefile==1?behosDateStart:'', //出院日期--开始时间
+        "leaveHosDateEnd": isPlacefile==1?behosDateEnd:'', //出院日期--结束时间
+        "behosDateStart": isPlacefile==1?'':behosDateStart, //出院日期--开始时间
+        "behosDateEnd": isPlacefile==1?'':behosDateEnd, //出院日期--结束时间
         size: 15,
         statisticsType:statisticsType,
         checkStatus: qcCheckStatus?Number(qcCheckStatus):qcCheckStatus, //病历核查状态
@@ -205,6 +210,9 @@ $(".abnormalClear").on("click", function(e){
     qcCheckStatus="";
     qcCheckStatusTemp=""
     data_desc=["leave_hospital_date"]
+    if(isPlacefile != 1){
+        data_desc=["behospital_date"]
+    }
     data_asc=[];
     $('.patientNumInp').val('')
     $('.patientNameInp').val('')
@@ -257,7 +265,11 @@ $(".abnormalClear").on("click", function(e){
     $(".qcCheckList").css("display", "none")
     $(".qcSelectCheck").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
     $("th[code]").removeClass("asc desc")
-    $(".leaveHospitalDate").addClass(" desc")
+    if(isPlacefile == 1){
+        $(".leaveHospitalDate").addClass(" desc")
+    }else{
+        $(".behospitalDate").addClass(" desc")
+    }
     behosDateStart = $("#datepicker").val()
     behosDateEnd = $("#datepicker2").val()
     if(behosDateStart){
@@ -303,10 +315,11 @@ function renderTab(data){
         if(!item.hasSelect){
             hasSelectAll = false
         }
+        // <td  class="recordScoreOperaBtn textCenter" style="opacity:${hasData('FUNC000017')?'1':'0.5'}">评分</td>
         str += `
             <tr  data-index=${i}>
                 <td class="scoreOperaItem textCenter">${item.hasSelect ? `<img class="iconCheck" src=${iconCheck} />`:`<img class="iconCheck" src=${iconUnCheck} />`}</td>
-                <td  class="recordScoreOperaBtn textCenter" style="opacity:${hasData('FUNC000017')?'1':'0.5'}">评分</td>`
+                `
         for(let j = 0; j < pageSet.length; j++){
             if(pageSet[j].status == 1){
                 if(pageSet[j].val === "checkStatus" || pageSet[j].val === "mrStatus" ){
@@ -533,13 +546,13 @@ function getPageSet(){
 }
 
 function renderTabTitle(data){
-    let str = ` <th class="textCenter" ></th>
-    <th class="recordScoreOpera textCenter" style="width: 65px;">操作</th>`
+    let str = ` <th class="textCenter" ></th>`
+    let defaultOrder = isPlacefile == 1 ? 'leaveHospitalDate':'behospitalDate'
     for(let i = 0; i < data.length; i++){
         const item = data[i]
         if(item.status == 1){
             showNum++
-            str += `<th class="textCenter ${item.val} ${item.val =='leaveHospitalDate' ? 'desc':''}" code="${item.val.replace(/([A-Z])/g,function(match) {
+            str += `<th class="textCenter ${item.val} ${item.val == defaultOrder ? 'desc':''}" code="${item.val.replace(/([A-Z])/g,function(match) {
                 return '_' + match.toLowerCase()    
             })}">${item.name}</th>`
         }
@@ -991,8 +1004,11 @@ $((function($){
       "doctorName": doctorName,
       "asc":data_asc,     //升序
       "desc":data_desc,       //降序
-      "leaveHosDateEnd": behosDateEnd,
-      "leaveHosDateStart": behosDateStart,
+      "leaveHosDateStart": isPlacefile==1?behosDateStart:'', //出院日期--开始时间
+      "leaveHosDateEnd": isPlacefile==1?behosDateEnd:'', //出院日期--结束时间
+      "behosDateStart": isPlacefile==1?'':behosDateStart, //出院日期--开始时间
+      "behosDateEnd": isPlacefile==1?'':behosDateEnd, //出院日期--结束时间
+      "isPlacefile":isPlacefile,
       "level": level,
       "name": name,
       "checkStatus": qcCheckStatus?Number(qcCheckStatus):qcCheckStatus, //病历核查状态

+ 34 - 6
src/js/qcListOutHospital.js

@@ -18,6 +18,7 @@ const goUpG= require("./../images/arrow_up_grey.png")
 const goUpB = require("./../images/arrow_up_blue.png")
 const goDownG= require("./../images/arrow_down_grey.png")
 const goDownB = require("./../images/arrow_down_blue.png")
+let isPlacefile = getCookie('isPlacefile')||1
 
 let pageSet = [],pageSetCopy = [], showNum = 0, scrollTop=0;
 let srcUrl = $("#contentIframe",parent.document).attr("src")
@@ -33,6 +34,7 @@ let outNumName = getUrlArgObjectNew("outNum",srcUrl)||""
 let from = getUrlArgObjectNew("from",srcUrl)||""
 let casesId = getUrlArgObjectNew("casesEntryId",srcUrl)||"";
 let isSingleReject = getUrlArgObjectNew("isSingleReject",srcUrl)||""
+let inner = getUrlArgObjectNew("inner",srcUrl)||""
 let deptListDept = JSON.parse(getCookie("deptList"))||[]
 let currentPage;
 listenScroll()
@@ -46,6 +48,9 @@ let tabList = [], name = "", behospitalCode="", behosDateStart="", level="",beho
   doctorNum="",doctorNameTemp="",doctorNumTemp="",leaveHosType="",leaveHosTypeTemp="",
   fpCheckStatus="",fpCheckStatusTemp="",fpCheckName="",fpCheckNameTemp="",qcCheckName="",qcCheckNameTemp="",qcCheckStatus="",qcCheckStatusTemp="",fpCheckDateStart="",fpCheckDateEnd="",
   qcCheckDateStart="",qcCheckDateEnd="",data_desc=["leaveHospitalDate"],data_asc=[];
+if(isPlacefile != 1){
+    data_desc=["behospitalDate"]
+}
 if(chengdu){
     levelTemp = chengdu
     level = chengdu
@@ -86,7 +91,13 @@ if(from==2){
 }else if(from==3){
 //   $(".partTitle .titlePic ").html(`<a href="keyItemFlawControl.html">关键条目缺陷占比 / </a>缺陷详情`)
 }else{
-    $(".partTitle .titlePic ").html(`<a class="consoleD" href="console.html">控制台 / </a>出院人数统计`)
+    if(inner == 2){
+        $(".partTitle .titlePic ").html(`<a class="consoleD" href="console.html">控制台 / </a>入院人数统计`)
+        $(".inorout").css('display','none')
+    }else{
+        $(".partTitle .titlePic ").html(`<a class="consoleD" href="console.html">控制台 / </a>出院人数统计`)
+        $(".inorout").css('display','block')
+    }
 }
 $('.datapickerBox').append(`<img class="iconCalen" src=${iconCalenGrey} />`)
 $('.iconCalen').on("mouseenter", function(e){
@@ -257,6 +268,9 @@ $(".abnormalClear").on("click", function(e){
     leaveHosType="";
     leaveHosTypeTemp="";
     data_desc=["leaveHospitalDate"];
+    if(isPlacefile != 1){
+        data_desc=["behospitalDate"]
+    }
     data_asc=[];
     if(from == 2){
         // deptId=deptListDept[0]&&deptListDept[0].deptId; 
@@ -329,7 +343,11 @@ $(".abnormalClear").on("click", function(e){
     $(".leaveHosTypeList").css("display", "none")
     $(".selectLeaveHosType").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
     $("th[code]").removeClass("asc desc")
-    $(".leaveHospitalDate").addClass(" desc")
+    if(isPlacefile == 1){
+        $(".leaveHospitalDate").addClass(" desc")
+    }else{
+        $(".behospitalDate").addClass(" desc")
+    }
     behosDateStart = $("#datepicker").val()
     behosDateEnd = $("#datepicker2").val()
     if(behosDateStart){
@@ -360,7 +378,11 @@ function renderTab(data,hisId){
         }
         str += `
             <tr  data-index=${i}>
-                <td  class="textCenter">${(currentPage-1)*15 + i+1}</td>`
+                <td class="scoreOperaItem textCenter">${item.hasSelect ? `<img class="iconCheck" src=${iconCheck} />` : `<img class="iconCheck" src=${iconUnCheck} />`}</td>
+                `
+        // str += `
+        //     <tr  data-index=${i}>
+        //         <td  class="textCenter">${(currentPage-1)*15 + i+1}</td>`
         for(let j = 0; j < pageSet.length; j++){
             if(pageSet[j].status == 1){
                 if(pageSet[j].val === "checkStatus" || pageSet[j].val === "mrStatus" ){
@@ -664,17 +686,21 @@ function getPageSet(){
 }
 
 function renderTabTitle(data){
-    let str = `
-    <th class="textCenter" style="width: 65px;">序号</th>`
+    // let str = `
+    // <th class="textCenter" style="width: 65px;">序号</th>`
+    let str = ` <th class="textCenter" ></th>`
+    let defaultOrder = isPlacefile == 1 ? 'leaveHospitalDate':'behospitalDate'
     for(let i = 0; i < data.length; i++){
         const item = data[i]
         if(item.status == 1){
             showNum++
-            str += `<th class="textCenter ${item.val} ${item.val =='leaveHospitalDate' ? 'desc':''}" code="${item.val}">${item.name}</th>`
+            str += `<th class="textCenter ${item.val} ${item.val ==defaultOrder ? 'desc':''}" code="${item.val}">${item.name}</th>`
         }
     }
     let operStr=`<td colspan="${showNum+2}" style="background: #fff">
         <div class="tabFoot">
+            <span class="scoreOpera" data-selectAll=false><img class="iconCheck" src="${iconUnCheck}" alt="checkbox">全选</span>
+            <span class="recordScoreBtn">评分</span>
             <span class="setCol"><img class="iconSetting" src=${require('./../images/setting.png')} alt="关闭" />列设置</span>
         </div>
     </td>`
@@ -737,6 +763,7 @@ function hideLoading(){
 
 function bindRecordScoreBtn(){
     $('.recordScoreBtn').off("click").on("click",function(e){
+        scoreSum = 0;   // 解决全选评分之后  再单选 toast不隐藏的bug
         if(!hasData('FUNC000017')){
             return
         }
@@ -1182,6 +1209,7 @@ $(function($){
             startDate: behosDateStart.replace(/\//g,'-'), //出院日期--开始时间
             endDate: behosDateEnd.replace(/\//g,'-'), //出院日期--结束时间
             doctorName: doctorName,
+            isPlacefile: isPlacefile,
             doctorId: doctorNum,
             checkStatus: qcCheckStatus?Number(qcCheckStatus):qcCheckStatus, //病历核查状态
             mrStatus: fpCheckStatus?Number(fpCheckStatus):fpCheckStatus,   //首页核查状态(1:已核查,0:未核查)

+ 21 - 8
src/js/qcListPerson.js

@@ -48,7 +48,10 @@ let tabList = [], name = "", behospitalCode="", behosDateStart="", level="",beho
   fpCheckStatus="",fpCheckStatusTemp="",fpCheckName="",fpCheckNameTemp="",qcCheckName="",qcCheckNameTemp="",qcCheckStatus="",qcCheckStatusTemp="",fpCheckDateStart="",fpCheckDateEnd="",
   qcCheckDateStart="",qcCheckDateEnd="",data_desc=["leave_hospital_date"],data_asc=[];
 
-
+let isPlacefile = getCookie('isPlacefile')||1
+if(isPlacefile != 1){
+    data_desc=["behospital_date"]
+}
 if(chengdu){
     levelTemp = chengdu
     level = chengdu
@@ -106,8 +109,10 @@ function getTabData(activePage){
         asc:data_asc,     //升序
         desc:data_desc,       //降序
         doctorName: doctorName,
-        leaveHosDateStart: behosDateStart, //1-单项否决 0-非
-        leaveHosDateEnd: behosDateEnd, //0-未启用 1-启用
+        "leaveHosDateStart": isPlacefile==1?behosDateStart:'', //出院日期--开始时间
+        "leaveHosDateEnd": isPlacefile==1?behosDateEnd:'', //出院日期--结束时间
+        "behosDateStart": isPlacefile==1?'':behosDateStart, //出院日期--开始时间
+        "behosDateEnd": isPlacefile==1?'':behosDateEnd, //出院日期--结束时间
         size: 15,
         statisticsType:statisticsType,
         checkStatus: qcCheckStatus?Number(qcCheckStatus):qcCheckStatus, //病历核查状态
@@ -221,6 +226,9 @@ $(".abnormalClear").on("click", function(e){
     qcCheckStatus="";
     qcCheckStatusTemp=""
     data_desc=["leave_hospital_date"]
+    if(isPlacefile != 1){
+        data_desc=["behospital_date"]
+    }
     data_asc=[];
     $('.patientNumInp').val('')
     $('.patientNameInp').val('')
@@ -277,7 +285,11 @@ $(".abnormalClear").on("click", function(e){
     $(".qcCheckList").css("display", "none")
     $(".qcSelectCheck").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
     $("th[code]").removeClass("asc desc")
-    $(".leaveHospitalDate").addClass(" desc")
+    if(isPlacefile == 1){
+        $(".leaveHospitalDate").addClass(" desc")
+    }else{
+        $(".behospitalDate").addClass(" desc")
+    }
     behosDateStart = $("#datepicker").val()
     behosDateEnd = $("#datepicker2").val()
     if(behosDateStart){
@@ -323,10 +335,11 @@ function renderTab(data){
         if(!item.hasSelect){
             hasSelectAll = false
         }
+        // <td  class="recordScoreOperaBtn textCenter" style="opacity:${hasData('FUNC000017')?'1':'0.5'}">评分</td>
         str += `
             <tr  data-index=${i}>
                 <td class="scoreOperaItem textCenter">${item.hasSelect ? `<img class="iconCheck" src=${iconCheck} />`:`<img class="iconCheck" src=${iconUnCheck} />`}</td>
-                <td  class="recordScoreOperaBtn textCenter" style="opacity:${hasData('FUNC000017')?'1':'0.5'}">评分</td>`
+                `
         for(let j = 0; j < pageSet.length; j++){
             if(pageSet[j].status == 1){
                 if(pageSet[j].val === "checkStatus" || pageSet[j].val === "mrStatus" ){
@@ -585,13 +598,13 @@ function getPageSet(){
 }
 
 function renderTabTitle(data){
-    let str = ` <th class="textCenter" ></th>
-    <th class="recordScoreOpera textCenter" style="width: 65px;">操作</th>`
+    let str = ` <th class="textCenter" ></th>`
+    let defaultOrder = isPlacefile == 1 ? 'leaveHospitalDate':'behospitalDate'
     for(let i = 0; i < data.length; i++){
         const item = data[i]
         if(item.status == 1){
             showNum++
-            str += `<th class="textCenter  ${item.val} ${item.val =='leaveHospitalDate' ? 'desc':''}" code="${item.val.replace(/([A-Z])/g,function(match) {
+            str += `<th class="textCenter  ${item.val} ${item.val == defaultOrder ? 'desc':''}" code="${item.val.replace(/([A-Z])/g,function(match) {
                 return '_' + match.toLowerCase()    
             })}">${item.name}</th>`
         }

+ 3 - 0
src/js/quexianDetailControl.js

@@ -17,6 +17,8 @@ $(".selectReject").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
 $(".selectUsed").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
 $(".selectDept").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
 let deptList = []
+let isPlacefile = getCookie('isPlacefile')||1
+
 $(function(){
     dateChange()
     let srcUrl = $("#contentIframe",parent.document).attr("src")
@@ -581,6 +583,7 @@ $(function() {
             deptName:deptName=="全院"?"":(deptName||""),
             casesId:casesIds||"",
             globalType:1,
+            isPlacefile:isPlacefile,
             ascs:data_asc,
             descs:data_desc,
             "startDate":startDateParam,

+ 2 - 0
src/js/quexianDetailControlHome.js

@@ -10,6 +10,7 @@ const iconDown= require("./../images/arrow_down.png")
 const iconUp = require("./../images/arrow_up.png")
 const arrowLeft= require("./../images/arrow_left.png")
 const arrowRight = require("./../images/arrow_right.png")
+let isPlacefile = getCookie('isPlacefile')||1
 
 
 let casesId="", name="", isReject ="",startDateParam='',endDateParam='',deptName="",data_asc=[],data_desc=["casesName"], isUsed ="",ruleType="",casesIdTemp="",casesIds="", nameTemp="", isRejectTemp ="", isUsedTemp ="",from="",deptIdTemp="",deptItemId="",deptId=""
@@ -594,6 +595,7 @@ $(function() {
             globalType:1,
             ascs:data_asc,
             descs:data_desc,
+            isPlacefile:isPlacefile,
             "startDate":startDateParam,
             "endDate":endDateParam
         }

+ 2 - 0
src/js/readmission.js

@@ -34,6 +34,7 @@ if(statisticsType == 1){
 }else{
   setDatePicker($("#datepicker"),$("#datepicker2"),'default')
 }
+let isPlacefile = getCookie('isPlacefile')||1
 
 // $( "#datepicker" ).datepicker({
 //   changeMonth: true,
@@ -489,6 +490,7 @@ $(function() {
       }
       const param = {
         name:patientName,
+        isPlacefile:isPlacefile,
         fileCode:deptRecord,
         startDate:startDateParam.replace(/\//g,'-'),
         endDate:endDateParam.replace(/\//g,'-'),

+ 2 - 0
src/js/singleVeto.js

@@ -10,6 +10,7 @@ const iconDown= require("./../images/arrow_down.png")
 const iconUp = require("./../images/arrow_up.png")
 const arrowLeft= require("./../images/arrow_left.png")
 const arrowRight = require("./../images/arrow_right.png")
+let isPlacefile = getCookie('isPlacefile')||1
 
 const currentPage=$(window.parent.document).find(".menu .page.active").attr("code");
 if(currentPage==="YH-ZKK-TMQXZB_XQ"){
@@ -605,6 +606,7 @@ $(function() {
     const param = {
       type: 0,
       casesId:casesId, //模块Id
+      isPlacefile:isPlacefile,
       casesName:casesName=='全部'?'':casesName, //模块Id
       isReject:isSingleReject, //是否单项否决
       name: name, //条目名

+ 25 - 6
src/js/uccDetail.js

@@ -18,6 +18,7 @@ const goUpG= require("./../images/arrow_up_grey.png")
 const goUpB = require("./../images/arrow_up_blue.png")
 const goDownG= require("./../images/arrow_down_grey.png")
 const goDownB = require("./../images/arrow_down_blue.png")
+let isPlacefile = getCookie('isPlacefile')||1
 
 let pageSet = [],pageSetCopy = [], showNum = 0, scrollTop=0;
 let srcUrl = $("#contentIframe",parent.document).attr("src")
@@ -43,6 +44,9 @@ let tabList = [], name = "", behospitalCode="", behosDateStart="", level="",beho
   nameTemp = "", behospitalCodeTemp="",levelTemp="", deptId="",deptIdTemp="", doctorName="", deptName="", deptNameTemp="",doctorNum="",doctorNameTemp="",doctorNumTemp="",
   fpCheckStatus="",fpCheckStatusTemp="",fpCheckName="",fpCheckNameTemp="",qcCheckName="",qcCheckNameTemp="",qcCheckStatus="",qcCheckStatusTemp="",fpCheckDateStart="",fpCheckDateEnd="",
   qcCheckDateStart="",qcCheckDateEnd="",data_desc=["leaveHospitalDate"],data_asc=[];
+if(isPlacefile != 1){
+    data_desc=["behospitalDate"]
+}
 if(chengdu){
     levelTemp = chengdu
     level = chengdu
@@ -255,6 +259,9 @@ $(".abnormalClear").on("click", function(e){
     qcCheckStatus="";
     qcCheckStatusTemp=""
     data_desc=["leaveHospitalDate"]
+    if(isPlacefile != 1){
+        data_desc=["behospitalDate"]
+    }
     data_asc=[];
     if(from == 2){
         deptId=deptListDept[0]&&deptListDept[0].deptId; 
@@ -324,7 +331,11 @@ $(".abnormalClear").on("click", function(e){
     $(".qcCheckList").css("display", "none")
     $(".qcSelectCheck").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
     $("th[code]").removeClass("asc desc")
-    $(".leaveHospitalDate").addClass(" desc")
+    if(isPlacefile == 1){
+        $(".leaveHospitalDate").addClass(" desc")
+    }else{
+        $(".behospitalDate").addClass(" desc")
+    }
     behosDateStart = $("#datepicker").val()
     behosDateEnd = $("#datepicker2").val()
     if(behosDateStart){
@@ -355,7 +366,11 @@ function renderTab(data,hisId){
         }
         str += `
             <tr  data-index=${i}>
-                <td  class="textCenter">${(currentPage-1)*15 + i+1}</td>`
+                <td class="scoreOperaItem textCenter">${item.hasSelect ? `<img class="iconCheck" src=${iconCheck} />` : `<img class="iconCheck" src=${iconUnCheck} />`}</td>
+                `
+        // str += `
+        //     <tr  data-index=${i}>
+        //         <td  class="textCenter">${(currentPage-1)*15 + i+1}</td>`
         for(let j = 0; j < pageSet.length; j++){
             if(pageSet[j].status == 1){
                 if(pageSet[j].val === "checkStatus" || pageSet[j].val === "mrStatus" ){
@@ -618,17 +633,19 @@ function getPageSet(){
 }
 
 function renderTabTitle(data){
-    let str = `
-    <th class="textCenter" style="width: 65px;">序号</th>`
+    let str = ` <th class="textCenter" ></th>`
+    let defaultOrder = isPlacefile == 1 ? 'leaveHospitalDate':'behospitalDate'
     for(let i = 0; i < data.length; i++){
         const item = data[i]
         if(item.status == 1){
             showNum++
-            str += `<th class="textCenter ${item.val} ${item.val =='leaveHospitalDate' ? 'desc':''}" code="${item.val}">${item.name}</th>`
+            str += `<th class="textCenter ${item.val} ${item.val ==defaultOrder ? 'desc':''}" code="${item.val}">${item.name}</th>`
         }
     }
     let operStr=`<td colspan="${showNum+2}" style="background: #fff">
         <div class="tabFoot">
+            <span class="scoreOpera" data-selectAll=false><img class="iconCheck" src="${iconUnCheck}" alt="checkbox">全选</span>
+            <span class="recordScoreBtn">评分</span>
             <span class="setCol"><img class="iconSetting" src=${require('./../images/setting.png')} alt="关闭" />列设置</span>
         </div>
     </td>`
@@ -691,6 +708,7 @@ function hideLoading(){
 
 function bindRecordScoreBtn(){
     $('.recordScoreBtn').off("click").on("click",function(e){
+        scoreSum = 0;   // 解决全选评分之后  再单选 toast不隐藏的bug
         if(!hasData('FUNC000017')){
             return
         }
@@ -1135,7 +1153,8 @@ $(function($){
             doctorId: doctorNum,    
             startDate: behosDateStart.replace(/\//g,'-'), //出院日期--开始时间
             endDate: behosDateEnd.replace(/\//g,'-'), //出院日期--结束时间
-            casesEntryName: casesEntryName,           
+            casesEntryName: casesEntryName, 
+            isPlacefile:isPlacefile,          
             casesEntryId:casesId,
             isReject: isSingleReject,
             doctorName: doctorName,

+ 7 - 4
src/js/uncorrectedCasesStatistics.js

@@ -12,7 +12,7 @@ const iconUp = require("./../images/arrow_up.png")
 const loadingImg = require("./../images/loading.gif")
 const arrowLeft= require("./../images/arrow_left.png")
 const arrowRight = require("./../images/arrow_right.png")
-let  deptName = "", behospitalCode="", deptNameTemp = "",deptId='',deptIdTemp='', behospitalCodeTemp="", data_desc="",data_asc="",columns=[]; 
+let deptName = "", behospitalCode = "", deptNameTemp = "", deptId = '', deptIdTemp = '', behospitalCodeTemp = "", data_desc = "", data_asc = "", columns = [], isfirstRenderTitle=false; 
 let srcUrl = $("#contentIframe",parent.document).attr("src")
 statisticsType = getUrlArgObjectNew("dateType",srcUrl)||"";
 from = getUrlArgObjectNew("from",srcUrl)||""
@@ -24,6 +24,8 @@ $(".selectDept").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
   $("th[code="+data_desc+"]").addClass("desc");
 }*/
 //setTitleTxt('',from)         //导航栏面包屑
+let isPlacefile = getCookie('isPlacefile')||1
+
 listenScroll()
 if(statisticsType == 1){
   setDatePicker($("#datepicker"),$("#datepicker2"),1)
@@ -98,7 +100,7 @@ function getTabData(activePage){
     if(res.data.code == '0'){
       const data = res.data.data||[];
       renderTab(data,data.hospitalId,activePage);
-      // renderTabTitle(data)   //渲染Table表头
+      if (isfirstRenderTitle === false) { renderTabTitle(data) }  //首次渲染渲染Table表头
       renderPagination(totalPage,Number(activePage),totalNum)
       if(totalPage > 1){
         renderPagination(totalPage,Number(activePage),totalNum)
@@ -253,11 +255,11 @@ function getPageSet(){
 
   })
 }
-getPageSet()
+// getPageSet()
 
 // 渲染table表头
 function renderTabTitle(data){
-  
+  isfirstRenderTitle = true
   data = data.columns; 
   // console.log(data,'1111111');
   let str = `
@@ -428,6 +430,7 @@ $(function() {
         desc:data_desc,       //降序
         startDate:startDateParam,
         endDate:endDateParam,
+        isPlacefile:isPlacefile
       }
       expJson(api.unModifyMRStatisticsExport,param).then(res =>{
           downloadExportedData(res.data, "时效性相关统计.xls")

+ 17 - 3
src/js/utils.js

@@ -40,6 +40,7 @@ const pageMap={
   'YH-BLZK-ZKPFYLZ':'qcListDocteam.html',
   'YH-ZKK-GJTMQXZB':'keyItemFlawControl.html',
   'YH-ZKK-CYRSTJ':'qcListOutHospital.html',
+  'YH-ZKK-RYRSTJ':'qcListOutHospital.html?inner=2',
   'YH-ZKK-WZGBLTJ': 'uncorrectedCasesStatistics.html',
   'YH-ZKK-31TZRYRS': 'readmission.html'
 };
@@ -99,12 +100,18 @@ const getUrlArgObjectNew = function(name,srcUrl) {
 }
 
 const post = function (url, data) {
+  let isPlacefile = getCookie('isPlacefile')||1
   const token = getCookie('accessToken') || localStorage.getItem('accessToken')
   if(!token&&window.location.href.indexOf('login')==-1){
     setCookie('behosDateStart','')
     setCookie('behosDateEnd','')
     window.location.href = "../login.html"
   }
+  for(let i = 0;i<$('.typeFilter').children().length;i++){
+    if($('.typeFilter').children().eq(i).html() == '出院日期:' && isPlacefile==0){
+      $('.typeFilter').children().eq(i).html('入院日期:')
+    }
+  }
   let need = window.location.href.indexOf('localhost')!=-1
   return new Utils((resolve, reject) => {
     $.ajax({
@@ -114,7 +121,7 @@ const post = function (url, data) {
       cache: false,
       contentType: false,
       processData: false,
-      data: JSON.stringify(data),
+      data: JSON.stringify(Object.assign({},data,{"isPlacefile":isPlacefile})),
       contentType: "application/json; charset=UTF-8",
       beforeSend: function (xmlHttp) {
         xmlHttp.setRequestHeader("If-Modified-Since", "0");
@@ -137,7 +144,7 @@ const post = function (url, data) {
   });
 }
 
-// // 导出
+// 导出
 // const expJson = (url,data) =>{
 //   const token = getCookie('accessToken')
 //   if(!token&&window.location.href.indexOf('login')==-1){
@@ -344,7 +351,6 @@ function setDatePicker(picker1,picker2,mode,startDateDefault,endDateDefault){
     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(mode == '1'){
@@ -444,8 +450,16 @@ function listenScroll(dom){
   $(dom?dom:".container").scroll(()=>{
     $.datepicker._hideDatepicker($("#datepicker")[0]);
     $.datepicker._hideDatepicker($("#datepicker2")[0]);
+    $.datepicker._hideDatepicker($("#datepickerFp1")[0]);
+    $.datepicker._hideDatepicker($("#datepickerFp2")[0]);
+    $.datepicker._hideDatepicker($("#datepickerQc1")[0]);
+    $.datepicker._hideDatepicker($("#datepickerQc2")[0]);
     $("#datepicker").trigger('blur')
     $("#datepicker2").trigger('blur')
+    $("#datepickerFp1").trigger('blur')
+    $("#datepickerFp2").trigger('blur')
+    $("#datepickerQc1").trigger('blur')
+    $("#datepickerQc2").trigger('blur')
   })
 }