From 4dace3e94fac4546254b9e9ace5a1b4c811e1b8a Mon Sep 17 00:00:00 2001
From: cody <648753004@qq.com>
Date: Thu, 27 Nov 2025 18:06:17 +0800
Subject: [PATCH] update

---
 .../Controllers/Admin/OtherController.php     | 25 +++++++++++--------
 1 file changed, 14 insertions(+), 11 deletions(-)

diff --git a/app/Http/Controllers/Admin/OtherController.php b/app/Http/Controllers/Admin/OtherController.php
index 09f7fa4..f9773a5 100755
--- a/app/Http/Controllers/Admin/OtherController.php
+++ b/app/Http/Controllers/Admin/OtherController.php
@@ -317,18 +317,21 @@ class OtherController extends CommonController
                 $query->whereIn('type', $course_type_id);
             }
         })->get();
-        foreach ($historyCourses as $historyCourse) {
-            $courseTypesSum[] = [
-                'course_type' => $historyCourse->typeDetail->name,
-                // 培养人数
-                'course_type_signs_pass' => $historyCourses->sum('course_type_signs_pass'),
-                // 去重培养人数
-                'course_type_signs_pass_unique' => $historyCourses->sum('course_type_signs_pass_unique'),
-                'course_name' => $historyCourse->course_name,
-                'course_signs_pass' => $historyCourse->course_signs_pass,
-            ];
+        $historyCoursesType = CourseType::whereIn('id', $historyCourses->pluck('type'))->get();
+        foreach ($historyCoursesType as $historyCourseType) {
+            $historyCourses = $historyCourses->where('type', $historyCourseType->id);
+            foreach ($historyCourses as $historyCourse) {
+                $courseTypesSum[] = [
+                    'course_type' => $historyCourseType->name,
+                    // 培养人数
+                    'course_type_signs_pass' => $historyCourses->sum('course_type_signs_pass'),
+                    // 去重培养人数
+                    'course_type_signs_pass_unique' => $historyCourses->sum('course_type_signs_pass_unique'),
+                    'course_name' => $historyCourse->course_name,
+                    'course_signs_pass' => $historyCourse->course_signs_pass,
+                ];
+            }
         }
-
         // 区域明细统计
         $areas = CourseSign::area($start_date, $end_date, 1, $courses->pluck('id'), true);
         return $this->success(compact('list', 'courseTypesSum', 'areas'));