新增功能

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']]) : '未设置',