更新

server/app/adminapi/logic/firstvisit/FirstVisitConversionLogic.php

@@ -35,7 +35,7 @@ class FirstVisitConversionLogic
         $selectedAssistantId = max(0, (int) ($params['assistant_id'] ?? 0));
         $requestedMediaChannelCode = trim((string)($params['media_channel_code'] ?? ''));
         $selectedMediaChannel = $requestedMediaChannelCode !== ''
-            ? MediaChannelService::getChannelByCode($requestedMediaChannelCode)
+            ? MediaChannelService::getCurrentTagChannelByCode($requestedMediaChannelCode)
             : null;
         $selectedMediaChannelCode = $selectedMediaChannel !== null ? $requestedMediaChannelCode : '';
 
@@ -79,7 +79,9 @@ class FirstVisitConversionLogic
             'time_type' => 'custom',
             'start_date' => $startDate,
             'end_date' => $endDate,
-            'include_filters' => 1,
+            // 一诊筛选项在本层按自身权限和“当前企微标签”口径生成，不再让通用
+            // Conversion 额外加载一套包含历史渠道的筛选器。
+            'include_filters' => 0,
             'include_members' => 1,
             'exclude_cancelled_appointments' => 1,
             'order_metric_mode' => 'performance',
@@ -98,7 +100,8 @@ class FirstVisitConversionLogic
             $adminId,
             $adminInfo,
             $effectiveAdminIds,
-            $costAllocationAdminIds
+            $costAllocationAdminIds,
+            $selectedMediaChannel
         );
         $rows = is_array($conversion['lists'] ?? null) ? $conversion['lists'] : [];
         $rowAllowedDeptIds = self::visibleRowDeptIds($effectiveAdminIds);
@@ -149,10 +152,6 @@ class FirstVisitConversionLogic
         $selectedMediaChannelName = $selectedMediaChannelCode !== ''
             ? (string) ($selectedMediaChannel['channel_name'] ?? $selectedMediaChannelCode)
             : '';
-        $conversionFilters = is_array($conversion['extend']['filters'] ?? null)
-            ? $conversion['extend']['filters']
-            : [];
-
         return [
             'meta' => [
                 'time_type' => $timeType,
@@ -176,9 +175,7 @@ class FirstVisitConversionLogic
             'filters' => [
                 'departments' => DeptLogic::getAllDataScoped($adminId, $adminInfo),
                 'assistants' => self::assistantOptions($baseVisibleAdminIds, $selectedDeptIds, $selectedDeptId),
-                'media_channels' => is_array($conversionFilters['media_channels'] ?? null)
-                    ? $conversionFilters['media_channels']
-                    : [],
+                'media_channels' => MediaChannelService::getCurrentTagOptions(),
             ],
             'summary' => $summary,
             'rankings' => [