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

src/html/checkControl.html

@@ -54,7 +54,7 @@
                         <th class="beHospitalId textCenter" code="mrNum">质控总数</th>
                         <th class="beHospitalId textCenter" code="checkedNum">核查数量</th>
                         <th class="beHospitalId textCenter" code="improveNum">已改善数量</th>
-                        <th class="beHospitalId textCenter" code="improvePercentStr">改善率</th>
+                        <th class="beHospitalId textCenter desc" code="improvePercentStr">改善率</th>
                         <th class="beHospitalId textCenter" code="improveToPassNum">改善至合格数量</th>
                         <th class="beHospitalId textCenter" code="improveToPassPercentStr">改善至合格率</th>
                         <th class="beHospitalId textCenter" code="improveToFullNum">改善至满分数量</th>

src/html/qcList.html

@@ -75,6 +75,12 @@
                         <span>病案首页核查人：</span>
                         <input class="fpCheckPeople" type="text" placeholder="请输入病案首页核查人">
                     </span>
+                    <span class="filterItem typeFilter clearfix" >
+                        <span class="fl">病案首页核查时间：</span>
+                        <span class="datapickerBox fl"><input type="text" placeholder="请选择时间" id="datepickerFp1" autocomplete="off" readonly /></span>
+                        <span  class="divide fl">-</span>
+                        <span class="datapickerBox fl"><input type="text" placeholder="请选择时间" id="datepickerFp2"  autocomplete="off" readonly/></span>
+                    </span>
                     <span class="filterItem qcFiliterItem">
                         <span>病历核查状态：</span>
                         <span class="qcSelectCheck">全部</span>
@@ -88,12 +94,7 @@
                         <span>病历核查人：</span>
                         <input class="qcCheckPeople" type="text" placeholder="请输入病历核查人">
                     </span>
-                    <span class="filterItem typeFilter clearfix" >
-                        <span class="fl">病案首页核查时间：</span>
-                        <span class="datapickerBox fl"><input type="text" placeholder="请选择时间" id="datepickerFp1" autocomplete="off" readonly /></span>
-                        <span  class="divide fl">-</span>
-                        <span class="datapickerBox fl"><input type="text" placeholder="请选择时间" id="datepickerFp2"  autocomplete="off" readonly/></span>
-                    </span>
+                  
                     <span class="filterItem typeFilter clearfix qcFiliterItem" >
                         <span class="fl">病历核查时间：</span>
                         <span class="datapickerBox fl"><input type="text" placeholder="请选择时间" id="datepickerQc1" autocomplete="off" readonly /></span>

src/html/qcListCopy.html

@@ -78,6 +78,12 @@
                         <span>病案首页核查人：</span>
                         <input class="fpCheckPeople" type="text" placeholder="请输入病案首页核查人">
                     </span>
+                    <span class="filterItem typeFilter clearfix" >
+                        <span class="fl">病案首页核查时间：</span>
+                        <span class="datapickerBox fl"><input type="text" placeholder="请选择时间" id="datepickerFp1" autocomplete="off" readonly /></span>
+                        <span  class="divide fl">-</span>
+                        <span class="datapickerBox fl"><input type="text" placeholder="请选择时间" id="datepickerFp2"  autocomplete="off" readonly/></span>
+                    </span>
                     <span class="filterItem qcFiliterItem">
                         <span>病历核查状态：</span>
                         <span class="qcSelectCheck">全部</span>
@@ -91,12 +97,6 @@
                         <span>病历核查人：</span>
                         <input class="qcCheckPeople" type="text" placeholder="请输入病历核查人">
                     </span>
