Merge branch 'master' of 101.132.227.52:tanyuan/wx.sstbc.com

app/Http/Controllers/Admin/OtherController.php

@@ -170,13 +170,22 @@ class OtherController extends CommonController
                 ->where('start_time', 'like', '%' . date('Y-m') . '%')
                 ->get();
 
-            // 苏州区域数据 - 使用 CourseSign::getAreaData 方法实现数据一致
+            // 苏州区域数据：与 courses-home 的 areas 口径保持一致
-            $areasData = CourseSign::getAreaData($start_date, $end_date, 1, null, true, 'statistics');
+            // - 使用 CourseSign::area
+            // - 使用全部课程体系对应课程 ID 作为过滤条件
+            // - 不额外限定 is_schoolmate（与 courses-home areas 一致）
+            $courseTypeIds = CourseType::pluck('id')->toArray();
+            $courses = Course::whereIn('type', $courseTypeIds)->get();
+            $areasData = CourseSign::area($start_date, $end_date, 1, $courses->pluck('id'), true);
             $suzhou = [];
             foreach ($areasData as $item) {
+                $total = $item['total'] ?? 0;
+                $totalUnique = $item['total_unique'] ?? 0;
                 $suzhou[] = [
                     'area' => $item['area'],
-                    'total' => $item['total_unique'] ?? $item['total']
+                    // 与 courses-home areas 字段语义一致
+                    'total' => $total,
+                    'total_unique' => $totalUnique,
                 ];
             }