更新

server/app/adminapi/lists/doctor/AppointmentLists.php

@@ -9,6 +9,7 @@ use app\common\model\tcm\Prescription;
 use app\common\model\auth\AdminRole;
 use app\common\lists\ListsExtendInterface;
 use app\common\lists\ListsSearchInterface;
+use app\common\lists\Traits\HasDataScopeFilter;
 
 /**
  * 医生预约列表
@@ -17,6 +18,31 @@ use app\common\lists\ListsSearchInterface;
  */
 class AppointmentLists extends BaseAdminDataLists implements ListsSearchInterface, ListsExtendInterface
 {
+    use HasDataScopeFilter;
+
+    /**
+     * 数据隔离：医生或医助（u.assistant_id = diag.assistant_id）命中可见集合；progress_board 场景放开（看板跨医生查看）
+     */
+    private function applyDataScopeForAppointment($query, bool $progressBoard): void
+    {
+        if ($progressBoard) {
+            return;
+        }
+        if (!$this->dataScopeShouldApply()) {
+            return;
+        }
+        $ids = $this->getDataScopeVisibleAdminIds();
+        if ($ids === null) {
+            return;
+        }
+        if ($ids === []) {
+            $query->whereRaw('0 = 1');
+
+            return;
+        }
+        $inList = implode(',', $ids);
+        $query->whereRaw("(a.doctor_id IN ({$inList}) OR u.assistant_id IN ({$inList}))");
+    }
     /**
      * @notes 设置搜索条件
      * @return array
@@ -114,6 +140,8 @@ class AppointmentLists extends BaseAdminDataLists implements ListsSearchInterfac
             }
         }
 
+        $this->applyDataScopeForAppointment($query, $progressBoard);
+
         // 诊单软删除后不再展示对应挂号（leftJoin 时无诊单或诊单未删）
         $query->whereRaw('(u.id IS NULL OR u.delete_time IS NULL)');
         
@@ -269,6 +297,8 @@ class AppointmentLists extends BaseAdminDataLists implements ListsSearchInterfac
             }
         }
 
+        $this->applyDataScopeForAppointment($query, $progressBoard);
+
         $query->whereRaw('(u.id IS NULL OR u.delete_time IS NULL)');
     }