diff --git a/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/service/impl/Cet_4ServiceImpl.java b/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/service/impl/Cet_4ServiceImpl.java
index ad05f97c..94fd658e 100644
--- a/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/service/impl/Cet_4ServiceImpl.java
+++ b/jeecg-module-system/jeecg-system-start/src/main/java/org/jeecg/modules/service/impl/Cet_4ServiceImpl.java
@@ -117,17 +117,17 @@ public class Cet_4ServiceImpl extends ServiceImpl<Cet_4Mapper, Cet_4> implements
         //根据批次查人数
 
         queryWrapper.ge(Cet_4::getResult, 425);
-        List<Cet_4> result = cet4Mapper.selectList(queryWrapper);
-        collect = result.stream().collect(Collectors.groupingBy(Cet_4::getCollege));
+        List<Cet_4> passedList = cet4Mapper.selectList(queryWrapper);
+        passedList = passedList.stream().filter(e -> trueEntryDate.contains(e.getEntrydate())).collect(Collectors.toList());
+        if(college.equals("全校")){
+            collect = passedList.stream().collect(Collectors.groupingBy(Cet_4::getCollege));
+        }else{
+            collect = passedList.stream().collect(Collectors.groupingBy(Cet_4::getMajorname));
+        }
 
         // 过滤除去错误的数据
         allStudentList = allStudentList.stream().filter(e -> trueEntryDate.contains(e.getEntrydate())).collect(Collectors.toList());
         long allStudent = allStudentList.size();
-        //获取通过人数
-        LambdaQueryWrapper<Cet_4> passWrapper = new LambdaQueryWrapper<>();
-        passWrapper.eq(Cet_4::getBatch, batch).ge(Cet_4::getResult, 425).eq(!college.equals("全校"), Cet_4::getCollege, college);
-        List<Cet_4> passedList = list(passWrapper);
-        passedList = passedList.stream().filter(e -> trueEntryDate.contains(e.getEntrydate())).collect(Collectors.toList());
 
         long passStudent = passedList.size();
         double passRateSum = (passStudent / (double) allStudent) * 100;
@@ -558,7 +558,7 @@ public class Cet_4ServiceImpl extends ServiceImpl<Cet_4Mapper, Cet_4> implements
     public Result<JSONObject> getRateByMajorAndLastestBatch(getRateByMajorAndLastestBatchDto getRateByMajorAndLastestBatchParam) {
         Date batch = cet4Mapper.lastestDate();
         JSONObject json = new JSONObject();
-        json.put("data",getGradeByBatch(batch,getRateByMajorAndLastestBatchParam.getCollege(),getRateByMajorAndLastestBatchParam.getMajor()));
+        json.put("data", getGradeByBatch(batch, getRateByMajorAndLastestBatchParam.getCollege(), getRateByMajorAndLastestBatchParam.getMajor()));
         return Result.ok(json);
     }