更新

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

@@ -21,7 +21,7 @@ class PrescriptionLibraryLists extends BaseAdminDataLists implements ListsSearch
     {
         return [
             '%like%' => ['prescription_name'],
-            '=' => ['is_public', 'creator_id']
+            '=' => ['is_public', 'creator_id', 'formula_type']
         ];
     }
 
@@ -34,6 +34,16 @@ class PrescriptionLibraryLists extends BaseAdminDataLists implements ListsSearch
             return $query;
         }
 
+        // 开方页导入专用参数（勿与搜索项 creator_id 混用，否则无法 OR 出他人公开模板）
+        $prescribingCreatorId = (int) ($this->params['prescribing_creator_id'] ?? 0);
+        if ($prescribingCreatorId > 0
+            && PrescriptionLibraryLogic::canListLibraryForCreator($this->adminId, $this->adminInfo, $prescribingCreatorId)) {
+            return $query->where(function ($q) use ($prescribingCreatorId) {
+                $q->where('creator_id', $prescribingCreatorId)
+                    ->whereOr('is_public', 1);
+            });
+        }
+
         return $query->where(function ($q) {
             $q->where('creator_id', $this->adminId)
                 ->whereOr('is_public', 1);
@@ -46,7 +56,7 @@ class PrescriptionLibraryLists extends BaseAdminDataLists implements ListsSearch
     public function lists(): array
     {
         $field = [
-            'id', 'prescription_name', 'herbs', 'is_public',
+            'id', 'prescription_name', 'formula_type', 'herbs', 'is_public',
             'creator_id', 'creator_name', 'create_time', 'update_time'
         ];