-                    <span class="filterItem typeFilter clearfix" >
-                        <span class="fl">病案首页核查时间：</span>
-                        <span class="datapickerBox fl"><input type="text" placeholder="请选择时间" id="datepickerFp1" autocomplete="off" readonly /></span>
-                        <span  class="divide fl">-</span>
-                        <span class="datapickerBox fl"><input type="text" placeholder="请选择时间" id="datepickerFp2"  autocomplete="off" readonly/></span>
-                    </span>
                     <span class="filterItem typeFilter clearfix qcFiliterItem" >
                         <span class="fl">病历核查时间：</span>
                         <span class="datapickerBox fl"><input type="text" placeholder="请选择时间" id="datepickerQc1" autocomplete="off" readonly /></span>

src/html/qcListDept.html

@@ -75,6 +75,12 @@
                         <span>病案首页核查人：</span>
                         <input class="fpCheckPeople" type="text" placeholder="请输入病案首页核查人">
                     </span>
+                    <span class="filterItem typeFilter clearfix" >
+                        <span class="fl">病案首页核查时间：</span>
+                        <span class="datapickerBox fl"><input type="text" placeholder="请选择时间" id="datepickerFp1" autocomplete="off" readonly /></span>
+                        <span  class="divide fl">-</span>
+                        <span class="datapickerBox fl"><input type="text" placeholder="请选择时间" id="datepickerFp2"  autocomplete="off" readonly/></span>
+                    </span>
                     <span class="filterItem qcFiliterItem">
                         <span>病历核查状态：</span>
                         <span class="qcSelectCheck">全部</span>
@@ -88,12 +94,7 @@
                         <span>病历核查人：</span>
                         <input class="qcCheckPeople" type="text" placeholder="请输入病历核查人">
                     </span>
-                    <span class="filterItem typeFilter clearfix" >
-                        <span class="fl">病案首页核查时间：</span>
-                        <span class="datapickerBox fl"><input type="text" placeholder="请选择时间" id="datepickerFp1" autocomplete="off" readonly /></span>
-                        <span  class="divide fl">-</span>
-                        <span class="datapickerBox fl"><input type="text" placeholder="请选择时间" id="datepickerFp2"  autocomplete="off" readonly/></span>
-                    </span>
+                    
                     <span class="filterItem typeFilter clearfix qcFiliterItem" >
                         <span class="fl">病历核查时间：</span>
                         <span class="datapickerBox fl"><input type="text" placeholder="请选择时间" id="datepickerQc1" autocomplete="off" readonly /></span>

src/html/qcListDocteam.html

@@ -67,6 +67,12 @@
                         <span>病案首页核查人：</span>
                         <input class="fpCheckPeople" type="text" placeholder="请输入病案首页核查人">
                     </span>
+                    <span class="filterItem typeFilter clearfix" >
+                        <span class="fl">病案首页核查时间：</span>
+                        <span class="datapickerBox fl"><input type="text" placeholder="请选择时间" id="datepickerFp1" autocomplete="off" readonly /></span>
+                        <span  class="divide fl">-</span>
+                        <span class="datapickerBox fl"><input type="text" placeholder="请选择时间" id="datepickerFp2"  autocomplete="off" readonly/></span>
+                    </span>
                     <span class="filterItem qcFiliterItem">
                         <span>病历核查状态：</span>
                         <span class="qcSelectCheck">全部</span>
@@ -80,12 +86,7 @@
                         <span>病历核查人：</span>
                         <input class="qcCheckPeople" type="text" placeholder="请输入病历核查人">
                     </span>
-                    <span class="filterItem typeFilter clearfix" >
-                        <span class="fl">病案首页核查时间：</span>
-                        <span class="datapickerBox fl"><input type="text" placeholder="请选择时间" id="datepickerFp1" autocomplete="off" readonly /></span>
-                        <span  class="divide fl">-</span>
-                        <span class="datapickerBox fl"><input type="text" placeholder="请选择时间" id="datepickerFp2"  autocomplete="off" readonly/></span>
-                    </span>
+                  
                     <span class="filterItem typeFilter clearfix qcFiliterItem" >
                         <span class="fl">病历核查时间：</span>
                         <span class="datapickerBox fl"><input type="text" placeholder="请选择时间" id="datepickerQc1" autocomplete="off" readonly /></span>

