1178232204@qq.com 3 years ago
parent
commit
e902483d80

+ 1 - 1
src/css/deptQualifiedPhysician.less

@@ -202,7 +202,7 @@
         cursor: pointer;
         cursor: pointer;
     }
     }
     .selectDept,.selectLeaveHosType,.selectPhysician{
     .selectDept,.selectLeaveHosType,.selectPhysician{
-        width: 160px;
+        width: 180px;
     }
     }
     
     
     .filter{
     .filter{

+ 12 - 2
src/html/deptQualifiedPhysician.html

@@ -31,7 +31,17 @@
 
 
           </ul>
           </ul>
         </span>
         </span>
-        <span class="filterItem typeFilter">
+        <span class="filterItem typeFilter deptListWrap">
+          <span style="overflow:hidden">科室:</span>
+          <span class="selectPhysician ellipsis" data-id=" "><i>全部</i></span>
+          <ul class="physicianList filterDropList">
+            <li class="physicianItem  ellipsis" title="全部" data-id="" data-name="全部">全部</li>
+            <li class="physicianItem  ellipsis" title="住院医师" data-name="住院医师">住院医师</li>
+            <li class="physicianItem  ellipsis" title="主治医师" data-name="主治医师">主治医师</li>
+            <li class="physicianItem  ellipsis" title="主任医师" data-name="主任医师">主任医师</li>
+          </ul>
+        </span>
+        <!-- <span class="filterItem typeFilter">
           <span>医师类别:</span>
           <span>医师类别:</span>
           <input type="text" class="selectPhysician canEditDept" value="全部">
           <input type="text" class="selectPhysician canEditDept" value="全部">
           <ul class="physicianList filterDropList">
           <ul class="physicianList filterDropList">
@@ -40,7 +50,7 @@
             <li class="physicianItem  ellipsis" title="主治医师" data-name="主治医师">主治医师</li>
             <li class="physicianItem  ellipsis" title="主治医师" data-name="主治医师">主治医师</li>
             <li class="physicianItem  ellipsis" title="主任医师" data-name="主任医师">主任医师</li>
             <li class="physicianItem  ellipsis" title="主任医师" data-name="主任医师">主任医师</li>
           </ul>
           </ul>
-        </span>
+        </span> -->
         <span class="filterItem">
         <span class="filterItem">
           <span>医师姓名:</span>
           <span>医师姓名:</span>
           <span class="">
           <span class="">

+ 13 - 2
src/js/api.js

@@ -180,8 +180,19 @@ const api = {
   getMedQualityCoList: '/qc/behospitalInfo/getMedQualityCoList',//病案指标列表
   getMedQualityCoList: '/qc/behospitalInfo/getMedQualityCoList',//病案指标列表
   medicalRecordIndicator: '/console/medicalRecordIndicator',//病案指标
   medicalRecordIndicator: '/console/medicalRecordIndicator',//病案指标
   getListDoctor: '/bas/doctor/getList',//(科室医生列表)
   getListDoctor: '/bas/doctor/getList',//(科室医生列表)
-
-}
+  entryCountGroupXYByEntryPage: '/console/entryCountGroupXYByEntryPage',//湘雅医师合格率二级页面列表
+  badLevelXYPage: '/console/badLevelXYPage',//湘雅医师合格率二级页面列表合格不合格
+  entryCountGroupXYByEntryExport: '/console/export/entryCountGroupXYByEntryExport',//湘雅医师合格率二级页面导出缺陷
+  badLevelPageXYExport: '/console/export/badLevelPageXYExport',//湘雅医师合格率二级页面导出合格
+  qcResultShortXYPageExport: '/console/export/qcResultShortXYPageExport',//湘雅医师合格率三级页面导出
+  qcResultShortXYPage: '/console/qcResultShortXYPage',//湘雅医师合格率三级页面列表
+  entryCountGroupXYByEntryPageDept: '/consoleByDept/entryCountGroupXYByEntryPageDept',//湘雅医师合格率二级页面列表科室 缺陷
+  entryCountGroupXYByExportDept: '/print/export/entryCountGroupXYByExportDept',//湘雅医师合格率二级页面导出 缺陷
+  badLevelXYPageByDept: '/consoleByDept/badLevelXYPageByDept',//湘雅医师合格率二级页面列表科室 合格
+  qcResultShortXYPageByDept: '/consoleByDept/qcResultShortXYPageByDept',//湘雅医师合格率三级页面列表 科室
+  qcResultShortXYPageExportDept: '/print/export/qcResultShortXYPageExportDept',//湘雅医师合格率三级页面导出 科室
+  badLevelPageXYExportByDept: '/print/export/badLevelPageXYExportByDept',//湘雅医师合格率二级页面导出 科室
+} 
 const ywCheckApi = {
 const ywCheckApi = {
   addMedCheckInfo: '/qc/medCheckInfo/addMedCheckInfo',   //核查
   addMedCheckInfo: '/qc/medCheckInfo/addMedCheckInfo',   //核查
   getAllotCheckList: '/qc/medCheckInfo/getCheckList', //分配核查任务列表
   getAllotCheckList: '/qc/medCheckInfo/getCheckList', //分配核查任务列表

+ 5 - 0
src/js/dept/qcListCopyDept.js

@@ -39,6 +39,7 @@ let isSingleReject = getUrlArgObjectNew("isSingleReject",srcUrl)||"";
 let fromDays = getUrlArgObjectNew("fromDays", srcUrl) || "";
 let fromDays = getUrlArgObjectNew("fromDays", srcUrl) || "";
 let deptListDept = JSON.parse(getCookie("deptList"))||[];
 let deptListDept = JSON.parse(getCookie("deptList"))||[];
 let improveType = getUrlArgObjectNew("improveType", srcUrl) || '';
 let improveType = getUrlArgObjectNew("improveType", srcUrl) || '';
+let codeType = getUrlArgObjectNew("code", srcUrl) || ""
 let currentPage;
 let currentPage;
 
 
 $(".selectLevel").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
 $(".selectLevel").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
@@ -175,6 +176,8 @@ function formatPostUrl(type) {
         return api.hmImproveMRPageByDept
         return api.hmImproveMRPageByDept
     }else if(type=='10'){
     }else if(type=='10'){
         return api.qcResultShortByDeptPage
         return api.qcResultShortByDeptPage
+    }else if(type == 33){
+        return api.qcResultShortXYPageByDept
     } else{
     } else{
         return api.qcResultDefectList
         return api.qcResultDefectList
     }
     }
@@ -185,6 +188,8 @@ function formatExportUrl(type) {
         return api.qcCheckMRPageExportByDept
         return api.qcCheckMRPageExportByDept
     } else if (type === '6') {
     } else if (type === '6') {
         return api.improveMRExportByDept
         return api.improveMRExportByDept
+    } else if (type === 33) {
+        return api.qcResultShortXYPageExportDept
     }else {
     }else {
         // 默认导出接口
         // 默认导出接口
         return api.qcResultShortExportByDeptPage
         return api.qcResultShortExportByDeptPage

+ 15 - 3
src/js/dept/qcListCopyUnqualifiedDept.js

@@ -40,7 +40,7 @@ let fromDays = getUrlArgObjectNew("fromDays", srcUrl) || "";
 let deptListDept = JSON.parse(getCookie("deptList"))||[];
 let deptListDept = JSON.parse(getCookie("deptList"))||[];
 let improveType = getUrlArgObjectNew("improveType", srcUrl) || '';
 let improveType = getUrlArgObjectNew("improveType", srcUrl) || '';
 let titleName = getUrlArgObjectNew("titleName", srcUrl) || '';
 let titleName = getUrlArgObjectNew("titleName", srcUrl) || '';
-
+let codeType = getUrlArgObjectNew("code", srcUrl) || '';
 let currentPage;
 let currentPage;
 $(".selectLevel").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
 $(".selectLevel").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
 $(".selectDept").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
 $(".selectDept").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
@@ -92,7 +92,7 @@ $(function(){
 
 
 if(from==2){
 if(from==2){
     // $(".qcFiliterItem").css("display","none")
     // $(".qcFiliterItem").css("display","none")
-    $(".partTitle .titlePic ").html(`<a class="consoleD" href="console.html">控制台(科室) / </a><a class="consoleP" href="partDetailControlDept.html?from=2">病案首页合格率占比 / </a>病历列表`)
+    $(".partTitle .titlePic ").html(`<a class="consoleD" href="console.html">控制台(科室) / </a><a class="consoleP" href="partDetailControlDept.html?from=2">病案首页合格率医师占比 / </a>病历列表`)
 }
 }
 $(".partTitle .consoleD").click(function(){
 $(".partTitle .consoleD").click(function(){
     //初始菜单选中   
     //初始菜单选中   
@@ -134,6 +134,7 @@ $("#filterToggler").click(function(){
 function getTabData(activePage){
 function getTabData(activePage){
     // 判断是否是 住院超过31日病人数   
     // 判断是否是 住院超过31日病人数   
     let beHosGT31Days = null
     let beHosGT31Days = null
+    let url
     if (fromDays && fromDays === "1") {
     if (fromDays && fromDays === "1") {
        beHosGT31Days = 1
        beHosGT31Days = 1
     }
     }
@@ -189,7 +190,12 @@ function getTabData(activePage){
 
 
     $('.pagination').html("")
     $('.pagination').html("")
     $('.tbody').html(emptyBox('努力加载中...','',1))
     $('.tbody').html(emptyBox('努力加载中...','',1))
-    return post(api.homePageOrGoodLevelByDept,param).then(res =>{
+    if(codeType == 'XY'){
+        url = api.badLevelXYPageByDept
+    }else{
+        url = api.homePageOrGoodLevelByDept
+    }
+    return post(url,param).then(res =>{
         if(res.data.code == '0'){
         if(res.data.code == '0'){
             const data = res.data.data;
             const data = res.data.data;
             tabList = data.records;
             tabList = data.records;
@@ -1248,6 +1254,12 @@ $(function($){
         if (from == 6) {
         if (from == 6) {
             param = { ...param, improveType }
             param = { ...param, improveType }
         }
         }
+
+        if (codeType == 'XY') {
+            url = api.badLevelPageXYExportByDept
+        } else {
+            url = api.badLevelPagePageExport
+        }
         if(exportTime==90){
         if(exportTime==90){
             if((new Date(behosDateEnd) - new Date(behosDateStart))/24/60/60/1000 > exportTime){
             if((new Date(behosDateEnd) - new Date(behosDateStart))/24/60/60/1000 > exportTime){
                 $.alerModal({"message":`最多只能导出${exportTime}天`,type:"tip",time:'1000',isFather: true, fatherWrapper: $("#mainBox", parent.document)});
                 $.alerModal({"message":`最多只能导出${exportTime}天`,type:"tip",time:'1000',isFather: true, fatherWrapper: $("#mainBox", parent.document)});

+ 27 - 19
src/js/deptQualifiedPhysician.js

@@ -16,6 +16,7 @@ let casesId = "", name = "", isReject = "", isUsed = "", casesIdTemp = "", nameT
 $(".selectModuleType").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
 $(".selectModuleType").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
 $(".selectReject").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
 $(".selectReject").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
 $(".selectDept").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
 $(".selectDept").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
+$(".selectPhysician").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
 $(".selectUsed").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
 $(".selectUsed").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
 let isPlacefile = getCookie('isPlacefile') || 1
 let isPlacefile = getCookie('isPlacefile') || 1
 let deptList = JSON.parse(getCookie("deptList")) || []
 let deptList = JSON.parse(getCookie("deptList")) || []
@@ -104,13 +105,8 @@ function focusMenuItem(code) {
   //console.log($(parent.document).find(".menu .page[code='YH-ZKK-GMKQXZB_XQ']"))
   //console.log($(parent.document).find(".menu .page[code='YH-ZKK-GMKQXZB_XQ']"))
   ele.click();
   ele.click();
 }
 }
-$('.selectPhysician').on("input", function (e) {
-  let val = $(this).val().trim()
-  professor = val
-  getDoctorProfessorList(professor)
-})
 //获取医师类别
 //获取医师类别
-getDoctorProfessorList()
+// getDoctorProfessorList()
 function getDoctorProfessorList(val) {
 function getDoctorProfessorList(val) {
   // post(api.getDoctorProfessorList, { inputStr: val == "全部" ? "" : val || "", }).then(res => {
   // post(api.getDoctorProfessorList, { inputStr: val == "全部" ? "" : val || "", }).then(res => {
   //   if (res.data.code == '0') {
   //   if (res.data.code == '0') {
@@ -122,7 +118,7 @@ function getDoctorProfessorList(val) {
   // }).catch((e) => {
   // }).catch((e) => {
 
 
   // })
   // })
-  bindPhysicianSelect()
+  
 }
 }
 function rendePhysicianList(physicianList) {
 function rendePhysicianList(physicianList) {
   if (physicianList.length == 0) {
   if (physicianList.length == 0) {
@@ -136,17 +132,21 @@ function rendePhysicianList(physicianList) {
   $('.physicianList').html(str)
   $('.physicianList').html(str)
   bindPhysicianSelect()
   bindPhysicianSelect()
 }
 }
+bindPhysicianSelect()
 //医师类别选中
 //医师类别选中
 function bindPhysicianSelect() {
 function bindPhysicianSelect() {
-  $('.physicianItem').on("mousedown", function () {
-    const physicianItemName = $(this).attr("data-name")
+  $('.physicianItem').on("click", function () {
+    const physicianItemName = $(this).attr("data-name") || ''
     const physicianItemId = $(this).attr("data-id")
     const physicianItemId = $(this).attr("data-id")
-    physicianIdTemp = physicianItemId
-    professor = physicianItemName === "全部" ? "" : physicianItemName;
-    $('.selectPhysician').val(physicianItemName)
-    $('.selectPhysician ').attr('title', physicianItemName)
+    professor = physicianItemName
+    if (physicianItemName.length > 10) {
+      $('.selectPhysician').html(physicianItemName.substring(0, 8) + '...')
+    } else {
+      $('.selectPhysician').html(physicianItemName)
+    }
+    $('.selectPhysician ').attr({ 'title': physicianItemName, 'data-id': physicianItemName })
+    $(".selectPhysician").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
     $(".physicianList").css("display", "none")
     $(".physicianList").css("display", "none")
-    $('.selectPhysician').removeClass('unSelect')
   })
   })
 }
 }
 bindDeptSelect()
 bindDeptSelect()
@@ -182,11 +182,18 @@ $('.selectDept').on("click", function (e) {
     $(".selectDept .arrow").attr("src", iconDown)
     $(".selectDept .arrow").attr("src", iconDown)
   }
   }
 })
 })
-$('.selectPhysician').on("focus", function (e) {
+$('.selectPhysician').on("click", function (e) {
   e.stopPropagation()
   e.stopPropagation()
   $(".levelList ").css("display", "none")
   $(".levelList ").css("display", "none")
   $(".selectLevel .arrow").attr("src", iconDown)
   $(".selectLevel .arrow").attr("src", iconDown)
-  $(".physicianList ").css("display", "block")
+  const showList = $(".physicianList ").css("display")
+  if (showList == "none" || !showList) {
+    $(".physicianList ").css("display", "block")
+    $(".selectPhysician .arrow").attr("src", iconUp)
+  } else {
+    $(".physicianList ").css("display", "none")
+    $(".selectPhysician .arrow").attr("src", iconDown)
+  }
 })
 })
 //排序
 //排序
 $("body").on("click", "th[code]", function (e) {
 $("body").on("click", "th[code]", function (e) {
@@ -275,7 +282,7 @@ function getTabData(activePage) {
   }
   }
   startDateParam = dateStatrt
   startDateParam = dateStatrt
   endDateParam = dateEnd
   endDateParam = dateEnd
-  post(api.homePageLevelStatisticsXY, param).then(res => {
+  post(api.homePageLevelStatisticsXYByDept, param).then(res => {
     if (res.data.code == '0') {
     if (res.data.code == '0') {
       const data = res.data.data.records
       const data = res.data.data.records
       const totalPage = res.data.data.pages
       const totalPage = res.data.data.pages
@@ -409,7 +416,7 @@ function renderTab(data, activePage) {
     let doctorName = $(this).attr("data-doctorName")
     let doctorName = $(this).attr("data-doctorName")
     let docId = $(this).attr("data-docId")
     let docId = $(this).attr("data-docId")
     let deptId = data[index].deptId
     let deptId = data[index].deptId
-    $(parent.document).find("#contentIframe").attr("src", "quexianDetailHome.html?deptName=" + deptName + "&deptId=" + deptId + "&from=1&casesId=243" + "&shijian=3" + "&ruleType=" + ruleType + "&startDateParam=" + startDateParam + "&endDateParam=" + endDateParam + "&docName=" + doctorName + "&docId=" + docId)
+    $(parent.document).find("#contentIframe").attr("src", "quexianDetailHome.html?deptName=" + deptName + "&deptId=" + deptId + "&from=1&casesId=243" + "&shijian=3" + "&ruleType=" + ruleType + "&startDateParam=" + startDateParam + "&endDateParam=" + endDateParam + "&docName=" + doctorName + "&docId=" + docId +"&code=XY")
   })
   })
   // 不合格数跳转至 病历列表详情页
   // 不合格数跳转至 病历列表详情页
   $(".goHomeDetail1").click(function () {
   $(".goHomeDetail1").click(function () {
@@ -421,7 +428,7 @@ function renderTab(data, activePage) {
     // let ruleType = $(this).attr("data-ruleType")
     // let ruleType = $(this).attr("data-ruleType")
     let deptId = data[index].deptId
     let deptId = data[index].deptId
     // $(parent.document).find("#contentIframe").attr("src", "qcListCopy.html?deptName=" + deptName + "&deptId=" + deptId + "&from=4&casesId=243" + "&shijian=3" + "&ruleType=" + ruleType + "&startDate=" + startDateParam + "&endDate=" + endDateParam + "&defectName=" + defectName)
     // $(parent.document).find("#contentIframe").attr("src", "qcListCopy.html?deptName=" + deptName + "&deptId=" + deptId + "&from=4&casesId=243" + "&shijian=3" + "&ruleType=" + ruleType + "&startDate=" + startDateParam + "&endDate=" + endDateParam + "&defectName=" + defectName)
-    $(parent.document).find("#contentIframe").attr("src", "qcListCopyUnqualifiedDept.html?deptName=" + deptName + "&deptId=" + deptId + "&from=4&casesId=243" + "&shijian=3" + "&startDate=" + startDateParam + "&endDate=" + endDateParam + "&titleName=" + titleName + "&docName=" + doctorName + "&docId=" + docId)
+    $(parent.document).find("#contentIframe").attr("src", "qcListCopyUnqualifiedDept.html?deptName=" + deptName + "&deptId=" + deptId + "&from=2&casesId=243" + "&shijian=3" + "&startDate=" + startDateParam + "&endDate=" + endDateParam + "&titleName=" + titleName + "&docName=" + doctorName + "&docId=" + docId +"&code=XY")
   })
   })
   // initScroll("deptScoreDetailControl","YX",1)
   // initScroll("deptScoreDetailControl","YX",1)
 }
 }
@@ -689,6 +696,7 @@ $(document).on("click", function () {
   $(".selectReject .arrow").attr("src", iconDown)
   $(".selectReject .arrow").attr("src", iconDown)
   $(".selectUsed .arrow").attr("src", iconDown)
   $(".selectUsed .arrow").attr("src", iconDown)
   $(".deptList").css("display", "none")
   $(".deptList").css("display", "none")
+  $(".physicianList").css("display", "none")
   $(".selectDept .arrow").attr("src", iconDown)
   $(".selectDept .arrow").attr("src", iconDown)
 })
 })
 $(function () {
 $(function () {

+ 4 - 1
src/js/qcListCopy.js

@@ -38,7 +38,6 @@ let isSingleReject = getUrlArgObjectNew("isSingleReject",srcUrl)||"";
 let fromDays = getUrlArgObjectNew("fromDays", srcUrl) || "";
 let fromDays = getUrlArgObjectNew("fromDays", srcUrl) || "";
 let deptListDept = JSON.parse(getCookie("deptList"))||[];
 let deptListDept = JSON.parse(getCookie("deptList"))||[];
 let improveType = getUrlArgObjectNew("improveType", srcUrl) || '';
 let improveType = getUrlArgObjectNew("improveType", srcUrl) || '';
-
 let currentPage;
 let currentPage;
 $(".selectLevel").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
 $(".selectLevel").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
 $(".selectDept").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
 $(".selectDept").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
@@ -162,6 +161,8 @@ function formatPostUrl(type) {
         return api.qcCheckMRPage
         return api.qcCheckMRPage
     } else if (type === '6') {
     } else if (type === '6') {
         return api.hmImproveMRPage
         return api.hmImproveMRPage
+    } else if (type === '4') {
+        return api.qcResultShortXYPage
     }else{
     }else{
         return api.qcResultDefectList
         return api.qcResultDefectList
     }
     }
@@ -172,6 +173,8 @@ function formatExportUrl(type) {
         return api.qcCheckMRPageExport
         return api.qcCheckMRPageExport
     } else if (type === '6') {
     } else if (type === '6') {
         return api.hmImproveMRPageExport
         return api.hmImproveMRPageExport
+    } else if (type === '4') {
+        return api.qcResultShortXYPageExport
     }else {
     }else {
         // 默认导出接口
         // 默认导出接口
         return api.qcResultShortPageExport
         return api.qcResultShortPageExport

+ 14 - 3
src/js/qcListCopyUnqualified.js

@@ -39,6 +39,7 @@ let fromDays = getUrlArgObjectNew("fromDays", srcUrl) || "";
 let deptListDept = JSON.parse(getCookie("deptList"))||[];
 let deptListDept = JSON.parse(getCookie("deptList"))||[];
 let improveType = getUrlArgObjectNew("improveType", srcUrl) || '';
 let improveType = getUrlArgObjectNew("improveType", srcUrl) || '';
 let titleName = getUrlArgObjectNew("titleName", srcUrl) || '';
 let titleName = getUrlArgObjectNew("titleName", srcUrl) || '';
+let codeType = getUrlArgObjectNew("code", srcUrl) || ""
 let currentPage;
 let currentPage;
 $(".selectLevel").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
 $(".selectLevel").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
 $(".selectDept").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
 $(".selectDept").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
@@ -53,7 +54,6 @@ listenScroll('.qcListCopy')
 if(isPlacefile != 1){
 if(isPlacefile != 1){
     data_desc=["behospitalDate"]
     data_desc=["behospitalDate"]
 }
 }
-console.log(docName);
 
 
 if(chengdu){
 if(chengdu){
     levelTemp = chengdu
     levelTemp = chengdu
@@ -182,10 +182,15 @@ function getTabData(activePage){
         param = { ...param, improveType }
         param = { ...param, improveType }
     }
     }
 
 
-
+    if (codeType == 'XY') {
+        url = api.badLevelXYPage
+    } else {
+        url = api.getBadLevelPage
+    }
+    
     $('.pagination').html("")
     $('.pagination').html("")
     $('.tbody').html(emptyBox('努力加载中...','',1))
     $('.tbody').html(emptyBox('努力加载中...','',1))
-    return post(api.getBadLevelPage,param).then(res =>{
+    return post(url,param).then(res =>{
         if(res.data.code == '0'){
         if(res.data.code == '0'){
             const data = res.data.data;
             const data = res.data.data;
             tabList = data.records;
             tabList = data.records;
@@ -1272,6 +1277,12 @@ $(function($){
         if (from == 6) {
         if (from == 6) {
             param = { ...param, improveType }
             param = { ...param, improveType }
         }
         }
+
+        if (codeType == 'XY') {
+            url = api.badLevelPageXYExport
+        } else {
+            url = api.badLevelPagePageExport
+        }
         if(exportTime==90){
         if(exportTime==90){
             if((new Date(behosDateEnd) - new Date(behosDateStart))/24/60/60/1000 > exportTime){
             if((new Date(behosDateEnd) - new Date(behosDateStart))/24/60/60/1000 > exportTime){
                 $.alerModal({"message":`最多只能导出${exportTime}天`,type:"tip",time:'1000',isFather: true, fatherWrapper: $("#mainBox", parent.document)});
                 $.alerModal({"message":`最多只能导出${exportTime}天`,type:"tip",time:'1000',isFather: true, fatherWrapper: $("#mainBox", parent.document)});

+ 2 - 2
src/js/qualifiedPhysician.js

@@ -298,7 +298,7 @@ function renderTab(data, hisId, activePage) {
     let ruleType = $(this).attr("data-ruleType")
     let ruleType = $(this).attr("data-ruleType")
     let doctorName = $(this).attr("data-doctorName")
     let doctorName = $(this).attr("data-doctorName")
     let deptId = data[index].deptId
     let deptId = data[index].deptId
-    $(parent.document).find("#contentIframe").attr("src", "quexianDetailControlHome.html?deptName=" + deptName + "&deptId=" + deptId + "&from=1&casesId=243" + "&shijian=3" + "&ruleType=" + ruleType + "&startDateParam=" + startDateParam + "&endDateParam=" + endDateParam + "&docName=" + doctorName)
+    $(parent.document).find("#contentIframe").attr("src", "quexianDetailControlHome.html?deptName=" + deptName + "&deptId=" + deptId + "&from=1&casesId=243" + "&shijian=3" + "&ruleType=" + ruleType + "&startDateParam=" + startDateParam + "&endDateParam=" + endDateParam + "&docName=" + doctorName + "&code=XY")
   })
   })
   // 不合格数跳转至 病历列表详情页
   // 不合格数跳转至 病历列表详情页
   $(".goHomeDetail1").click(function () {
   $(".goHomeDetail1").click(function () {
@@ -309,7 +309,7 @@ function renderTab(data, hisId, activePage) {
     // let ruleType = $(this).attr("data-ruleType")
     // let ruleType = $(this).attr("data-ruleType")
     let deptId = data[index].deptId
     let deptId = data[index].deptId
     // $(parent.document).find("#contentIframe").attr("src", "qcListCopy.html?deptName=" + deptName + "&deptId=" + deptId + "&from=4&casesId=243" + "&shijian=3" + "&ruleType=" + ruleType + "&startDate=" + startDateParam + "&endDate=" + endDateParam + "&defectName=" + defectName)
     // $(parent.document).find("#contentIframe").attr("src", "qcListCopy.html?deptName=" + deptName + "&deptId=" + deptId + "&from=4&casesId=243" + "&shijian=3" + "&ruleType=" + ruleType + "&startDate=" + startDateParam + "&endDate=" + endDateParam + "&defectName=" + defectName)
-    $(parent.document).find("#contentIframe").attr("src", "qcListCopyUnqualified.html?deptName=" + deptName + "&deptId=" + deptId + "&from=4&casesId=243" + "&shijian=3" + "&startDate=" + startDateParam + "&endDate=" + endDateParam + "&titleName=" + titleName + "&docName=" + doctorName)
+    $(parent.document).find("#contentIframe").attr("src", "qcListCopyUnqualified.html?deptName=" + deptName + "&deptId=" + deptId + "&from=4&casesId=243" + "&shijian=3" + "&startDate=" + startDateParam + "&endDate=" + endDateParam + "&titleName=" + titleName + "&docName=" + doctorName + "&code=XY")
   })
   })
   // initScroll("deptScoreDetailControl","YX",1)
   // initScroll("deptScoreDetailControl","YX",1)
 }
 }

+ 23 - 7
src/js/quexianDetailControlHome.js

@@ -13,7 +13,7 @@ const arrowRight = require("./../images/arrow_right.png")
 let isPlacefile = getCookie('isPlacefile')||1
 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=""
+let casesId="", name="", isReject ="",startDateParam='',endDateParam='',deptName="",data_asc=[],data_desc=["casesName"], isUsed ="",ruleType="",casesIdTemp="",casesIds="", nameTemp="", isRejectTemp ="", isUsedTemp ="",from="",deptIdTemp="",deptItemId="",deptId="",codeType=''
 $(".selectModuleType").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
 $(".selectModuleType").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
 $(".selectReject").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
 $(".selectReject").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
 $(".selectUsed").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
 $(".selectUsed").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
@@ -27,7 +27,8 @@ $(function(){
     let srcUrl = $("#contentIframe",parent.document).attr("src")
     let srcUrl = $("#contentIframe",parent.document).attr("src")
     
     
     deptName = getUrlArgObjectNew("deptName",srcUrl)||""
     deptName = getUrlArgObjectNew("deptName",srcUrl)||""
-    deptId = deptIdTemp = getUrlArgObjectNew("deptId",srcUrl)||""
+    deptIdTemp = getUrlArgObjectNew("deptName",srcUrl)||""
+    deptId = getUrlArgObjectNew("deptId", srcUrl) || ""
     from = getUrlArgObjectNew("from",srcUrl)||""
     from = getUrlArgObjectNew("from",srcUrl)||""
     isReject = isRejectTemp = getUrlArgObjectNew("shijian",srcUrl)||""
     isReject = isRejectTemp = getUrlArgObjectNew("shijian",srcUrl)||""
     casesIds = getUrlArgObjectNew("casesId",srcUrl)||""
     casesIds = getUrlArgObjectNew("casesId",srcUrl)||""
@@ -35,6 +36,7 @@ $(function(){
     startDateParam = getUrlArgObjectNew("startDateParam",srcUrl)||""
     startDateParam = getUrlArgObjectNew("startDateParam",srcUrl)||""
     endDateParam = getUrlArgObjectNew("endDateParam",srcUrl)||""
     endDateParam = getUrlArgObjectNew("endDateParam",srcUrl)||""
     docName = getUrlArgObjectNew("docName", srcUrl) || ""
     docName = getUrlArgObjectNew("docName", srcUrl) || ""
+    codeType = getUrlArgObjectNew("code", srcUrl) || ""
     $('.selectDefect').html(deptName).attr("title",deptName)
     $('.selectDefect').html(deptName).attr("title",deptName)
     if(isReject == 1){
     if(isReject == 1){
         $(".monthYear .mon").css({
         $(".monthYear .mon").css({
@@ -109,7 +111,8 @@ function bindDeptSelect(){
     $(document).on("click",'.deptItem',function(){
     $(document).on("click",'.deptItem',function(){
         const deptItemName = $(this).attr("data-name")||""
         const deptItemName = $(this).attr("data-name")||""
         const deptItemId = $(this).attr("data-id")
         const deptItemId = $(this).attr("data-id")
-        deptIdTemp = deptId = deptItemId
+        deptIdTemp = deptItemName
+        deptId = deptItemId
         if(deptItemName.length > 10){
         if(deptItemName.length > 10){
             $('.selectDept').html(deptItemName.substring(0,8)+'...')
             $('.selectDept').html(deptItemName.substring(0,8)+'...')
         }else{
         }else{
@@ -170,6 +173,7 @@ function getTabData(activePage){
     const dateEnd = getPickerDate($("#datepicker2"),2)
     const dateEnd = getPickerDate($("#datepicker2"),2)
     const start = new Date(dateStatrt).getTime()
     const start = new Date(dateStatrt).getTime()
     const end = new Date(dateEnd).getTime()
     const end = new Date(dateEnd).getTime()
+    let url
     if(start > end){
     if(start > end){
         $.alerModal({"message":'开始时间不能大于结束时间~',type:"tip",time:'1000',isFather: true, fatherWrapper: $("#mainBox", parent.document)});
         $.alerModal({"message":'开始时间不能大于结束时间~',type:"tip",time:'1000',isFather: true, fatherWrapper: $("#mainBox", parent.document)});
         return
         return
@@ -192,9 +196,14 @@ function getTabData(activePage){
     }
     }
     startDateParam = dateStatrt
     startDateParam = dateStatrt
     endDateParam = dateEnd
     endDateParam = dateEnd
+    if (codeType == 'XY'){
+        url = api.entryCountGroupXYByEntryPage
+    }else{
+        url = api.entryCountGroupByEntryPage
+    }
     $('.pagination').html("")
     $('.pagination').html("")
     $('tbody.tbodys').html(emptyBox('努力加载中...','',1))
     $('tbody.tbodys').html(emptyBox('努力加载中...','',1))
-    post(api.entryCountGroupByEntryPage,param).then(res =>{
+    post(url,param).then(res =>{
         if(res.data.code == '0'){
         if(res.data.code == '0'){
             const data = res.data.data.records
             const data = res.data.data.records
             const totalPage = res.data.data.pages
             const totalPage = res.data.data.pages
@@ -253,7 +262,7 @@ $(".moduleItemInp").on("input", function(e){
     nameTemp = val
     nameTemp = val
 })
 })
 $(".filter").on("click", function(e){
 $(".filter").on("click", function(e){
-    casesId=casesIdTemp, name=nameTemp, isReject =isRejectTemp, isUsed =isUsedTemp,deptId = deptIdTemp
+    casesId=casesIdTemp, name=nameTemp, isReject =isRejectTemp, isUsed =isUsedTemp
     getTabData(1)
     getTabData(1)
 })
 })
 $(".filterclear").on("click", function(e){
 $(".filterclear").on("click", function(e){
@@ -328,10 +337,11 @@ function renderTab(data,activePage){
     bindEdit(data,activePage)
     bindEdit(data,activePage)
     // initScroll("quexianDetailControlHome","Y",1)
     // initScroll("quexianDetailControlHome","Y",1)
     $(".canJump").click(function(){
     $(".canJump").click(function(){
+        console.log(deptId);
         // let ruleType = $(this).attr("data-ruleType")
         // let ruleType = $(this).attr("data-ruleType")
         let index = $(this).parent().attr("data-index")
         let index = $(this).parent().attr("data-index")
         let defectName = data[index].name
         let defectName = data[index].name
-        $(parent.document).find("#contentIframe").attr("src","qcListCopy.html?deptName="+deptName+"&deptId="+deptId+"&from=4&casesId=243"+"&shijian=3"+"&ruleType="+ruleType+"&startDate="+startDateParam+"&endDate="+endDateParam+"&defectName="+defectName)
+        $(parent.document).find("#contentIframe").attr("src", "qcListCopy.html?deptName=" + deptName + "&deptId=" + deptId + "&from=4&casesId=243" + "&shijian=3" + "&ruleType=" + ruleType + "&startDate=" + startDateParam + "&endDate=" + endDateParam + "&defectName=" + defectName)
     })
     })
 }
 }
 
 
@@ -596,10 +606,16 @@ $(function() {
     $('.exportData').click(function(){
     $('.exportData').click(function(){
         const start = new Date(startDateParam).getTime()
         const start = new Date(startDateParam).getTime()
         const end = new Date(endDateParam).getTime()
         const end = new Date(endDateParam).getTime()
+        let url
         if(start > end){
         if(start > end){
             $.alerModal({"message":'开始时间不能大于结束时间~',type:"tip",time:'1000',isFather: true, fatherWrapper: $("#mainBox", parent.document)});
             $.alerModal({"message":'开始时间不能大于结束时间~',type:"tip",time:'1000',isFather: true, fatherWrapper: $("#mainBox", parent.document)});
             return
             return
         }
         }
+        if (codeType == 'XY') {
+            url = api.entryCountGroupXYByEntryExport
+        } else {
+            url = api.entryCountGroupByEntryExport
+        }
         const param = {
         const param = {
             type: 0,
             type: 0,
             name: name, //条目名
             name: name, //条目名
@@ -615,7 +631,7 @@ $(function() {
             "startDate":startDateParam,
             "startDate":startDateParam,
             "endDate":endDateParam
             "endDate":endDateParam
         }
         }
-        expJson(api.entryCountGroupByEntryExport,param).then(res =>{
+        expJson(url,param).then(res =>{
             downloadExportedData(res.data, "病案首页合格率占比 / 缺陷列表.xls")
             downloadExportedData(res.data, "病案首页合格率占比 / 缺陷列表.xls")
         })
         })
     })
     })

+ 21 - 5
src/js/quexianDetailHome.js

@@ -15,7 +15,7 @@ const arrowRight = require("./../images/arrow_right.png")
 listenScroll('.quexianDetailHome')
 listenScroll('.quexianDetailHome')
 let isPlacefile = getCookie('isPlacefile')||1
 let isPlacefile = getCookie('isPlacefile')||1
 
 
-let casesId="", name="", isReject ="",deptName="", isUsed ="",ruleType="",casesIdTemp="", data_asc=[],data_desc=["casesName"],nameTemp="",casesIds="", isRejectTemp ="", isUsedTemp ="",from="",deptIdTemp="",deptItemId="",deptId=""
+let casesId = "", name = "", isReject = "", deptName = "", isUsed = "", ruleType = "", casesIdTemp = "", data_asc = [], data_desc = ["casesName"], nameTemp = "", casesIds = "", isRejectTemp = "", isUsedTemp = "", from = "", deptIdTemp = "", deptItemId = "", deptId = "", codeType=""
 $(".selectModuleType").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
 $(".selectModuleType").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
 $(".selectReject").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
 $(".selectReject").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
 $(".selectUsed").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
 $(".selectUsed").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
@@ -34,6 +34,7 @@ $(function(){
     ruleType= getUrlArgObjectNew("ruleType",srcUrl)||""
     ruleType= getUrlArgObjectNew("ruleType",srcUrl)||""
     let startDateParam = getUrlArgObjectNew("startDateParam",srcUrl)||""
     let startDateParam = getUrlArgObjectNew("startDateParam",srcUrl)||""
     let endDateParam = getUrlArgObjectNew("endDateParam",srcUrl)||""
     let endDateParam = getUrlArgObjectNew("endDateParam",srcUrl)||""
+    codeType = getUrlArgObjectNew("code", srcUrl) || ""
     $('.selectDefect').html(deptName).attr("title",deptName)
     $('.selectDefect').html(deptName).attr("title",deptName)
     if(isReject == 1){
     if(isReject == 1){
         $(".monthYear .mon").css({
         $(".monthYear .mon").css({
@@ -63,7 +64,7 @@ $(function(){
     }
     }
     from = getUrlArgObjectNew("from",srcUrl)||""
     from = getUrlArgObjectNew("from",srcUrl)||""
     if(from == 1){
     if(from == 1){
-        $(".partTitle .titlePic ").html(`<a class="consoleD" href="deptConsole.html">控制台(科室) / </a><a class="consoleP" href="partDetailControlDept.html">病案首页合格率占比 / </a>缺陷列表`)
+        $(".partTitle .titlePic ").html(`<a class="consoleD" href="deptConsole.html">控制台(科室) / </a><a class="consoleP" href="partDetailControlDept.html">病案首页合格率医师占比 / </a>缺陷列表`)
         $(".partTitle .consoleD").click(function(){
         $(".partTitle .consoleD").click(function(){
             focusMenuItem('YH-KZTKS')
             focusMenuItem('YH-KZTKS')
             $(".container",parent.document).addClass("console-cont");
             $(".container",parent.document).addClass("console-cont");
@@ -186,6 +187,7 @@ function getTabData(activePage){
     const dateEnd = getPickerDate($("#datepicker2"),2)
     const dateEnd = getPickerDate($("#datepicker2"),2)
     const start = new Date(dateStatrt).getTime()
     const start = new Date(dateStatrt).getTime()
     const end = new Date(dateEnd).getTime()
     const end = new Date(dateEnd).getTime()
+    let url
     if(start > end){
     if(start > end){
         $.alerModal({"message":'开始时间不能大于结束时间~',type:"tip",time:'1000',isFather: true, fatherWrapper: $("#mainBox", parent.document)});
         $.alerModal({"message":'开始时间不能大于结束时间~',type:"tip",time:'1000',isFather: true, fatherWrapper: $("#mainBox", parent.document)});
         return
         return
@@ -209,7 +211,13 @@ function getTabData(activePage){
     }
     }
     startDateParam = dateStatrt
     startDateParam = dateStatrt
     endDateParam = dateEnd
     endDateParam = dateEnd
-    post(api.entryCountGroupByEntryAndDeptPage,param).then(res =>{
+
+    if (codeType == 'XY'){
+        url = api.entryCountGroupXYByEntryPageDept
+    }else{
+        url = api.entryCountGroupByEntryAndDeptPage
+    }
+    post(url,param).then(res =>{
         if(res.data.code == '0'){
         if(res.data.code == '0'){
             const data = res.data.data.records
             const data = res.data.data.records
             const totalPage = res.data.data.pages
             const totalPage = res.data.data.pages
@@ -344,7 +352,7 @@ function renderTab(data,activePage){
         // let ruleType = $(this).attr("data-ruleType")
         // let ruleType = $(this).attr("data-ruleType")
         let index = $(this).parent().attr("data-index")
         let index = $(this).parent().attr("data-index")
         let defectName = data[index].name
         let defectName = data[index].name
-        $(parent.document).find("#contentIframe").attr("src", "../qcListCopyDept.html?deptName=" + deptName + "&deptId=" + deptId + "&from=10&casesId=243" + "&shijian=3" + "&ruleType=" + ruleType + "&startDate=" + startDateParam + "&endDate=" + endDateParam + "&defectName=" + defectName + "&docName=" + docName + "&docId=" + docId)
+        $(parent.document).find("#contentIframe").attr("src", "../qcListCopyDept.html?deptName=" + deptName + "&deptId=" + deptId + "&from=33&casesId=243" + "&shijian=3" + "&ruleType=" + ruleType + "&startDate=" + startDateParam + "&endDate=" + endDateParam + "&defectName=" + defectName + "&docName=" + docName + "&docId=" + docId)
     })
     })
 }
 }
 
 
@@ -610,6 +618,7 @@ $(function() {
     $('.exportData').click(function(){
     $('.exportData').click(function(){
         const start = new Date(startDateParam).getTime()
         const start = new Date(startDateParam).getTime()
         const end = new Date(endDateParam).getTime()
         const end = new Date(endDateParam).getTime()
+        let url
         if(start > end){
         if(start > end){
             $.alerModal({"message":'开始时间不能大于结束时间~',type:"tip",time:'1000',isFather: true, fatherWrapper: $("#mainBox", parent.document)});
             $.alerModal({"message":'开始时间不能大于结束时间~',type:"tip",time:'1000',isFather: true, fatherWrapper: $("#mainBox", parent.document)});
             return
             return
@@ -629,7 +638,14 @@ $(function() {
             "startDate":startDateParam,
             "startDate":startDateParam,
             "endDate":endDateParam
             "endDate":endDateParam
         }
         }
-        expJson(from=10?api.entryGroupExportByDeptPage:api.entryCountGroupByEntryExport,param).then(res =>{
+        if (codeType = 'XY') {
+            url = api.entryCountGroupXYByExportDept
+        } else if (from = 10){
+            url = api.entryGroupExportByDeptPage
+        }else{
+            url = api.entryCountGroupByEntryExport
+        }
+        expJson(url,param).then(res =>{
             downloadExportedData(res.data, "病案首页合格率占比 / 缺陷列表.xls")
             downloadExportedData(res.data, "病案首页合格率占比 / 缺陷列表.xls")
         })
         })
     })
     })