Merge branch 'version1.3.8' 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

@@ -16,7 +16,7 @@ $(".selectLevel").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
 $(".selectDept").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
 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

@@ -425,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
 }
 

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/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
 }