src/html/qcListOutHospital.html

@@ -92,6 +92,12 @@
                         <span>病案首页核查人：</span>
                         <input class="fpCheckPeople" type="text" placeholder="请输入病案首页核查人">
                     </span>
+                    <span class="filterItem typeFilter clearfix" >
+                        <span class="fl">病案首页核查时间：</span>
+                        <span class="datapickerBox fl"><input type="text" placeholder="请选择时间" id="datepickerFp1" autocomplete="off" readonly /></span>
+                        <span  class="divide fl">-</span>
+                        <span class="datapickerBox fl"><input type="text" placeholder="请选择时间" id="datepickerFp2"  autocomplete="off" readonly/></span>
+                    </span>
                     <span class="filterItem qcFiliterItem">
                         <span>病历核查状态：</span>
                         <span class="qcSelectCheck">全部</span>
@@ -105,12 +111,7 @@
                         <span>病历核查人：</span>
                         <input class="qcCheckPeople" type="text" placeholder="请输入病历核查人">
                     </span>
-                    <span class="filterItem typeFilter clearfix" >
-                        <span class="fl">病案首页核查时间：</span>
-                        <span class="datapickerBox fl"><input type="text" placeholder="请选择时间" id="datepickerFp1" autocomplete="off" readonly /></span>
-                        <span  class="divide fl">-</span>
-                        <span class="datapickerBox fl"><input type="text" placeholder="请选择时间" id="datepickerFp2"  autocomplete="off" readonly/></span>
-                    </span>
+                    
                     <span class="filterItem typeFilter clearfix qcFiliterItem" >
                         <span class="fl">病历核查时间：</span>
                         <span class="datapickerBox fl"><input type="text" placeholder="请选择时间" id="datepickerQc1" autocomplete="off" readonly /></span>

src/html/qcListPerson.html

@@ -72,6 +72,12 @@
                     <span>病案首页核查人：</span>
                     <input class="fpCheckPeople" type="text" placeholder="请输入病案首页核查人">
                 </span>
+                <span class="filterItem typeFilter clearfix" >
+                    <span class="fl">病案首页核查时间：</span>
+                    <span class="datapickerBox fl"><input type="text" placeholder="请选择时间" id="datepickerFp1" autocomplete="off" readonly /></span>
+                    <span  class="divide fl">-</span>
+                    <span class="datapickerBox fl"><input type="text" placeholder="请选择时间" id="datepickerFp2"  autocomplete="off" readonly/></span>
+                </span>
                 <span class="filterItem qcFiliterItem">
                     <span>病历核查状态：</span>
                     <span class="qcSelectCheck">全部</span>
@@ -85,12 +91,6 @@
                     <span>病历核查人：</span>
                     <input class="qcCheckPeople" type="text" placeholder="请输入病历核查人">
                 </span>
-                <span class="filterItem typeFilter clearfix" >
-                    <span class="fl">病案首页核查时间：</span>
-                    <span class="datapickerBox fl"><input type="text" placeholder="请选择时间" id="datepickerFp1" autocomplete="off" readonly /></span>
-                    <span  class="divide fl">-</span>
-                    <span class="datapickerBox fl"><input type="text" placeholder="请选择时间" id="datepickerFp2"  autocomplete="off" readonly/></span>
-                </span>
                 <span class="filterItem typeFilter clearfix qcFiliterItem" >
                     <span class="fl">病历核查时间：</span>
                     <span class="datapickerBox fl"><input type="text" placeholder="请选择时间" id="datepickerQc1" autocomplete="off" readonly /></span>

src/html/uccDetail.html

@@ -85,6 +85,12 @@
                         <span>病案首页核查人：</span>
                         <input class="fpCheckPeople" type="text" placeholder="请输入病案首页核查人">
                     </span>
