diff --git a/app/Http/Controllers/Admin/OtherController.php b/app/Http/Controllers/Admin/OtherController.php index 195f425..95a7cc7 100755 --- a/app/Http/Controllers/Admin/OtherController.php +++ b/app/Http/Controllers/Admin/OtherController.php @@ -263,18 +263,8 @@ class OtherController extends CommonController $config->courseTypes = $courseTypes; // 总期数(包含"其他") $config->course_periods_total = $courseTypes->sum('course_periods_total'); - // 总去重人数(包含"其他") - $coursesAll = Course::whereIn('type', $allCourseTypes->pluck('id')) - ->where('is_chart', 1) - ->where(function ($query) use ($configStartDate, $configEndDate) { - $query->whereBetween('start_date', [$configStartDate, $configEndDate]) - ->orWhereBetween('end_date', [$configStartDate, $configEndDate]); - })->get(); - - // 获取"其他"课程类型的课程ID列表 - $otherCourseIds = CourseType::getOtherCourseIds($configStartDate, $configEndDate); - - $config->course_signs_unique_total = $courseTypes->sum('history_course_signs_total') + CourseSign::courseSignsTotalByUnique($configStartDate, $configEndDate, 1, $coursesAll->pluck('id')->merge($otherCourseIds), false, false); + // 总去重人数(包含"其他"),与 courseTypes 各项 course_signs_total 之和保持一致 + $config->course_signs_unique_total = $courseTypes->sum('course_signs_total'); } return $this->success(compact('list', 'suzhou', 'country', 'monthCourses', 'time_axis', 'article', 'yearConfigs'));