更新

2026-09-09 15:47:48 +08:00
parent bd5d5c5f08
commit cb10e75ead
98 changed files with 7031 additions and 804 deletions
@@ -108,6 +108,32 @@ class AppointmentLists extends BaseAdminDataLists implements ListsSearchInterfac
        );
    }

+    /**
+     * 挂号类型筛选：空筛选表示全部；未知筛选值返回空结果，不套用旧记录的视频默认值。
+     * 列表、总数与状态角标共用，历史空值按 normalizeStored 的规则归入视频。
+     */
+    private function applyAppointmentTypeFilter($query): void
+    {
+        $type = $this->params['appointment_type'] ?? '';
+        if ($type === '') {
+            return;
+        }
+        if (!AppointmentTypeEnum::isWritable($type)) {
+            $query->whereRaw('0 = 1');
+            return;
+        }
+
+        $query->where(function ($q) use ($type): void {
+            $q->whereRaw('BINARY a.appointment_type = :appointment_type_filter', ['appointment_type_filter' => $type]);
+            if ($type === AppointmentTypeEnum::VIDEO) {
+                // PHP trim 默认空白：空格、NUL、TAB、LF、VT、CR；只把完全为空白的旧值归入视频。
+                $blankTypeSql = "TRIM(REPLACE(REPLACE(REPLACE(REPLACE(REPLACE(a.appointment_type, CHAR(0), ''),"
+                    . " CHAR(9), ''), CHAR(10), ''), CHAR(11), ''), CHAR(13), '')) = ''";
+                $q->whereOrRaw('a.appointment_type IS NULL')->whereOrRaw($blankTypeSql);
+            }
+        });
+    }
+
    /**
     * 渠道筛选：与 AppointmentLogic 一致，兼容仅有 channel_source、仅有 channels、或两者皆有的表结构
     *
@@ -228,6 +254,8 @@ class AppointmentLists extends BaseAdminDataLists implements ListsSearchInterfac

        $this->applyChannelSourceFilter($query, $chFilter);

+        $this->applyAppointmentTypeFilter($query);
+
        // 是否确认诊单：1=已确认 0=未确认
        if (isset($this->params['diagnosis_confirmed']) && $this->params['diagnosis_confirmed'] !== '') {
            $confirmed = (int)$this->params['diagnosis_confirmed'];
@@ -422,6 +450,8 @@ class AppointmentLists extends BaseAdminDataLists implements ListsSearchInterfac

        $this->applyChannelSourceFilter($query, $chFilter);

+        $this->applyAppointmentTypeFilter($query);
+
        if ((int) ($this->params['exclude_cancelled'] ?? 0) === 1) {
            $sf = $this->params['status'] ?? '';
            if ($sf === '' || (int) $sf !== 2) {
@@ -6,6 +6,7 @@ namespace app\adminapi\lists\firstvisit;

 use app\adminapi\lists\BaseAdminDataLists;
 use app\adminapi\logic\firstvisit\MyPatientLogic;
+use app\common\enum\AppointmentTypeEnum;
 use app\common\lists\ListsExtendInterface;
 use app\common\lists\ListsSearchInterface;
 use app\common\model\DiagnosisViewRecord;
@@ -217,7 +218,7 @@ class MyPatientLists extends BaseAdminDataLists implements ListsSearchInterface,
        $appointments = Db::table($appointmentTable)
            ->whereIn('patient_id', $diagnosisIds)
            ->whereIn('status', self::EFFECTIVE_APPOINTMENT_STATUSES)
-            ->field(['id', 'patient_id', 'doctor_id', 'appointment_date', 'appointment_time', 'status'])
+            ->field(['id', 'patient_id', 'doctor_id', 'appointment_date', 'appointment_time', 'appointment_type', 'status'])
            ->order('appointment_date', 'asc')
            ->order('appointment_time', 'asc')
            ->order('id', 'asc')
@@ -281,21 +282,33 @@ class MyPatientLists extends BaseAdminDataLists implements ListsSearchInterface,
            $row['confirmation_text'] = $row['confirmed'] ? '已确认' : '待确认';
            $row['visit_count'] = $completedCount;
            $row['revisit_count'] = max(0, $completedCount - 1);
-            $row['appointment_id'] = $primary ? (int) $primary['id'] : 0;
-            $row['appointment_status'] = $primary ? (int) $primary['status'] : 0;
-            $row['appointment_status_text'] = $this->appointmentStatusText((int) ($primary['status'] ?? 0));
-            $row['appointment_doctor_id'] = $primary ? (int) $primary['doctor_id'] : 0;
-            $row['appointment_doctor_name'] = $primary
-                ? (string) ($adminNames[(int) $primary['doctor_id']] ?? '未知医生')
-                : '未预约';
-            $row['appointment_time_text'] = $primary ? $this->appointmentTimeText($primary) : '';
-            $row['has_appointment'] = $primary !== null ? 1 : 0;
+            $this->appendPrimaryAppointmentSummary($row, $primary, $adminNames);
        }
        unset($row);

        return $rows;
    }

+    /** 所有挂号展示字段取自同一条主挂号；无挂号时不能补成视频类型。 */
+    private function appendPrimaryAppointmentSummary(array &$row, ?array $primary, array $adminNames): void
+    {
+        $row['appointment_id'] = $primary ? (int) $primary['id'] : 0;
+        $row['appointment_status'] = $primary ? (int) $primary['status'] : 0;
+        $row['appointment_status_text'] = $this->appointmentStatusText((int) ($primary['status'] ?? 0));
+        $row['appointment_doctor_id'] = $primary ? (int) $primary['doctor_id'] : 0;
+        $row['appointment_doctor_name'] = $primary
+            ? (string) ($adminNames[(int) $primary['doctor_id']] ?? '未知医生')
+            : '未预约';
+        $row['appointment_time_text'] = $primary ? $this->appointmentTimeText($primary) : '';
+        $row['appointment_type'] = $primary !== null
+            ? AppointmentTypeEnum::normalizeStored($primary['appointment_type'] ?? null)
+            : null;
+        $row['appointment_type_desc'] = $primary !== null
+            ? AppointmentTypeEnum::description($row['appointment_type'])
+            : '';
+        $row['has_appointment'] = $primary !== null ? 1 : 0;
+    }
+
    /**
     * @param array<int, array<string, mixed>> $appointments
     * @return array<string, mixed>|null
@@ -6,6 +6,7 @@ namespace app\adminapi\lists\firstvisit;

 use app\adminapi\lists\BaseAdminDataLists;
 use app\adminapi\logic\firstvisit\MyPatientLogic;
+use app\common\enum\AppointmentTypeEnum;
 use app\common\lists\ListsExtendInterface;
 use app\common\lists\ListsSearchInterface;
 use app\common\model\DiagnosisViewRecord;
@@ -242,7 +243,8 @@ class MyPatientProgressLists extends BaseAdminDataLists implements ListsSearchIn
            $row['doctor_name'] = trim((string) ($row['doctor_name'] ?? '')) ?: '未知医生';
            $row['appointment_time_text'] = $this->appointmentTimeText($row);
            $row['status_text'] = $this->appointmentStatusText($status);
-            $row['appointment_type_text'] = $this->appointmentTypeText((string) ($row['appointment_type'] ?? ''));
+            $row['appointment_type'] = AppointmentTypeEnum::normalizeStored($row['appointment_type'] ?? null);
+            $row['appointment_type_text'] = $this->appointmentTypeText($row['appointment_type']);
            $row['registered'] = 1;
            $row['diagnosis_confirmed'] = $confirmed ? 1 : 0;
            $row['visit_completed'] = $status === 3 ? 1 : 0;
@@ -682,7 +684,7 @@ class MyPatientProgressLists extends BaseAdminDataLists implements ListsSearchIn

    private function appointmentTypeText(string $type): string
    {
-        return ['video' => '视频问诊', 'text' => '图文问诊', 'phone' => '电话问诊'][$type] ?? '面诊';
+        return AppointmentTypeEnum::description($type);
    }

    private function progressText(bool $confirmed, bool $completed, bool $prescribed, int $status): string