Merge branch 'xy3yuan1015' into test

src/js/dept/partDetailControlDept.js

@@ -300,8 +300,7 @@ function renderTab(data, hisId, activePage) {
     $('.tbody').html(str ? str : emptyBox())
     bindScoreDetail(hisId)
     $(".goHomeDetail").click(function () {
-        let aa = undefined
-        let docName = $(this).parent().attr("data-doc")
+        let docName = $(this).parent().attr("data-doc") || ''
         let docId = $(this).parent().attr("data-docId") || ''
         let titleName = $(this).attr("data-title")
         let ruleType = $(this).attr("data-ruleType")
@@ -312,7 +311,7 @@ function renderTab(data, hisId, activePage) {
     $(".goHomeDetail1").click(function () {
        
         let index = $(this).parent().attr("data-index")
-        let docName = $(this).parent().attr("data-doc")
+        let docName = $(this).parent().attr("data-doc") || ''
         let docId = $(this).parent().attr("data-docId") || ''
         let titleName = $(this).attr("data-title")
         $(parent.document).find("#contentIframe").attr("src", "qcListCopyUnqualifiedDept.html?from=2&casesId=243&deptName=" + deptName + "&deptId=" + deptId  + "&docName=" + docName + "&shijian=3" + "&startDateParam=" + startDateParam + "&endDateParam=" + endDateParam + "&titleName=" + titleName + "&docId=" + docId)

src/js/deptQualifiedPhysician.js

@@ -412,8 +412,8 @@ function renderTab(data, activePage) {
     let index = $(this).parent().attr("data-index")
     let deptName = $(this).attr("data-dept")
     let ruleType = $(this).attr("data-ruleType")
-    let doctorName = $(this).attr("data-doctorName")
-    let docId = $(this).attr("data-docId")
+    let doctorName = $(this).attr("data-doctorName") || ''
+    let docId = $(this).attr("data-docId") || ''
     let professor = $(this).attr("data-professor")
     let deptId = data[index].deptId
     $(parent.document).find("#contentIframe").attr("src", "quexianDetailHome.html?deptName=" + deptName + "&deptId=" + deptId + "&from=13&casesId=243" + "&shijian=3" + "&ruleType=" + ruleType + "&startDateParam=" + startDateParam + "&endDateParam=" + endDateParam + "&docName=" + doctorName + "&docId=" + docId + "&code=XY" + "&professor=" + professor)
@@ -423,8 +423,8 @@ function renderTab(data, activePage) {
     let index = $(this).parent().attr("data-index")
     let deptName = $(this).attr("data-dept")
     let titleName = $(this).attr("data-title")
-    let doctorName = $(this).attr("data-doctorName")
-    let docId = $(this).attr("data-docId")
+    let doctorName = $(this).attr("data-doctorName") || ''
+    let docId = $(this).attr("data-docId") || ''
     let professor = $(this).attr("data-professor")
     // let ruleType = $(this).attr("data-ruleType")
     let deptId = data[index].deptId