Merge branch 'test' of http://192.168.2.236:10080/zhouna/AIPlatform into test

src/css/qcScore.less

@@ -470,6 +470,7 @@
     margin-right: 10px;
     position: relative;
     background: #fff;
+    display: none;
     .flaw-title{
       position: absolute;
       top:0;

src/html/qcScore.html

@@ -42,7 +42,9 @@
         <span>科室：${behDeptName}</span>
         <span class="level">病历等级：${level}</span>
         <span class="score">病历得分：${scoreRes}</span>
-        <span class="check">${checkState==="1" ? "重新核查" : "核查"}</span>
+        {{if hasCheck}}
+        <span class="check">${checkState===1 ? "重新核查" : "核查"}</span>
+        {{/if}}
     </script>
     <script type="text/html" id="tableTmpl">
          {{if k==="出院诊断"}}

src/js/qcList.js

@@ -280,8 +280,8 @@ function isTextCenter(name){
     return textCenterList.findIndex(item=> item==name) > -1
 }
 
-function scoreDetail(id,age,hid,code,name,checkStatus){
-    window.open(`./qcScore.html?id=${id}&age=${age}&name=${name}&hid=${getCookie('hospitalid')}&code=${code}&checkStatus=${checkStatus}`)
+function scoreDetail(id,age,hid,code,name){
+    window.open(`./qcScore.html?id=${id}&age=${age}&name=${name}&hid=${getCookie('hospitalid')}&code=${code}`)
 }
 function bindScoreDetail(hisId){
     $('.patientNameSpan').on('click',function(e){
@@ -294,7 +294,7 @@ function bindScoreDetail(hisId){
             $.alerModal({"message":'请先进行评分！',type:"tip",time:'1000',isFather: true, fatherWrapper: $("#mainBox", parent.document)});
             return
         } else{
-            scoreDetail(id,age,hisId,'YH-BLZK-ZKPF',tabList[index].name,checkStatus)
+            scoreDetail(id,age,hisId,'YH-BLZK-ZKPF',tabList[index].name)
         }
        
     })

src/js/qcListCopy.js

@@ -33,6 +33,7 @@ let defectName = getUrlArgObjectNew("defectName",srcUrl)||"";
 let casesId = getUrlArgObjectNew("casesEntryId",srcUrl)||"";
 let isSingleReject = getUrlArgObjectNew("isSingleReject",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="下拉">`)
@@ -140,6 +141,7 @@ function getTabData(activePage){
             tabList = data.records;
             const totalPage = data.pages;
             const totalNum = data.total;
+            currentPage = activePage
             renderTab(tabList,data.hospitalId);
             renderPagination(totalPage,Number(activePage),totalNum)
             if(totalPage > 1){
@@ -274,7 +276,7 @@ function renderTab(data,hisId){
         }
         str += `
             <tr  data-index=${i}>
-                <td  class="textCenter">${i+1}</td>`
+                <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"){
@@ -325,8 +327,8 @@ function isTextCenter(name){
     return textCenterList.findIndex(item=> item==name) > -1
 }
 
-function scoreDetail(id,age,hid,code,name,checkStatus){
-    window.open(`./qcScore.html?id=${id}&age=${age}&name=${name}&hid=${getCookie('hospitalid')}&code=${code}&checkStatus=${checkStatus}`)
+function scoreDetail(id,age,hid,code,name){
+    window.open(`./qcScore.html?id=${id}&age=${age}&name=${name}&hid=${getCookie('hospitalid')}&code=${code}`)
 }
 function bindScoreDetail(hisId){
     $('.patientNameSpan').on('click',function(e){
@@ -339,7 +341,7 @@ function bindScoreDetail(hisId){
             $.alerModal({"message":'请先进行评分！',type:"tip",time:'1000',isFather: true, fatherWrapper: $("#mainBox", parent.document)});
             return
         } else{
-            scoreDetail(id,age,hisId,'YH-BLZK-ZKPF',tabList[index].name,checkStatus)
+            scoreDetail(id,age,hisId,'YH-BLZK-ZKPF',tabList[index].name)
         }
        
     })

src/js/qcListDept.js

@@ -299,8 +299,8 @@ function isTextCenter(name){
     return textCenterList.findIndex(item=> item==name) > -1
 }
 
-function scoreDetail(id,age,code,name,checkStatus){
-    window.open(`./qcScore.html?id=${id}&age=${age}&code=${code}&hid=${getCookie('hospitalid')}&name=${name}&checkStatus=${checkStatus}`)
+function scoreDetail(id,age,code,name){
+    window.open(`./qcScore.html?id=${id}&age=${age}&code=${code}&hid=${getCookie('hospitalid')}&name=${name}`)
 }
 function bindScoreDetail(){
     $('.patientNameSpan').on('click',function(e){
@@ -313,7 +313,7 @@ function bindScoreDetail(){
             $.alerModal({"message":'请先进行评分！',type:"tip",time:'1000',isFather: true, fatherWrapper: $("#mainBox", parent.document)});
             return
         } else{
-            scoreDetail(id,age,'YH-BLZK-ZKPFKS',tabList[index].name,checkStatus)
+            scoreDetail(id,age,'YH-BLZK-ZKPFKS',tabList[index].name)
         }
        
     })

src/js/qcListDocteam.js

@@ -279,8 +279,8 @@ function isTextCenter(name){
     return textCenterList.findIndex(item=> item==name) > -1
 }
 
-function scoreDetail(id,age,code,name,checkStatus){
-    window.open(`./qcScore.html?id=${id}&age=${age}&code=${code}&hid=${getCookie('hospitalid')}&name=${name}&checkStatus=${checkStatus}`)
+function scoreDetail(id,age,code,name){
+    window.open(`./qcScore.html?id=${id}&age=${age}&code=${code}&hid=${getCookie('hospitalid')}&name=${name}`)
 }
 function bindScoreDetail(){
     $('.patientNameSpan').on('click',function(e){
@@ -293,7 +293,7 @@ function bindScoreDetail(){
             $.alerModal({"message":'请先进行评分！',type:"tip",time:'1000',isFather: true, fatherWrapper: $("#mainBox", parent.document)});
             return
         } else{
-            scoreDetail(id,age,'YH-BLZK-ZKPFKS',tabList[index].name,checkStatus)
+            scoreDetail(id,age,'YH-BLZK-ZKPFKS',tabList[index].name)
         }
 
     })

src/js/qcListOutHospital.js

@@ -34,6 +34,7 @@ let from = getUrlArgObjectNew("from",srcUrl)||""
 let casesId = getUrlArgObjectNew("casesEntryId",srcUrl)||"";
 let isSingleReject = getUrlArgObjectNew("isSingleReject",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="下拉">`)
@@ -140,6 +141,7 @@ function getTabData(activePage){
             tabList = data.records;
             const totalPage = data.pages;
             const totalNum = data.total;
+            currentPage = activePage
             renderTab(tabList,data.hospitalId);
             renderPagination(totalPage,Number(activePage),totalNum)
             if(totalPage > 1){
@@ -280,7 +282,7 @@ function renderTab(data,hisId){
         }
         str += `
             <tr  data-index=${i}>
-                <td  class="textCenter">${i+1}</td>`
+                <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"){
@@ -331,8 +333,8 @@ function isTextCenter(name){
     return textCenterList.findIndex(item=> item==name) > -1
 }
 
-function scoreDetail(id,age,hid,code,name,checkStatus){
-    window.open(`./qcScore.html?id=${id}&age=${age}&name=${name}&hid=${getCookie('hospitalid')}&code=${code}&checkStatus=${checkStatus}`)
+function scoreDetail(id,age,hid,code,name){
+    window.open(`./qcScore.html?id=${id}&age=${age}&name=${name}&hid=${getCookie('hospitalid')}&code=${code}`)
 }
 function bindScoreDetail(hisId){
     $('.patientNameSpan').on('click',function(e){
@@ -345,7 +347,7 @@ function bindScoreDetail(hisId){
             $.alerModal({"message":'请先进行评分！',type:"tip",time:'1000',isFather: true, fatherWrapper: $("#mainBox", parent.document)});
             return
         } else{
-            scoreDetail(id,age,hisId,'YH-BLZK-ZKPF',tabList[index].name,checkStatus)
+            scoreDetail(id,age,hisId,'YH-BLZK-ZKPF',tabList[index].name)
         }
        
     })

src/js/qcListPerson.js

@@ -300,8 +300,8 @@ function isTextCenter(name){
     return textCenterList.findIndex(item=> item==name) > -1
 }
 
-function scoreDetail(id,age,code,name,checkStatus){
-    window.open(`./qcScore.html?id=${id}&age=${age}&code=${code}&hid=${getCookie('hospitalid')}&name=${name}&checkStatus=${checkStatus}`)
+function scoreDetail(id,age,code,name){
+    window.open(`./qcScore.html?id=${id}&age=${age}&code=${code}&hid=${getCookie('hospitalid')}&name=${name}`)
 }
 function bindScoreDetail(){
     $('.patientNameSpan').on('click',function(e){
@@ -314,7 +314,7 @@ function bindScoreDetail(){
             $.alerModal({"message":'请先进行评分！',type:"tip",time:'1000',isFather: true, fatherWrapper: $("#mainBox", parent.document)});
             return
         } else{
-            scoreDetail(id,age,'YH-BLZK-ZKPFGR',tabList[index].name,checkStatus)
+            scoreDetail(id,age,'YH-BLZK-ZKPFGR',tabList[index].name)
         }
        
     })

src/js/qcScore.js

@@ -12,7 +12,7 @@ $(function(){
   let global_flawData = {};    //缺陷数据
   const global_id=getUrlArgObject("id");
   const global_age = getUrlArgObject("age");
-  let global_check = getUrlArgObject("checkStatus");
+  let global_check;
   const global_code = getUrlArgObject("code");
   let global_activeTab=$(".sub-menu .page.active").attr("code");  //当前激活菜单项
   let global_modules ={};   //模板数据缓存
@@ -104,7 +104,8 @@ function getRecordDetail(){
     if(res.data.code==='0'){
       const data = res.data.data;
    
-      const {beHospital,result,msg} = data;
+      const {beHospital,result,msg,checkStatus} = data;
+      global_check = checkStatus
       const info=Object.assign(beHospital,result);
       initMenu(JSON.parse(result.menuData));
       // $(".sub-menu>ul>li:first-child.page,.menu-mini>ul>li:first-child.page").addClass("active");
@@ -122,7 +123,12 @@ function getRecordDetail(){
 
 //填充患者信息
 function initPatientInfo(data){
-  const obj=Object.assign({},data,{age:!global_age||global_age=="null"?"-":global_age,checkState:global_check});
+  let hasCheck = false
+  if(hasData("FUNC000014")){
+    hasCheck = true
+  }
+  const obj=Object.assign({},data,{age:!global_age||global_age=="null"?"-":global_age,hasCheck,checkState:global_check});
+  
   $("#infoTmpl").tmpl(obj).appendTo("#patientInfo");
   $(".check").on("click", function(){
     checkQc()
@@ -622,6 +628,9 @@ function formatFlawKeys(data){
         global_modules=data;
         getRecordDetail();
         $("#loading").hide();
+        setTimeout(function(){
+          $(".operation").show()
+        },50)
       }
     });
   }
@@ -634,10 +643,10 @@ function formatFlawKeys(data){
       if(res.data.code==='0') {
         global_check = 1
         $(".check").text("重新核查")
-        $.alerModal({"message":`<div class="checkTipsBox"><img class="checkImg" src=${checkOk}><p class="checkTxt">审核成功</p></div>`,type:"tip",time:'1000',isFather: true, fatherWrapper: $(".flaw-table", parent.document)});
+        $.alerModal({"message":`<div class="checkTipsBox"><img class="checkImg" src=${checkOk}><p class="checkTxt">核查成功</p></div>`,type:"tip",time:'1000',isFather: false});
        
       }else{
-        $.alerModal({"message":'核查失败',type:"tip",time:'1000',isFather: true, fatherWrapper: $(".flaw-table", parent.document)});
+        $.alerModal({"message":res.data.msg ||"核查失败",type:"tip",time:'1000',isFather: true, fatherWrapper: $(".flaw-table", parent.document)});
       }
     });
   }