+                    <span class="filterItem typeFilter clearfix" >
+                        <span class="fl">病案首页核查时间：</span>
+                        <span class="datapickerBox fl"><input type="text" placeholder="请选择时间" id="datepickerFp1" autocomplete="off" readonly /></span>
+                        <span  class="divide fl">-</span>
+                        <span class="datapickerBox fl"><input type="text" placeholder="请选择时间" id="datepickerFp2"  autocomplete="off" readonly/></span>
+                    </span>
                     <span class="filterItem qcFiliterItem">
                         <span>病历核查状态：</span>
                         <span class="qcSelectCheck">全部</span>
@@ -98,12 +104,6 @@
                         <span>病历核查人：</span>
                         <input class="qcCheckPeople" type="text" placeholder="请输入病历核查人">
                     </span>
-                    <span class="filterItem typeFilter clearfix" >
-                        <span class="fl">病案首页核查时间：</span>
-                        <span class="datapickerBox fl"><input type="text" placeholder="请选择时间" id="datepickerFp1" autocomplete="off" readonly /></span>
-                        <span  class="divide fl">-</span>
-                        <span class="datapickerBox fl"><input type="text" placeholder="请选择时间" id="datepickerFp2"  autocomplete="off" readonly/></span>
-                    </span>
                     <span class="filterItem typeFilter clearfix qcFiliterItem" >
                         <span class="fl">病历核查时间：</span>
                         <span class="datapickerBox fl"><input type="text" placeholder="请选择时间" id="datepickerQc1" autocomplete="off" readonly /></span>

src/js/checkControl.js

@@ -17,7 +17,7 @@ $(".selectDept").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
 listenScroll()
 let tabList = [], name = "", behospitalCode="", behosDateStart="", level="",behosDateEnd="", scoreSum = 0,statisticsType="",
   nameTemp = "", behospitalCodeTemp="",levelTemp="", deptId="",deptIdTemp="", doctorName="", doctorNum="",doctorNameTemp="",doctorNumTemp="",
-  data_desc="deptName",data_asc="";
+  data_desc="improvePercentStr",data_asc="";
   let srcUrl = $("#contentIframe",parent.document).attr("src")
   statisticsType = getUrlArgObjectNew("dateType",srcUrl)||""
   from = getUrlArgObjectNew("from",srcUrl)||""

src/js/qcList.js

@@ -351,7 +351,7 @@ function renderTab(data,hisId){
 }
 
 function isTextCenter(name){
-    const textCenterList = ['level', 'scoreRes', 'sex','age', 'behospitalDate', 'leaveHospitalDate', 'placefileDate', 'gradeTime','checkStatus']
+    const textCenterList = ['level', 'scoreRes', 'sex','age', 'behospitalDate', 'leaveHospitalDate', 'placefileDate', 'gradeTime','checkStatus','mrStatus','mrTime','chTime','chName','mrName','diagnose','behDoctorName','directorDoctorName','doctorName']
     return textCenterList.findIndex(item=> item==name) > -1
 }
 

src/js/qcListCopy.js

