更新

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

@@ -7,6 +7,7 @@ use app\common\model\DiagnosisViewRecord;
 use app\common\model\doctor\Appointment;
 use app\common\model\tcm\Prescription;
 use app\common\model\auth\AdminRole;
+use app\common\model\dict\DictData;
 use app\common\lists\ListsExtendInterface;
 use app\common\lists\ListsSearchInterface;
 use app\common\lists\Traits\HasDataScopeFilter;
@@ -122,7 +123,7 @@ class AppointmentLists extends BaseAdminDataLists implements ListsSearchInterfac
             ->leftJoin('tcm_diagnosis u', 'a.patient_id = u.id')
             ->leftJoin('admin ad', 'a.doctor_id = ad.id')
             ->leftJoin('admin asst', 'u.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, u.assistant_id as assistant_id, ad.name as doctor_name, asst.name as assistant_name, u.id as diagnosis_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, u.assistant_id as assistant_id, ad.name as doctor_name, asst.name as assistant_name, u.id as diagnosis_id, a.assistant_id as appointment_assistant_id');
         if ($this->searchWhere !== []) {
             $query->where($this->searchWhere);
         }
@@ -212,6 +213,9 @@ class AppointmentLists extends BaseAdminDataLists implements ListsSearchInterfac
                 }
             }
         }
+
+        $channelNameByValue = DictData::where('type_value', 'channels')->column('name', 'value');
+
         foreach ($lists as &$item) {
             $statusMap = [
                 1 => '已预约',
@@ -228,6 +232,24 @@ class AppointmentLists extends BaseAdminDataLists implements ListsSearchInterfac
             ];
             $item['appointment_type_desc'] = $typeMap[$item['appointment_type']] ?? '未知';
 
+            $periodRaw = (string) ($item['period'] ?? ($item['type'] ?? ''));
+            $periodMap = [
+                'morning' => '上午',
+                'afternoon' => '下午',
+                'all' => '全天',
+            ];
+            $item['period_desc'] = $periodMap[$periodRaw] ?? ($periodRaw !== '' ? $periodRaw : '—');
+
+            $srcKey = trim((string) ($item['channel_source'] ?? ''));
+            if ($srcKey === '' && isset($item['channels']) && $item['channels'] !== '' && $item['channels'] !== null) {
+                $srcKey = trim((string) $item['channels']);
+            }
+            if ($srcKey !== '') {
+                $item['channel_source_desc'] = (string) ($channelNameByValue[$srcKey] ?? $channelNameByValue[(string) (int) $srcKey] ?? $srcKey);
+            } else {
+                $item['channel_source_desc'] = '—';
+            }
+
             $item['diagnosis_confirmed'] = isset($confirmedMap[$item['diagnosis_id'] ?? 0]) ? 1 : 0;
             $item['has_prescription'] = isset($prescribedDiagnosisIds[$item['diagnosis_id'] ?? 0]) ? 1 : 0;