Browse Source

1.3.9需求

morphone1995 4 years ago
parent
commit
324e133cc9

+ 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;

+ 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>

+ 4 - 1
src/js/keyItemFlawControl.js

@@ -135,6 +135,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 +149,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)
 }

+ 12 - 6
src/js/qcList.js

@@ -301,10 +301,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,8 +565,8 @@ 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>`
     for(let i = 0; i < data.length; i++){
         const item = data[i]
         if(item.status == 1){
@@ -636,6 +638,7 @@ function hideLoading(){
 
 function bindRecordScoreBtn(){
     $('.recordScoreBtn').off("click").on("click",function(e){
+        scoreSum = 0;   // 解决全选评分之后  再单选 toast不隐藏的bug
         if(!hasData('FUNC000017')){
             return
         }
@@ -682,22 +685,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)});
             }
         }

+ 27 - 5
src/js/qcListCopy.js

@@ -34,7 +34,9 @@ let casesEntryId = getUrlArgObjectNew("defectId",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,7 +45,7 @@ $(".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(chengdu){
@@ -53,7 +55,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 +135,11 @@ $("#filterToggler").click(function(){
     return false;
 }
 function getTabData(activePage){
+    // 判断是否是 住院超过31日病人数   
+    let beHosGT31Days = null
+    if (fromDays && fromDays === "1") {
+       beHosGT31Days = 1
+    }
     const param = {
         current:activePage,
         behospitalCode: behospitalCode,
@@ -146,6 +153,7 @@ function getTabData(activePage){
         casesEntryName: casesEntryName,
         casesEntryId:"",
         casesId:casesId,
+        beHosGT31Days,
         size: 15,
         ruleType:ruleType,
         isReject: isSingleReject,
@@ -376,9 +384,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,8 +648,9 @@ 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>`
     for(let i = 0; i < data.length; i++){
         const item = data[i]
         if(item.status == 1){
@@ -647,6 +660,8 @@ function renderTabTitle(data){
     }
     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 +724,7 @@ function hideLoading(){
 
 function bindRecordScoreBtn(){
     $('.recordScoreBtn').off("click").on("click",function(e){
+        scoreSum = 0;   // 解决全选评分之后  再单选 toast不隐藏的bug
         if(!hasData('FUNC000017')){
             return
         }
@@ -1142,6 +1158,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, //病人姓名
@@ -1155,6 +1176,7 @@ $(function($){
             casesEntryName: casesEntryName,
             casesEntryId:"",
             casesId:casesId,
+            beHosGT31Days,
             isReject: isSingleReject,
             doctorName: doctorName,
             doctorId: doctorNum,

+ 11 - 3
src/js/qcListOutHospital.js

@@ -360,7 +360,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,8 +668,9 @@ 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>`
     for(let i = 0; i < data.length; i++){
         const item = data[i]
         if(item.status == 1){
@@ -675,6 +680,8 @@ function renderTabTitle(data){
     }
     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 +744,7 @@ function hideLoading(){
 
 function bindRecordScoreBtn(){
     $('.recordScoreBtn').off("click").on("click",function(e){
+        scoreSum = 0;   // 解决全选评分之后  再单选 toast不隐藏的bug
         if(!hasData('FUNC000017')){
             return
         }

+ 9 - 3
src/js/uccDetail.js

@@ -355,7 +355,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,8 +622,7 @@ function getPageSet(){
 }
 
 function renderTabTitle(data){
-    let str = `
-    <th class="textCenter" style="width: 65px;">序号</th>`
+    let str = ` <th class="textCenter" ></th>`
     for(let i = 0; i < data.length; i++){
         const item = data[i]
         if(item.status == 1){
@@ -629,6 +632,8 @@ function renderTabTitle(data){
     }
     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 +696,7 @@ function hideLoading(){
 
 function bindRecordScoreBtn(){
     $('.recordScoreBtn').off("click").on("click",function(e){
+        scoreSum = 0;   // 解决全选评分之后  再单选 toast不隐藏的bug
         if(!hasData('FUNC000017')){
             return
         }