新增功能
This commit is contained in:
Your Name
@@ -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']]) : '未设置',
|
||||
|
||||
Reference in New Issue
Block a user