Parcourir la source

doctorName bug

morphone1995 il y a 4 ans
Parent
commit
93969cc675
2 fichiers modifiés avec 10 ajouts et 5 suppressions
  1. 4 2
      src/js/uccDetail.js
  2. 6 3
      src/js/uncorrectedCopy.js

+ 4 - 2
src/js/uccDetail.js

@@ -35,6 +35,7 @@ let casesId = getUrlArgObjectNew("casesEntryId",srcUrl)||"";
 let isSingleReject = getUrlArgObjectNew("isSingleReject",srcUrl)||""
 let deptListDept = JSON.parse(getCookie("deptList"))||[]
 let isInspection = getUrlArgObjectNew("isInspection", srcUrl) || ""
+let doctorNameUrl = getUrlArgObjectNew("doctorName", srcUrl) || ""
 let currentPage;
 listenScroll()
 $(".selectLevel").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
@@ -134,7 +135,8 @@ function getTabData(activePage){
         behDeptName: deptName == "全部" ? "":deptName,
         doctorId: doctorNum,
         hospitalId:getCookie("hospitalid"),
-        doctorName: doctorName,
+        // doctorName: doctorName,
+        doctorName: doctorNameUrl,
         level:level,//病历等级
         startDate: behosDateStart.replace(/\//g,'-'), //出院日期--开始时间
         endDate: behosDateEnd.replace(/\//g,'-'), //出院日期--结束时间
@@ -1203,7 +1205,7 @@ $(function($){
             isPlacefile:isPlacefile,          
             casesEntryId:casesId,
             isReject: isSingleReject,
-            doctorName: doctorName,
+            // doctorName: doctorName,
             doctorId: doctorNum,
             ascs:data_asc,     //升序
             descs:data_desc,       //降序

+ 6 - 3
src/js/uncorrectedCopy.js

@@ -147,6 +147,7 @@ function renderTab(data,hisId,activePage){
   let str = ''
   for(let i = 0; i < data.length; i++){
     const item = data[i]
+    // console.log(item,'=====================item');
     str += `
         <tr  data-index=${i}>
             <td  class="textCenter">${(activePage-1)*15 + i+1}</td>`
@@ -156,7 +157,8 @@ function renderTab(data,hisId,activePage){
         if(tmpKey=='deptName'||tmpKey=='doctorName'){
           str += `<td dept-id="${item.deptId || ""}" data-tid="${orderList[j].id}" data-doc="${item.doctorName}" dept-name="${item.deptName || ""}" data-id="${item.numId || ""}" data-name="${orderKey[j] || ""}">${item[tmpKey]+'' || "-"}</td>`
         }else{
-          str += `<td class="goHomeDetail" data-tid="${orderList[j].id}" data-doc="${item.doctorName}" dept-id="${item.deptId || ""}" dept-name="${item.deptName || ""}" data-id="${item.numId || ""}" data-name="${orderKey[j] || ""}">${item[tmpKey]+'' || "-"}</td>`
+          // str += `<td class="goHomeDetail" data-tid="${orderList[j].id}" data-doc="${item.doctorName}" dept-id="${item.deptId || ""}" dept-name="${item.deptName || ""}" data-id="${item.numId || ""}" data-name="${orderKey[j] || ""}">${item[tmpKey]+'' || "-"}</td>`
+          str += `<td class="goHomeDetail" data-tid="${orderList[j].id}" dept-id="${item.deptId || ""}" dept-name="${item.deptName || ""}" data-id="${item.numId || ""}" data-name="${orderKey[j] || ""}"   data-doctor="${item.doctorName || ""}">${item[tmpKey]+'' || "-"}</td>`
         }
       }      
     str += `</tr>`
@@ -169,10 +171,11 @@ function renderTab(data,hisId,activePage){
     let casesName = $(this).attr("data-name") || '';
     let casesId = $(this).attr("data-tid");
     let name=$(this).attr("dept-name");
-    let docName=$(this).attr("data-doc");
+    // let docName=$(this).attr("data-doc");
+    let doctorName = $(this).attr("data-doctor") || '';
     name=name==="全院"?"全部":name;
     let id=$(this).attr("dept-id");
-    $(parent.document).find("#contentIframe").attr("src", "uccDetail.html?from=4&deptName=" + name + "&deptId=" + id + "&casesEntryId=" + casesId + "&defectName=" + casesName + "&startDate=" + startDateParam + "&endDate=" + endDateParam + "&isInspection=true")
+    $(parent.document).find("#contentIframe").attr("src", "uccDetail.html?from=4&deptName=" + name + "&deptId=" + id + "&casesEntryId=" + casesId + "&defectName=" + casesName + "&startDate=" + startDateParam + "&endDate=" + endDateParam + "&doctorName=" + doctorName + "&isInspection=true")
   })
   // initScroll("partDetailControl","YX",1)
 }