新增功能

2026-04-01 09:46:25 +08:00
parent 099bc1dd22
commit a780356908
332 changed files with 7845 additions and 866 deletions
@@ -59,12 +59,18 @@ class AppointmentLists extends BaseAdminDataLists implements ListsSearchInterfac
            $this->searchWhere[] = ['a.appointment_date', '<=', $this->params['end_date']];
        }

+        // 诊单维度患者（挂号表 patient_id 存诊单 id）
+        if (!empty($this->params['patient_id'])) {
+            $this->searchWhere[] = ['a.patient_id', '=', (int) $this->params['patient_id']];
+        }
+
        // 构建查询
        $query = Appointment::alias('a')
            ->with('diagnosis')
            ->leftJoin('tcm_diagnosis u', 'a.patient_id = u.id')
            ->leftJoin('admin ad', 'a.doctor_id = ad.id')
-            ->field('a.*, u.patient_name as patient_name, u.phone as patient_phone, u.gender as gender, u.age as age, u.weight as weight, u.height as height, ad.name as doctor_name, u.id as diagnosis_id')
+            ->leftJoin('admin asst', 'a.assistant_id = asst.id')
+            ->field('a.*, u.patient_name as patient_name, u.phone as patient_phone, u.gender as gender, u.age as age, u.weight as weight, u.height as height, ad.name as doctor_name, asst.name as assistant_name, u.id as diagnosis_id')
            ->where($this->searchWhere);

        // 是否确认诊单：1=已确认 0=未确认
@@ -88,6 +94,9 @@ class AppointmentLists extends BaseAdminDataLists implements ListsSearchInterfac
        if (in_array(2, $roleIds)) {
            $query->where('u.assistant_id', $this->adminId);
        }
+
+        // 诊单软删除后不再展示对应挂号（leftJoin 时无诊单或诊单未删）
+        $query->whereRaw('(u.id IS NULL OR u.delete_time IS NULL)');
        
        $lists = $query
            ->order('a.status', 'asc')
@@ -116,6 +125,23 @@ class AppointmentLists extends BaseAdminDataLists implements ListsSearchInterfac
                ->column('diagnosis_id');
            $prescribedDiagnosisIds = array_flip($prescribedDiagnosisIds ?: []);
        }