@@ -93,7 +93,7 @@ if(from==2){
     // $(".partTitle .titlePic ").html(`<a class="consoleD" href="console.html">控制台 / </a><a class="consoleP" href="singleVeto.html?from=1">条目缺陷占比 / </a><a class="defectDetail" href="quexianDetailControlHome.html">缺陷详情 / </a>病历详情`)
     $(".partTitle .titlePic ").html(`<a class="consoleD" href="console.html">控制台 / </a><a class="consoleP" href="partDetailControl.html?from=1">病案首页合格率占比 / </a><a class="defectDetail" href="quexianDetailControlHome.html">缺陷详情 / </a>病历详情`)
     $(".defectDetail").on("click",function(){
-        $(parent.document).find("#contentIframe").attr("src","quexianDetailControlHome.html?deptName="+deptNamePram+"&deptId="+deptIdPram+"&from=1&casesId=243"+"&shijian=3"+"&ruleType="+ruleType+"&startDateParam="+startDateParam+"&endDateParam="+endDateParam) 
+        $(parent.document).find("#contentIframe").attr("src","quexianDetailControlHome.html?deptName="+`${deptNamePram=="全部" ?"全院":deptNamePram}`+"&deptId="+deptIdPram+"&from=1&casesId=243"+"&shijian=3"+"&ruleType="+ruleType+"&startDateParam="+startDateParam+"&endDateParam="+endDateParam) 
     })
 }else{
     $(".partTitle .titlePic ").html(`<a class="consoleD" href="console.html">控制台 / </a><a class="consoleP" href="singleVeto.html?from=1">条目缺陷占比 / </a>缺陷详情`)
@@ -144,7 +144,8 @@ function getTabData(activePage){
         startDate: behosDateStart.replace(/\//g,'-'), //出院日期--开始时间
         endDate: behosDateEnd.replace(/\//g,'-'), //出院日期--结束时间
         casesEntryName: casesEntryName,
-        casesEntryId:casesEntryId,
+        casesEntryId:"",
+        casesId:casesId,
         size: 15,
         ruleType:ruleType,
         isReject: isSingleReject,
@@ -424,7 +425,7 @@ function renderTab(data,hisId){
 }
 
 function isTextCenter(name){
-    const textCenterList = ['level', 'scoreRes', 'sex','age', 'behospitalDate', 'leaveHospitalDate', 'placefileDate', 'gradeTime','checkStatus']
+    const textCenterList = ['level', 'scoreRes', 'sex','age', 'behospitalDate', 'leaveHospitalDate', 'placefileDate', 'gradeTime','checkStatus','mrStatus','mrTime','chTime','chName','mrName','diagnose','behDoctorName','directorDoctorName','doctorName']
     return textCenterList.findIndex(item=> item==name) > -1
 }
 
@@ -1152,7 +1153,8 @@ $(function($){
             startDate: behosDateStart.replace(/\//g,'-'), //出院日期--开始时间
             endDate: behosDateEnd.replace(/\//g,'-'), //出院日期--结束时间
             casesEntryName: casesEntryName,
-            casesEntryId:casesEntryId,
+            casesEntryId:"",
+            casesId:casesId,
             isReject: isSingleReject,
             doctorName: doctorName,
             doctorId: doctorNum,

src/js/qcListDept.js

@@ -370,7 +370,7 @@ function renderTab(data){
 }
 
 function isTextCenter(name){
-    const textCenterList = ['level', 'scoreRes', 'sex','age', 'behospitalDate', 'leaveHospitalDate', 'placefileDate', 'gradeTime','checkStatus']
+    const textCenterList = ['level', 'scoreRes', 'sex','age', 'behospitalDate', 'leaveHospitalDate', 'placefileDate', 'gradeTime','checkStatus','mrStatus','mrTime','chTime','chName','mrName','diagnose','behDoctorName','directorDoctorName','doctorName']
     return textCenterList.findIndex(item=> item==name) > -1
 }
 

src/js/qcListDocteam.js

@@ -353,7 +353,7 @@ function renderTab(data){
 }
 
 function isTextCenter(name){
-    const textCenterList = ['level', 'scoreRes', 'sex','age', 'behospitalDate', 'leaveHospitalDate', 'placefileDate', 'gradeTime','checkStatus']
+    const textCenterList = ['level', 'scoreRes', 'sex','age', 'behospitalDate', 'leaveHospitalDate', 'placefileDate', 'gradeTime','checkStatus','mrStatus','mrTime','chTime','chName','mrName','diagnose','behDoctorName','directorDoctorName','doctorName']
     return textCenterList.findIndex(item=> item==name) > -1
 }
 

src/js/qcListOutHospital.js

@@ -407,7 +407,7 @@ function renderTab(data,hisId){
 }
 
 function isTextCenter(name){
-    const textCenterList = ['level', 'scoreRes', 'sex','age', 'behospitalDate', 'leaveHospitalDate', 'placefileDate', 'gradeTime','checkStatus']
+    const textCenterList = ['level', 'scoreRes', 'sex','age', 'behospitalDate', 'leaveHospitalDate', 'placefileDate', 'gradeTime','checkStatus','mrStatus','mrTime','chTime','chName','mrName','diagnose','behDoctorName','directorDoctorName','doctorName']
     return textCenterList.findIndex(item=> item==name) > -1
 }
 

src/js/qcListPerson.js

@@ -373,7 +373,7 @@ function renderTab(data){
 }
 
 function isTextCenter(name){
-    const textCenterList = ['level', 'scoreRes', 'sex','age', 'behospitalDate', 'leaveHospitalDate', 'placefileDate', 'gradeTime','checkStatus']
+    const textCenterList = ['level', 'scoreRes', 'sex','age', 'behospitalDate', 'leaveHospitalDate', 'placefileDate', 'gradeTime','checkStatus','mrStatus','mrTime','chTime','chName','mrName','diagnose','behDoctorName','directorDoctorName','doctorName']
     return textCenterList.findIndex(item=> item==name) > -1
 }
 

src/js/singleVeto.js

@@ -303,12 +303,12 @@ function renderTab(data,activePage){
     for(let i = 0; i < data.length; i++){
         const item = data[i]
         str += `
-            <tr data-id=${item.id} data-index=${i}>
+            <tr data-id=${item.id} data-caseId=${item.caseId} data-index=${i}>
                 <td  class="textCenter">${(activePage-1)*15 + i+1}</td>
                 <td class="textCenter">${item.casesName||'-'}</td>
                 <td data-name=${item.name} class="goDetail">${item.name||'-'}</td>
                 <td  class="textCenter">${item.score+''||'-'}</td>
-                <td  class="textCenter">${item.isReject == '1'?'是':'否'}</td>
+                <td  class="textCenter" >${item.isReject == '1'?'是':'否'}</td>
                 <td data-name=${item.name} class="textCenter goDetail">${item.num+''||'-'}</td>
                 <td  class="textCenter">${item.percentStr||'-'}</td>
             </tr>
@@ -325,9 +325,10 @@ function goDetail(data){
         const index = $(this).parent().attr("data-index")
         let defectName = $(this).attr("data-name")
          let defectId = $(this).parent().attr("data-id")
+         let caseId = $(this).parent().attr("data-caseId")
         const item = data[index]
         // focusMenuItem("YH-ZKK-GKSQXZB_XQ");
-        $(parent.document).find("#contentIframe").attr("src",`./qcListCopy.html?defectName=${defectName}&defectId=${defectId}&startDate=${startDateParam}&endDate=${endDateParam}&from=${from}&isSingleReject=${item.isReject}&deptName=${deptName}&deptId=${deptName}`)
+        $(parent.document).find("#contentIframe").attr("src",`./qcListCopy.html?defectName=${defectName}&caseId=${caseId} &defectId=${defectId}&startDate=${startDateParam}&endDate=${endDateParam}&from=${from}&isSingleReject=${item.isReject}&deptName=${deptName}&deptId=${deptName}`)
     })
 }
 

src/js/uccDetail.js

@@ -402,7 +402,7 @@ function renderTab(data,hisId){
 }
 
 function isTextCenter(name){
-    const textCenterList = ['level', 'scoreRes', 'sex','age', 'behospitalDate', 'leaveHospitalDate', 'placefileDate', 'gradeTime','checkStatus']
+    const textCenterList = ['level', 'scoreRes', 'sex','age', 'behospitalDate', 'leaveHospitalDate', 'placefileDate', 'gradeTime','checkStatus','mrStatus','mrTime','chTime','chName','mrName','diagnose','behDoctorName','directorDoctorName','doctorName']
     return textCenterList.findIndex(item=> item==name) > -1
 }