湘雅

src/js/deptQualifiedPhysician.js

@@ -12,7 +12,7 @@ const arrowLeft = require("./../images/arrow_left.png")
 const arrowRight = require("./../images/arrow_right.png")
 
 listenScroll('.physician')
-let casesId = "", name = "", isReject = "", isUsed = "", casesIdTemp = "", nameTemp = "", isRejectTemp = "", data_asc = [], data_desc = ['deptName'], isUsedTemp = "", from = "", deptIdTemp = "", deptItemId = "", deptId = "", professor = ""
+let casesId = "", name = "", isReject = "", isUsed = "", casesIdTemp = "", nameTemp = "", isRejectTemp = "", data_asc = [], data_desc = ['deptName'], isUsedTemp = "", from = "", deptIdTemp = "", deptNameTemp = "", deptName = "",deptItemId = "", deptId = "", professor = ""
 $(".selectModuleType").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
 $(".selectReject").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
 $(".selectDept").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
@@ -24,7 +24,8 @@ $(function () {
   dateChange()
   let srcUrl = $("#contentIframe", parent.document).attr("src")
   isReject = getUrlArgObjectNew("dateType", srcUrl) || ""
-  deptId = deptIdTemp = getUrlArgObjectNew("deptName", srcUrl) || ""
+  deptName = deptNameTemp = getUrlArgObjectNew("deptName", srcUrl) || ""
+  deptId = deptIdTemp = getUrlArgObjectNew("deptId", srcUrl) || ""
   from = getUrlArgObjectNew("from", srcUrl) || ""
   name = nameTemp = getUrlArgObjectNew("name", srcUrl) || ""
   let startDateParam = getUrlArgObjectNew("startDateParam", srcUrl) || ""
@@ -58,11 +59,12 @@ $(function () {
   if (!isReject) {
     setDatePicker($("#datepicker"), $("#datepicker2"), "default")
   }
-
-  if (deptId) {
-    $(".selectDept").html(deptId).attr({
+  
+  if (deptName) {
+    
+    $(".selectDept").html(deptName).attr({
       "data-id": deptId,
-      "title": deptId
+      "title": deptName
     }).append(`<img class="arrow" src=${iconDown} alt="下拉">`)
     getDeptList()
   } else {
@@ -75,7 +77,8 @@ $(function () {
   })
   $(".abnormalClear").click(function () {
     setDatePicker($("#datepicker"), $("#datepicker2"), "default")
-    deptId = deptIdTemp = deptList[0] && deptList[0].deptName
+    deptId = deptIdTemp = deptList[0] && deptList[0].deptId
+    deptName = deptNameTemp = deptList[0] && deptList[0].deptName
     name = ""
     professor = "";
     data_asc = []
@@ -91,9 +94,9 @@ $(function () {
       "data-id": "",
       "title": "全部"
     }).append(`<img class="arrow" src=${iconDown} alt="下拉">`)
-    $(".selectDept").html(deptId).attr({
+    $(".selectDept").html(deptName).attr({
       "data-id": deptId,
-      "title": deptId
+      "title": deptName
     }).append(`<img class="arrow" src=${iconDown} alt="下拉">`)
     getTabData(1)
   })
@@ -159,13 +162,14 @@ function bindDeptSelect() {
   $(document).on("click", '.deptItem', function () {
     const deptItemName = $(this).attr("data-name") || ''
     const deptItemId = $(this).attr("data-id")
-    deptIdTemp = deptItemId
+    deptId = deptIdTemp = deptItemId
+    deptName = deptNameTemp = deptItemName
     if (deptItemName.length > 10) {
       $('.selectDept').html(deptItemName.substring(0, 8) + '...')
     } else {
       $('.selectDept').html(deptItemName)
     }
-    $('.selectDept ').attr({ 'title': deptItemName, 'data-id': deptItemName })
+    $('.selectDept ').attr({ 'title': deptItemName, 'data-id': deptItemId })
     $(".selectDept").append(`<img class="arrow" src=${iconDown} alt="下拉">`)
 
     $(".deptList").css("display", "none")
@@ -220,12 +224,14 @@ getDeptList()
 function getDeptList() {
   let str = ``
   if (deptList.length <= 0) return
-  $(".physician .selectDept").attr("data-id", deptList[0].deptName).find("i").html(deptList[0].deptName)
+  $(".physician .selectDept").attr("data-id", deptList[0].deptId).find("i").html(deptList[0].deptName)
   for (let i = 0; i < deptList.length; i++) {
     let tmp = deptList[i]
-    str += `<li class="deptItem ellipsis" title="${tmp.deptName}" data-id="${tmp.deptName}" data-name="${tmp.deptName}">${tmp.deptName}</li>`
+    str += `<li class="deptItem ellipsis" title="${tmp.deptName}" data-id="${tmp.deptId}" data-name="${tmp.deptName}">${tmp.deptName}</li>`
   }
   $(".physician .deptList").html(str)
+  deptName = deptNameTemp = deptList[0].deptName
+  deptId = deptIdTemp = deptList[0].deptId
 }
 //判断有无某一权限
 function hasData(data) {
@@ -276,7 +282,8 @@ function getTabData(activePage) {
     current: activePage,
     type: 0, //1-本月，2-本年,0-自定义时间（现在 都是自定义时间，都会传具体时间进去）
     doctorName: name, //条目名
-    deptName: deptId || (deptList.length > 0 ? deptList[0].deptName : ''), //科室名
+    deptName: deptName || '', //科室名
+    deptId: deptId || '',
     size: 15,
     ascs: data_asc,     //升序
     descs: data_desc,       //降序
@@ -305,7 +312,7 @@ $(".moduleItemInp").on("input", function (e) {
   name = nameTemp = val
 })
 $(".filter").on("click", function (e) {
-  casesId = casesIdTemp, name = nameTemp, isReject = isRejectTemp, isUsed = isUsedTemp, deptId = deptIdTemp
+  casesId = casesIdTemp, name = nameTemp, isReject = isRejectTemp, isUsed = isUsedTemp, deptId = deptIdTemp, deptName = deptNameTemp
   getTabData(1)
 })
 $(".filterclear").on("click", function (e) {
@@ -729,7 +736,7 @@ $(function () {
       "desc": data_desc,
       "doctorName": name,
       "professor": professor == "全部" ? "" : professor || "",
-      "deptName": deptId || (deptList.length > 0 ? deptList[0].deptName : ''), //科室名
+      "deptName": deptName || '', //科室名
       "type": 0, //1-本月，2-本年
       "startDate": startDateParam,
       "isPlacefile": isPlacefile,

src/js/qualifiedPhysician.js

@@ -170,7 +170,6 @@ function getTabData(activePage) {
     "ascs": data_asc,
     "descs": data_desc,
     "doctorName": doctorName,
-    "deptId": deptId,
     "name": behospitalCode || "",
     "deptClass": leaveHosType || '',
     "deptName": deptName == "全部" ? "" : deptName || "",