+        // 当前页预约关联的处方（按 appointment_id，取最新一条）：用于「开方/查看」与审核状态
+        $appointmentIds = array_filter(array_map('intval', array_column($lists, 'id')));
+        $rxByAppointmentId = [];
+        if (!empty($appointmentIds)) {
+            $rxRows = Prescription::whereIn('appointment_id', $appointmentIds)
+                ->whereNull('delete_time')
+                ->order('id', 'desc')
+                ->field(['id', 'appointment_id', 'audit_status', 'void_status'])
+                ->select()
+                ->toArray();
+            foreach ($rxRows as $rx) {
+                $aid = (int) ($rx['appointment_id'] ?? 0);
+                if ($aid > 0 && !isset($rxByAppointmentId[$aid])) {
+                    $rxByAppointmentId[$aid] = $rx;
+                }
+            }
+        }
        foreach ($lists as &$item) {
            $statusMap = [
                1 => '已预约',
@@ -135,6 +161,11 @@ class AppointmentLists extends BaseAdminDataLists implements ListsSearchInterfac
            $item['diagnosis_confirmed'] = isset($confirmedMap[$item['diagnosis_id'] ?? 0]) ? 1 : 0;
            $item['has_prescription'] = isset($prescribedDiagnosisIds[$item['diagnosis_id'] ?? 0]) ? 1 : 0;

+            $apptId = (int) ($item['id'] ?? 0);
+            $apptRx = $rxByAppointmentId[$apptId] ?? null;
+            $item['prescription_audit_status'] = $apptRx !== null ? (int) ($apptRx['audit_status'] ?? -1) : -1;
+            $item['prescription_void_status'] = $apptRx !== null ? (int) ($apptRx['void_status'] ?? 0) : 0;
+
            // 格式化时间戳为日期时间
            if (isset($item['create_time']) && is_numeric($item['create_time'])) {
                $item['create_time'] = date('Y-m-d H:i:s', $item['create_time']);
@@ -173,6 +204,10 @@ class AppointmentLists extends BaseAdminDataLists implements ListsSearchInterfac
            $query->where('a.appointment_date', '<=', $this->params['end_date']);
        }

+        if (!empty($this->params['patient_id'])) {
+            $query->where('a.patient_id', '=', (int) $this->params['patient_id']);
+        }
+
        if (isset($this->params['diagnosis_confirmed']) && $this->params['diagnosis_confirmed'] !== '') {
            $confirmed = (int)$this->params['diagnosis_confirmed'];
            $tbl = (new DiagnosisViewRecord())->getTable();
@@ -190,6 +225,8 @@ class AppointmentLists extends BaseAdminDataLists implements ListsSearchInterfac
        if (in_array(2, $roleIds)) {
            $query->where('u.assistant_id', $this->adminId);
        }
+
+        $query->whereRaw('(u.id IS NULL OR u.delete_time IS NULL)');
    }

    /**
@@ -69,6 +69,39 @@ class StatisticsLists extends BaseAdminDataLists
            $statsMap[$stat['doctor_id']] = $stat;
        }

+        // 诊单数：统计期内该医生挂号对应的 distinct 诊单（patient_id 存的是诊单 id）
+        $diagnosisCountQuery = \think\facade\Db::name('doctor_appointment')
+            ->field('doctor_id, COUNT(DISTINCT patient_id) as diagnosis_count')
+            ->whereIn('doctor_id', $doctorAdminIds)
+            ->where('appointment_date', '>=', $startDate)
+            ->where('appointment_date', '<=', $endDate);
+        if ($doctorId) {
+            $diagnosisCountQuery->where('doctor_id', $doctorId);
+        }
+        $diagnosisCountRows = $diagnosisCountQuery->group('doctor_id')->select()->toArray();
+        $diagnosisCountMap = [];
+        foreach ($diagnosisCountRows as $row) {
+            $diagnosisCountMap[(int) $row['doctor_id']] = (int) $row['diagnosis_count'];
+        }
+
+        // 成交单：上述诊单中存在有效处方（未删除、未作废）的数量
+        $dealCountQuery = \think\facade\Db::name('doctor_appointment')->alias('apt')
+            ->join('tcm_prescription rx', 'rx.diagnosis_id = apt.patient_id')
+            ->field('apt.doctor_id, COUNT(DISTINCT apt.patient_id) as deal_count')
+            ->whereIn('apt.doctor_id', $doctorAdminIds)
+            ->where('apt.appointment_date', '>=', $startDate)
+            ->where('apt.appointment_date', '<=', $endDate)
+            ->whereNull('rx.delete_time')
+            ->whereRaw('IFNULL(rx.void_status, 0) <> 1');
+        if ($doctorId) {
+            $dealCountQuery->where('apt.doctor_id', $doctorId);
+        }
+        $dealCountRows = $dealCountQuery->group('apt.doctor_id')->select()->toArray();
+        $dealCountMap = [];
+        foreach ($dealCountRows as $row) {
+            $dealCountMap[(int) $row['doctor_id']] = (int) $row['deal_count'];
+        }
+
        // 获取医生信息
        $doctorQuery = Admin::field('id,name')->whereIn('id', $doctorAdminIds);
        if ($doctorId) {
@@ -104,30 +137,99 @@ class StatisticsLists extends BaseAdminDataLists
                $deptStatsMap[$stat['doctor_id']][] = $stat['dept_name'] . '(' . $stat['dept_count'] . ')';
            }

-            // 获取渠道字典数据
+            // 获取渠道字典（dict_data.value => name），与挂号创建时 channel_source 存字典 value 一致
            $channelDict = \think\facade\Db::name('dict_data')
                ->where('type_value', 'channels')
                ->column('name', 'value');

-            // 获取渠道统计信息（channels字段，按渠道分组统计数量）
-            $channelStats = \think\facade\Db::name('doctor_appointment')
-                ->field('doctor_id, channels, COUNT(*) as channel_count')
-                ->whereIn('doctor_id', $doctorIdsWithAppointments)
-                ->where('appointment_date', '>=', $startDate)
-                ->where('appointment_date', '<=', $endDate)
-                ->whereNotNull('channels')
-                ->where('channels', '<>', '')
-                ->group('doctor_id, channels')
-                ->select()
-                ->toArray();
-            
-            // 组装渠道统计数据：医生ID => "渠道名称1(数量1) 渠道名称2(数量2)"
-            foreach ($channelStats as $stat) {
-                if (!isset($channelStatsMap[$stat['doctor_id']])) {
-                    $channelStatsMap[$stat['doctor_id']] = [];
+            // 渠道：业务保存的是 channel_source（字典 value 字符串，见 AppointmentLogic::create）；旧库可能仅有 channels(tinyint)
+            $channelBuckets = [];
+
+            try {
+                $channelStats = \think\facade\Db::name('doctor_appointment')
+                    ->field('doctor_id, channel_source, COUNT(*) as channel_count')
+                    ->whereIn('doctor_id', $doctorIdsWithAppointments)
+                    ->where('appointment_date', '>=', $startDate)
+                    ->where('appointment_date', '<=', $endDate)
+                    ->where('channel_source', '<>', '')
+                    ->group('doctor_id, channel_source')
+                    ->select()
+                    ->toArray();
+                foreach ($channelStats as $stat) {
+                    $did = (int) $stat['doctor_id'];
+                    $src = trim((string) ($stat['channel_source'] ?? ''));
+                    $cnt = (int) ($stat['channel_count'] ?? 0);
+                    if ($src === '' || $cnt < 1) {
+                        continue;
+                    }
+                    if (!isset($channelBuckets[$did])) {
+                        $channelBuckets[$did] = [];
+                    }
+                    if (!isset($channelBuckets[$did][$src])) {
+                        $channelBuckets[$did][$src] = 0;
+                    }
+                    $channelBuckets[$did][$src] += $cnt;
                }
-                $channelName = $channelDict[$stat['channels']] ?? $stat['channels'];
-                $channelStatsMap[$stat['doctor_id']][] = $channelName . '(' . $stat['channel_count'] . ')';
+            } catch (\Throwable) {
+                // 无 channel_source 字段等
+            }
+
+            $mergeLegacyChannels = static function (array &$buckets, array $rows): void {
+                foreach ($rows as $stat) {
+                    $did = (int) $stat['doctor_id'];
+                    $key = (string) (int) ($stat['channels'] ?? 0);
+                    $cnt = (int) ($stat['channel_count'] ?? 0);
+                    if ($key === '0' || $cnt < 1) {
+                        continue;
+                    }
+                    if (!isset($buckets[$did])) {
+                        $buckets[$did] = [];
+                    }
+                    if (!isset($buckets[$did][$key])) {
+                        $buckets[$did][$key] = 0;
+                    }
+                    $buckets[$did][$key] += $cnt;
+                }
+            };
+
+            try {
+                $legacyStats = \think\facade\Db::name('doctor_appointment')
+                    ->field('doctor_id, channels, COUNT(*) as channel_count')
+                    ->whereIn('doctor_id', $doctorIdsWithAppointments)
+                    ->where('appointment_date', '>=', $startDate)
+                    ->where('appointment_date', '<=', $endDate)
+                    ->where('channels', '>', 0)
+                    ->where(function ($q) {
+                        $q->whereNull('channel_source')->whereOr('channel_source', '=', '');
+                    })
+                    ->group('doctor_id, channels')
+                    ->select()
+                    ->toArray();
+                $mergeLegacyChannels($channelBuckets, $legacyStats);
+            } catch (\Throwable) {
+                try {
+                    $legacyStats = \think\facade\Db::name('doctor_appointment')
+                        ->field('doctor_id, channels, COUNT(*) as channel_count')
+                        ->whereIn('doctor_id', $doctorIdsWithAppointments)
+                        ->where('appointment_date', '>=', $startDate)
+                        ->where('appointment_date', '<=', $endDate)
+                        ->where('channels', '>', 0)
+                        ->group('doctor_id, channels')
+                        ->select()
+                        ->toArray();
+                    $mergeLegacyChannels($channelBuckets, $legacyStats);
+                } catch (\Throwable) {
+                    // 无 channels 字段
+                }
+            }
+
+            foreach ($channelBuckets as $did => $byKey) {
+                $parts = [];
+                foreach ($byKey as $key => $cnt) {
+                    $label = $channelDict[$key] ?? $channelDict[(string) $key] ?? $key;
+                    $parts[] = $label . '(' . $cnt . ')';
+                }
+                $channelStatsMap[$did] = $parts;
            }
        }

@@ -142,6 +244,13 @@ class StatisticsLists extends BaseAdminDataLists
                'cancelled_count' => 0
            ];

+            $did = (int) $doctor['id'];
+            $diagnosisCount = $diagnosisCountMap[$did] ?? 0;
+            $dealCount = $dealCountMap[$did] ?? 0;
+            $dealRate = $diagnosisCount > 0
+                ? round(($dealCount / $diagnosisCount) * 100, 2)
+                : 0;
+
            // 计算完成率
            $completionRate = $stat['total_count'] > 0 
                ? round(($stat['completed_count'] / $stat['total_count']) * 100, 2) 
@@ -155,6 +264,9 @@ class StatisticsLists extends BaseAdminDataLists
                'completed_count' => (int)$stat['completed_count'],
                'missed_count' => (int)$stat['missed_count'],
                'cancelled_count' => (int)$stat['cancelled_count'],
+                'diagnosis_count' => $diagnosisCount,
+                'deal_count' => $dealCount,
+                'deal_rate' => $dealRate,
                'completion_rate' => $completionRate,
                'dept_stats' => isset($deptStatsMap[$doctor['id']]) ? implode(' ', $deptStatsMap[$doctor['id']]) : '未分配',
                'channel_stats' => isset($channelStatsMap[$doctor['id']]) ? implode(' ', $channelStatsMap[$doctor['id']]) : '未设置',
@@ -81,6 +81,7 @@ class OrderLists extends BaseAdminDataLists implements ListsSearchInterface
        if (!empty($this->params['patient_keyword'])) {
            $where[] = ['patient_id', 'in', function ($query) {
                $query->table('zyt_tcm_diagnosis')
+                    ->whereNull('delete_time')
                    ->where('patient_name|patient_phone', 'like', '%' . $this->params['patient_keyword'] . '%')
                    ->field('id');
            }];
@@ -126,6 +127,7 @@ class OrderLists extends BaseAdminDataLists implements ListsSearchInterface
        if (!empty($this->params['patient_keyword'])) {
            $where[] = ['patient_id', 'in', function ($query) {
                $query->table('zyt_tcm_diagnosis')
+                    ->whereNull('delete_time')
                    ->where('patient_name|patient_phone', 'like', '%' . $this->params['patient_keyword'] . '%')
                    ->field('id');
            }];
@@ -77,47 +77,63 @@ class DiagnosisLists extends BaseAdminDataLists implements ListsSearchInterface
            }
        }

-        // 挂号日期筛选：当天/明天/后天
+        // 挂号日期筛选：当天/明天/后天（1=已预约 3=已完成 4=已过号，需展示以便取消等操作）
        if (!empty($this->params['appointment_date'])) {
            $aptDate = addslashes($this->params['appointment_date']);
            $aptTbl = (new Appointment())->getTable();
            $diagTbl = (new Diagnosis())->getTable();
-            $query->whereExists("SELECT 1 FROM {$aptTbl} apt WHERE apt.patient_id = {$diagTbl}.patient_id AND apt.appointment_date = '{$aptDate}' AND apt.status IN (1,3)");
+            $query->whereExists("SELECT 1 FROM {$aptTbl} apt WHERE apt.patient_id = {$diagTbl}.id AND apt.appointment_date = '{$aptDate}' AND apt.status IN (1,3,4)");
        }

-        // 挂号状态：1=已挂号 0=未挂号
+        // 挂号状态：1=已挂号（含已预约/已完成/已过号）0=未挂号
        if (isset($this->params['has_appointment']) && $this->params['has_appointment'] !== '') {
            $aptTbl = (new Appointment())->getTable();
            $diagTbl = (new Diagnosis())->getTable();
            if ((int)$this->params['has_appointment'] === 1) {
-                $query->whereExists("SELECT 1 FROM {$aptTbl} apt WHERE apt.patient_id = {$diagTbl}.patient_id AND apt.status IN (1,3)");
+                $query->whereExists("SELECT 1 FROM {$aptTbl} apt WHERE apt.patient_id = {$diagTbl}.id AND apt.status IN (1,3,4)");
            } else {
-                $query->whereNotExists("SELECT 1 FROM {$aptTbl} apt WHERE apt.patient_id = {$diagTbl}.patient_id AND apt.status IN (1,3)");
+                $query->whereNotExists("SELECT 1 FROM {$aptTbl} apt WHERE apt.patient_id = {$diagTbl}.id AND apt.status IN (1,3,4)");
            }
        }
-        
+
+        // 按挂号日期+时间升序。若传了 appointment_date（当天/明天等筛选），只按「该日」的挂号排序与展示，避免仍按历史最早一天把昨天号顶到最前
+        $diagTbl = (new Diagnosis())->getTable();
+        $aptTbl = (new Appointment())->getTable();
+        $minAptDateCond = '';
+        if (!empty($this->params['appointment_date'])) {
+            $sortAptDate = addslashes((string) $this->params['appointment_date']);
+            $minAptDateCond = " AND apt.appointment_date = '{$sortAptDate}'";
+        }
+        $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'])
-            ->order(['id' => 'desc'])
+            ->orderRaw('IFNULL(' . $minAptExpr . ", '9999-12-31 23:59:59') ASC, {$diagTbl}.id DESC")
            ->limit($this->limitOffset, $this->limitLength)
            ->select()
            ->toArray();

-        // 关联挂号信息：获取患者最新有效挂号（已预约或已完成）
-        $patientIds = array_filter(array_unique(array_column($lists, 'patient_id')));
-        if (!empty($patientIds)) {
+        // 关联挂号：doctor_appointment.patient_id 存诊单主键 id（与 Appointment 列表 join 一致）
+        $diagnosisIds = array_filter(array_unique(array_column($lists, 'id')));
+        if (!empty($diagnosisIds)) {
            $appointmentMap = [];
-            $subQuery = Appointment::where('patient_id', 'in', $patientIds)
-                ->where('status', 'in', [1, 3]) // 1=已预约 3=已完成
-                ->field('id, patient_id, doctor_id, appointment_date, appointment_time, create_time')
-                ->order('id', 'desc');
+            $subQuery = Appointment::where('patient_id', 'in', $diagnosisIds)
+                ->where('status', 'in', [1, 3, 4]); // 1=已预约 3=已完成 4=已过号
+            if (!empty($this->params['appointment_date'])) {
+                $subQuery->where('appointment_date', (string) $this->params['appointment_date']);
+            }
+            $subQuery
+                ->field('id, patient_id, doctor_id, appointment_date, appointment_time, status, create_time')
+                ->order('appointment_date', 'asc')
+                ->order('appointment_time', 'asc')
+                ->order('id', 'asc');
            $appointments = $subQuery->select()->toArray();
            foreach ($appointments as $apt) {
-                $pid = $apt['patient_id'];
-                if (!isset($appointmentMap[$pid])) {
-                    $appointmentMap[$pid] = $apt;
+                $did = $apt['patient_id'];
+                if (!isset($appointmentMap[$did])) {
+                    $appointmentMap[$did] = $apt;
                }
            }
            // 获取医生名称
@@ -129,10 +145,11 @@ class DiagnosisLists extends BaseAdminDataLists implements ListsSearchInterface
            }
            // 合并到诊单列表
            foreach ($lists as &$item) {
-                $apt = $appointmentMap[$item['patient_id']] ?? null;
+                $apt = $appointmentMap[$item['id']] ?? null;
                if ($apt) {
                    $item['has_appointment'] = 1;
                    $item['appointment_id'] = $apt['id'];
+                    $item['appointment_status'] = (int) ($apt['status'] ?? 0);
                    $item['appointment_doctor_id'] = $apt['doctor_id'];
                    $item['appointment_doctor_name'] = $doctorNames[$apt['doctor_id']] ?? '-';
                    $timePart = $apt['appointment_time'] ?? '';
@@ -143,6 +160,7 @@ class DiagnosisLists extends BaseAdminDataLists implements ListsSearchInterface
                } else {
                    $item['has_appointment'] = 0;
                    $item['appointment_id'] = null;
+                    $item['appointment_status'] = 0;
                    $item['appointment_doctor_id'] = null;
                    $item['appointment_doctor_name'] = '';
                    $item['appointment_time_text'] = '';
@@ -152,6 +170,7 @@ class DiagnosisLists extends BaseAdminDataLists implements ListsSearchInterface
            foreach ($lists as &$item) {
                $item['has_appointment'] = 0;
                $item['appointment_id'] = null;
+                $item['appointment_status'] = 0;
                $item['appointment_doctor_id'] = null;
                $item['appointment_doctor_name'] = '';
                $item['appointment_time_text'] = '';
@@ -277,7 +296,7 @@ class DiagnosisLists extends BaseAdminDataLists implements ListsSearchInterface
            $aptDate = addslashes($this->params['appointment_date']);
            $aptTbl = (new Appointment())->getTable();
            $diagTbl = (new Diagnosis())->getTable();
-            $query->whereExists("SELECT 1 FROM {$aptTbl} apt WHERE apt.patient_id = {$diagTbl}.patient_id AND apt.appointment_date = '{$aptDate}' AND apt.status IN (1,3)");
+            $query->whereExists("SELECT 1 FROM {$aptTbl} apt WHERE apt.patient_id = {$diagTbl}.id AND apt.appointment_date = '{$aptDate}' AND apt.status IN (1,3,4)");
        }

        // 挂号状态
@@ -285,9 +304,9 @@ class DiagnosisLists extends BaseAdminDataLists implements ListsSearchInterface
            $aptTbl = (new Appointment())->getTable();
            $diagTbl = (new Diagnosis())->getTable();
            if ((int)$this->params['has_appointment'] === 1) {
-                $query->whereExists("SELECT 1 FROM {$aptTbl} apt WHERE apt.patient_id = {$diagTbl}.patient_id AND apt.status IN (1,3)");
+                $query->whereExists("SELECT 1 FROM {$aptTbl} apt WHERE apt.patient_id = {$diagTbl}.id AND apt.status IN (1,3,4)");
            } else {
-                $query->whereNotExists("SELECT 1 FROM {$aptTbl} apt WHERE apt.patient_id = {$diagTbl}.patient_id AND apt.status IN (1,3)");
+                $query->whereNotExists("SELECT 1 FROM {$aptTbl} apt WHERE apt.patient_id = {$diagTbl}.id AND apt.status IN (1,3,4)");
            }
        }
        
@@ -6,6 +6,7 @@ namespace app\adminapi\lists\tcm;

 use app\adminapi\lists\BaseAdminDataLists;
 use app\common\lists\ListsSearchInterface;
+use app\adminapi\logic\tcm\PrescriptionLogic;
 use app\common\model\tcm\Prescription;

 /**
@@ -19,24 +20,86 @@ class PrescriptionLists extends BaseAdminDataLists implements ListsSearchInterfa
    public function setSearch(): array
    {
        return [
-            '=' => ['is_shared'],
-            '%like%' => ['prescription_name', 'patient_name', 'sn']
+            '%like%' => ['patient_name', 'sn'],
+            'between_time' => 'create_time',
        ];
    }

+    /** 创建人（医师账号）多选，参数 creator_ids：数组或逗号分隔 ID */
+    private function applyCreatorIdsFilter($query): void
+    {
+        $raw = $this->params['creator_ids'] ?? null;
+        if ($raw === null || $raw === '') {
+            return;
+        }
+        $ids = \is_array($raw) ? $raw : explode(',', (string) $raw);
+        $ids = array_values(array_filter(array_map('intval', $ids), static function (int $id): bool {
+            return $id > 0;
+        }));
+        if ($ids === []) {
+            return;
+        }
+        $query->whereIn('creator_id', $ids);
+    }
+
+    /**
+     * audit_filter：passed=已通过，not_passed=未通过（待审+驳回），pending，rejected
+     */
+    private function applyAuditFilter($query): void
+    {
+        $af = (string) ($this->params['audit_filter'] ?? '');
+        if ($af === '' || $af === 'all') {
+            return;
+        }
+        switch ($af) {
+            case 'passed':
+                $query->where('audit_status', '=', 1);
+                break;
+            case 'not_passed':
+                $query->whereIn('audit_status', [0, 2]);
+                break;
+            case 'pending':
+                $query->where('audit_status', '=', 0);
+                break;
+            case 'rejected':
+                $query->where('audit_status', '=', 2);
+                break;
+            default:
+                break;
+        }
+    }
+
+    private function applyVisibilityScope($query): void
+    {
+        $query->where(function ($query) {
+            if (!empty($this->adminInfo['root']) && (int) $this->adminInfo['root'] === 1) {
+                return;
+            }
+            $adminId = $this->adminId;
+            $roleIds = array_values(array_unique(array_map('intval', $this->adminInfo['role_id'] ?? [])));
+            $query->where(function ($q) use ($adminId, $roleIds) {
+                $q->whereOr('is_shared', '=', 1);
+                $q->whereOr('creator_id', '=', $adminId);
+                foreach ($roleIds as $rid) {
+                    if ($rid > 0) {
+                        $q->whereOrRaw('FIND_IN_SET(?, `visible_role_ids`)', [(string) $rid]);
+                    }
+                }
+            });
+        });
+    }
+
    /**
     * @notes 获取列表
     */
    public function lists(): array
    {
-        $lists = Prescription::where($this->searchWhere)
-            ->where(function ($query) {
-                // 如果不是共享的，只能看到自己创建的
-                $query->whereOr([
-                    ['is_shared', '=', 1],
-                    ['creator_id', '=', $this->adminId]
-                ]);
-            })
+        $query = Prescription::where($this->searchWhere);
+        $this->applyAuditFilter($query);
+        $this->applyVisibilityScope($query);
+        $this->applyCreatorIdsFilter($query);
+
+        $lists = $query
            ->whereNull('delete_time')
            ->order('id', 'desc')
            ->limit($this->limitOffset, $this->limitLength)
@@ -51,7 +114,10 @@ class PrescriptionLists extends BaseAdminDataLists implements ListsSearchInterfa
            $item['usage_notes'] = $item['usage_notes'] ?? '';
            $item['usage_days'] = $item['usage_days'] ?? 7;
            $item['is_shared'] = $item['is_shared'] ?? 0;
-            
+            $item['audit_status'] = (int) ($item['audit_status'] ?? 1);
+            $item['void_status'] = (int) ($item['void_status'] ?? 0);
+            $item['visible_role_ids'] = PrescriptionLogic::visibleRoleIdsToArray((string) ($item['visible_role_ids'] ?? ''));
+
            // 将 dietary_taboo 从逗号分隔的字符串转换为数组（前端需要数组格式）
            if (!empty($item['dietary_taboo']) && is_string($item['dietary_taboo'])) {
                $item['dietary_taboo'] = array_filter(explode(',', $item['dietary_taboo']));
@@ -68,15 +134,11 @@ class PrescriptionLists extends BaseAdminDataLists implements ListsSearchInterfa
     */
    public function count(): int
    {
-        return Prescription::where($this->searchWhere)
-            ->where(function ($query) {
-                // 如果不是共享的，只能看到自己创建的
-                $query->whereOr([
-                    ['is_shared', '=', 1],
-                    ['creator_id', '=', $this->adminId]
-                ]);
-            })
-            ->whereNull('delete_time')
-            ->count();
+        $query = Prescription::where($this->searchWhere);
+        $this->applyAuditFilter($query);
+        $this->applyVisibilityScope($query);
+        $this->applyCreatorIdsFilter($query);
+
+        return $query->whereNull('delete_time')->count();
    }
 }