bug科室未传

src/js/itemDefectDetail.js

@@ -52,8 +52,8 @@ if(defectName){
 if(deptIdPram&&deptNamePram || from == 2 &&deptList.length > 0  ){
     deptIdTemp = deptIdPram
     deptId = deptIdPram
-    deptName = deptNamePram
-    if(from == 2){
+    deptName = deptNameTemp = deptNamePram
+    if(from == 2&&!deptNamePram){
         deptId =  deptIdTemp = deptList[0].deptId
         deptName = deptNameTemp = deptList[0].deptName
     }
@@ -95,13 +95,14 @@ $("#filterToggler").click(function(){
     }
     return false;
 }
-function getTabData(activePage){
+function getTabData(activePage,nameDe){
+    // console.log(activePage,nameDe,787878)
     const param = {
         current:activePage,
         behospitalCode: behospitalCode,
         patName: name, //病人姓名
         level:level,//病历等级
-        behDeptName: deptName,
+        behDeptName: nameDe||deptName,
         ascs:data_asc,     //升序
         descs:data_desc,       //降序
         startDate: behosDateStart, //出院日期--开始时间
@@ -149,7 +150,7 @@ $(".filter").on("click", function(e){
     if(behosDateEnd){
         behosDateEnd = behosDateEnd.replace(/\//g,'-') + ' 23:59:59'
     }
-    console.log('deptNameTemp',deptNameTemp)
+    // console.log('deptNameTemp',deptNameTemp,deptName)
     name = nameTemp
     behospitalCode = behospitalCodeTemp
     level = levelTemp==="全部"?"":levelTemp
@@ -157,7 +158,7 @@ $(".filter").on("click", function(e){
     deptName = deptNameTemp==="全部"?"":deptNameTemp 
     doctorName = doctorNameTemp
     doctorNum = doctorNumTemp
-    getTabData(1)
+    getTabData(1,deptName)
 })
 $(".abnormalClear").on("click", function(e){
     tabList = []; 

src/js/singleVeto.js

@@ -320,7 +320,7 @@ function goDetail(data){
         let defectName = $(this).attr("data-name")
         const item = data[index]
         // focusMenuItem("YH-ZKK-GKSQXZB_XQ");
-        $(parent.document).find("#contentIframe").attr("src",`./itemDefectDetail.html?defectName=${defectName}&startDate=${startDateParam}&endDate=${endDateParam}&from=${from}&isSingleReject=${item.isReject}`)
+        $(parent.document).find("#contentIframe").attr("src",`./itemDefectDetail.html?defectName=${defectName}&startDate=${startDateParam}&endDate=${endDateParam}&from=${from}&isSingleReject=${item.isReject}&deptName=${deptName}&deptId=${deptName}`)
     })
 }