新增

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

@@ -112,7 +112,8 @@ class DiagnosisLists extends BaseAdminDataLists implements ListsSearchInterface
             $query->whereExists("SELECT 1 FROM {$adTbl} ad WHERE ad.admin_id = {$diagTbl}.assistant_id AND ad.dept_id = {$deptId}");
         }
 
-        // 按挂号日期+时间升序。若传了 appointment_date（当天/明天等筛选），只按「该日」的挂号排序与展示，避免仍按历史最早一天把昨天号顶到最前
+        // 按挂号状态优先级排序：已过号(4) > 已预约(1) > 已完成(3)，然后按挂号日期+时间升序
+        // 若传了 appointment_date（当天/明天等筛选），只按「该日」的挂号排序与展示
         $diagTbl = (new Diagnosis())->getTable();
         $aptTbl = (new Appointment())->getTable();
         $minAptDateCond = '';
@@ -120,13 +121,18 @@ class DiagnosisLists extends BaseAdminDataLists implements ListsSearchInterface
             $sortAptDate = addslashes((string) $this->params['appointment_date']);
             $minAptDateCond = " AND apt.appointment_date = '{$sortAptDate}'";
         }
+        
+        // 获取最早的挂号状态（用于排序优先级）
+        $minAptStatusExpr = '(SELECT apt.status FROM ' . $aptTbl . ' apt WHERE apt.patient_id = ' . $diagTbl . '.id AND apt.status IN (1,3,4)' . $minAptDateCond . ' ORDER BY CASE apt.status WHEN 4 THEN 1 WHEN 1 THEN 2 WHEN 3 THEN 3 ELSE 4 END, apt.appointment_date ASC, apt.appointment_time ASC LIMIT 1)';
+        
+        // 获取最早的挂号时间（用于同状态内排序）
         $minAptExpr = '(SELECT MIN(CONCAT(apt.appointment_date, \' \', IFNULL(NULLIF(TRIM(apt.appointment_time), \'\'), \'00:00:00\'))) FROM ' . $aptTbl . ' apt WHERE apt.patient_id = ' . $diagTbl . '.id AND apt.status IN (1,3,4)' . $minAptDateCond . ')';
 
         $lists = $query
             ->with(['DiagnosisViewRecord'])
             ->field(['id', 'patient_id', 'patient_name', 'id_card', 'phone', 'gender', 'age', 'diagnosis_date', 'diagnosis_type', 'syndrome_type', 'assistant_id', 'status', 'create_time', 'update_time'])
             ->append(['gender_desc', 'status_desc', 'diagnosis_date_text'])
-            ->orderRaw('IFNULL(' . $minAptExpr . ", '9999-12-31 23:59:59') ASC, {$diagTbl}.id DESC")
+            ->orderRaw('CASE IFNULL(' . $minAptStatusExpr . ', 999) WHEN 4 THEN 1 WHEN 1 THEN 2 WHEN 3 THEN 3 ELSE 4 END ASC, IFNULL(' . $minAptExpr . ", '9999-12-31 23:59:59') ASC, {$diagTbl}.id DESC")
             ->limit($this->limitOffset, $this->limitLength)
             ->select()
             ->toArray();

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

@@ -73,11 +73,29 @@ class PrescriptionLists extends BaseAdminDataLists implements ListsSearchInterfa
     private function applyVisibilityScope($query): void
     {
         $query->where(function ($query) {
+            // 超级管理员可查看全部
             if (!empty($this->adminInfo['root']) && (int) $this->adminInfo['root'] === 1) {
                 return;
             }
-            $adminId = $this->adminId;
+
+            // 检查是否属于可查看全部处方的角色
+            $manageAllRoles = config('project.prescription_library_manage_all_roles', [0, 3]);
             $roleIds = array_values(array_unique(array_map('intval', $this->adminInfo['role_id'] ?? [])));
+            $canSeeAll = false;
+            foreach ($roleIds as $rid) {
+                if (in_array($rid, $manageAllRoles, true)) {
+                    $canSeeAll = true;
+                    break;
+                }
+            }
+            
+            // 如果属于可查看全部的角色，不添加任何限制
+            if ($canSeeAll) {
+                return;
+            }
+
+            // 其他用户只能查看：共享的、自己创建的、自己是医助的、或指定给自己角色的
+            $adminId = $this->adminId;
             $query->where(function ($q) use ($adminId, $roleIds) {
                 $q->whereOr('is_shared', '=', 1);
                 $q->whereOr('creator_id', '=', $adminId);
@@ -143,6 +161,14 @@ class PrescriptionLists extends BaseAdminDataLists implements ListsSearchInterfa
             $hasBizOrderRx = array_fill_keys($orderRxIds, true);
         }
 
+        // 获取医助姓名
+        $assistantIds = array_unique(array_filter(array_map('intval', array_column($lists, 'assistant_id'))));
+        $assistantNames = [];
+        if (!empty($assistantIds)) {
+            $assistantNames = \app\common\model\auth\Admin::whereIn('id', $assistantIds)
+                ->column('name', 'id');
+        }
+
         // 处理字段格式
         foreach ($lists as &$item) {
             // 设置默认值
@@ -159,6 +185,10 @@ class PrescriptionLists extends BaseAdminDataLists implements ListsSearchInterfa
             $item['business_prescription_audit_remark'] = (string) ($bizRejectRemark[$rid] ?? '');
             $item['has_prescription_order'] = !empty($hasBizOrderRx[$rid]) ? 1 : 0;
 
+            // 添加医助姓名
+            $assistantId = (int) ($item['assistant_id'] ?? 0);
+            $item['assistant_name'] = $assistantId > 0 ? ($assistantNames[$assistantId] ?? '') : '';
+
             // 将 dietary_taboo 从逗号分隔的字符串转换为数组（前端需要数组格式）
             if (!empty($item['dietary_taboo']) && is_string($item['dietary_taboo'])) {
                 $item['dietary_taboo'] = array_filter(explode(',', $item['dietary_taboo']));