From 6016079a766792167f7b55ce89640299d5ae67fe Mon Sep 17 00:00:00 2001
From: Hjj <126586545@qq.com>
Date: Sat, 28 Jun 2025 00:58:26 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A2=84=E6=8A=A5=E5=88=B0=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E5=90=84=E9=99=A2=E5=BD=95=E5=8F=96=E7=BB=9F?=
 =?UTF-8?q?=E8=AE=A1=E9=94=99=E8=AF=AF=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Admin/Metrics/Examples/Follow/AllEnrollCollege.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/Admin/Metrics/Examples/Follow/AllEnrollCollege.php b/app/Admin/Metrics/Examples/Follow/AllEnrollCollege.php
index 88c7cc6..1d1246a 100644
--- a/app/Admin/Metrics/Examples/Follow/AllEnrollCollege.php
+++ b/app/Admin/Metrics/Examples/Follow/AllEnrollCollege.php
@@ -42,6 +42,7 @@ class AllEnrollCollege extends Round
         $studentsIds = AdmissionNewStudents::query()->where(["is_new_student" => "1"])->pluck('idCard')->toArray();
         $all = UsersMember::query()
             ->whereIn("idcard", $studentsIds)
+            ->where("enroll_status", 1)
             ->where(function ($query) {
                 if (is_array($this->data['secondary_college_id'])) {
                     $ids = $this->data['secondary_college_id'];
@@ -64,7 +65,7 @@ class AllEnrollCollege extends Round
         // 女生
         $girl = $all[2] ?? 0;
 
-        $manPercent = $total != 0 ? number_format(($man /$total) * 100) : 0;
+        $manPercent = $total != 0 ? number_format(($man / $total) * 100) : 0;
         $girlPercent = $total != 0 ? number_format(($girl / $total) * 100) : 0;
         // 卡片内容
         $this->withContent($total, $man, $girl)->height('220px');