更新

server/app/adminapi/lists/tcm/DiagnosisLists.php

@@ -25,6 +25,7 @@ use app\common\model\auth\Admin;
 use app\common\model\auth\AdminDept;
 use app\common\model\auth\AdminRole;
 use app\common\lists\ListsSearchInterface;
+use app\common\lists\Traits\HasDataScopeFilter;
 
 /**
  * 中医辨房病因诊单列表
@@ -33,6 +34,7 @@ use app\common\lists\ListsSearchInterface;
  */
 class DiagnosisLists extends BaseAdminDataLists implements ListsSearchInterface
 {
+    use HasDataScopeFilter;
     /**
      * @notes 设置搜索条件
      * @return array
@@ -70,6 +72,10 @@ class DiagnosisLists extends BaseAdminDataLists implements ListsSearchInterface
             $query->where('assistant_id', $this->adminId);
         }
 
+        if (!$pendingAssign) {
+            $this->applyDataScopeByOwner($query, 'assistant_id');
+        }
+
         // 关键字搜索：支持患者姓名或手机号（模糊匹配）
         if (isset($this->params['keyword']) && trim((string) $this->params['keyword']) !== '') {
             $keyword = trim((string) $this->params['keyword']);
@@ -459,6 +465,10 @@ class DiagnosisLists extends BaseAdminDataLists implements ListsSearchInterface
             $query->where('assistant_id', $this->adminId);
         }
 
+        if (!$pendingAssign) {
+            $this->applyDataScopeByOwner($query, 'assistant_id');
+        }
+
         // 关键字搜索：支持患者姓名或手机号（模糊匹配）
         if (isset($this->params['keyword']) && trim((string) $this->params['keyword']) !== '') {
             $keyword = trim((string) $this->params['keyword']);

server/app/adminapi/lists/tcm/PrescriptionLists.php

@@ -6,6 +6,7 @@ namespace app\adminapi\lists\tcm;
 
 use app\adminapi\lists\BaseAdminDataLists;
 use app\common\lists\ListsSearchInterface;
+use app\common\lists\Traits\HasDataScopeFilter;
 use app\adminapi\logic\tcm\PrescriptionLogic;
 use app\common\model\tcm\Prescription;
 use app\common\model\tcm\PrescriptionOrder;
@@ -15,6 +16,7 @@ use app\common\model\tcm\PrescriptionOrder;
  */
 class PrescriptionLists extends BaseAdminDataLists implements ListsSearchInterface
 {
+    use HasDataScopeFilter;
     /**
      * @notes 搜索条件
      */
@@ -138,6 +140,7 @@ class PrescriptionLists extends BaseAdminDataLists implements ListsSearchInterfa
         $this->applySourceFilter($query);
         $this->applyVisibilityScope($query);
         $this->applyCreatorIdsFilter($query);
+        $this->applyDataScopeByOwnerColumns($query, ['creator_id', 'assistant_id']);
 
         $lists = $query
             ->whereNull('delete_time')
@@ -231,6 +234,7 @@ class PrescriptionLists extends BaseAdminDataLists implements ListsSearchInterfa
         $this->applySourceFilter($query);
         $this->applyVisibilityScope($query);
         $this->applyCreatorIdsFilter($query);
+        $this->applyDataScopeByOwnerColumns($query, ['creator_id', 'assistant_id']);
 
         return $query->whereNull('delete_time')->count();
     }

server/app/adminapi/lists/tcm/PrescriptionOrderLists.php

@@ -9,6 +9,7 @@ use app\adminapi\logic\dept\DeptLogic;
 use app\adminapi\logic\tcm\PrescriptionOrderLogic;
 use app\common\lists\ListsExtendInterface;
 use app\common\lists\ListsSearchInterface;
+use app\common\lists\Traits\HasDataScopeFilter;
 use app\common\model\Order;
 use app\common\model\tcm\Diagnosis;
 use app\common\model\auth\AdminDept;
@@ -21,6 +22,8 @@ use think\db\Query;
 
 class PrescriptionOrderLists extends BaseAdminDataLists implements ListsSearchInterface, ListsExtendInterface
 {
+    use HasDataScopeFilter;
+
     public function setSearch(): array
     {
         return [
@@ -76,6 +79,36 @@ class PrescriptionOrderLists extends BaseAdminDataLists implements ListsSearchIn
                 }
             });
         }
+        $this->applyDataScopeForPrescriptionOrder($query);
+    }
+
+    /**
+     * 数据隔离：创建者 ∈ 可见 admin，或 关联诊单医助 ∈ 可见 admin
+     */
+    private function applyDataScopeForPrescriptionOrder($query): void
+    {
+        if (!$this->dataScopeShouldApply()) {
+            return;
+        }
+        $ids = $this->getDataScopeVisibleAdminIds();
+        if ($ids === null) {
+            return;
+        }
+        if ($ids === []) {
+            $query->whereRaw('0 = 1');
+
+            return;
+        }
+        $poTbl = (new PrescriptionOrder())->getTable();
+        $diagTbl = (new Diagnosis())->getTable();
+        $inList = implode(',', $ids);
+        $query->where(function ($q) use ($poTbl, $diagTbl, $inList) {
+            $q->whereIn('creator_id', explode(',', $inList));
+            $q->whereOrRaw(
+                "EXISTS (SELECT 1 FROM `{$diagTbl}` dg WHERE dg.`id` = `{$poTbl}`.`diagnosis_id` "
+                . "AND dg.`delete_time` IS NULL AND dg.`assistant_id` IN ({$inList}))"
+            );
+        });
     }
 
     /**
@@ -100,12 +133,14 @@ class PrescriptionOrderLists extends BaseAdminDataLists implements ListsSearchIn
         $this->applyDoctorAssistantFilters($query);
         $this->applyPatientKeywordFilter($query);
         if (PrescriptionOrderLogic::canViewOrderListStatsAllScope($this->adminInfo)) {
+            $this->applyDataScopeForPrescriptionOrder($query);
             return $query;
         }
         $assistantRid = (int) Config::get('project.prescription_order_stats_assistant_role_id', 2);
         $myRoles      = array_map('intval', $this->adminInfo['role_id'] ?? []);
         if ($assistantRid > 0 && in_array($assistantRid, $myRoles, true)) {
             $this->applyAssistantDiagnosisOnlyFilter($query);
+            $this->applyDataScopeForPrescriptionOrder($query);
 
             return $query;
         }
@@ -118,6 +153,7 @@ class PrescriptionOrderLists extends BaseAdminDataLists implements ListsSearchIn
                 }
             });
         }
+        $this->applyDataScopeForPrescriptionOrder($query);
 
         return $query;
     }