diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/impl/YxCalculationMajorServiceImpl.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/impl/YxCalculationMajorServiceImpl.java
index 9e2e882..c1de25f 100644
--- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/impl/YxCalculationMajorServiceImpl.java
+++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/impl/YxCalculationMajorServiceImpl.java
@@ -261,16 +261,18 @@ public class YxCalculationMajorServiceImpl extends ServiceImpl<YxCalculationMajo
      * @param recommendMajorList
      */
     private static void convertRecommendMajorListToNull(List<RecommendMajorDTO> recommendMajorList) {
-        List<String> rulesEnrollProbabilitySxList = Arrays.asList("专过文排", "文8专2", "文*0.8+文*0.5", "文7专3", "文*0.7+文*0.75", "文6专4", "文*0.6+专*1", "文5专5", "文*0.5+专*1.25");
+        List<String> rulesEnrollProbabilityList = Arrays.asList("文*0.8+文*0.5", "文*0.7+文*0.75","文*0.6+专*1","文*0.5+专*1.25");
+        List<String> rulesEnrollProbabilitySxList = Arrays.asList("文7专3","专过文排","文8专2","文6专4","文5专5");
         recommendMajorList.forEach(r->{
             r.setPlanNum(null);
-            if(!r.getMajorType().equals("体育类") && !r.getBatch().equals("高职高专") &&
-                        (   !rulesEnrollProbabilitySxList.contains(r.getRulesEnrollProbability()) ||
-                                (StringUtils.isNotBlank(r.getRulesEnrollProbabilitySx()) && !rulesEnrollProbabilitySxList.contains(r.getRulesEnrollProbabilitySx())
-                        )
-            )){
-                r.setRulesEnrollProbability(null);
+            //非体育，非专科
+            if(!r.getMajorType().equals("体育类") && !r.getBatch().equals("高职高专")){
+                if (rulesEnrollProbabilitySxList.contains(r.getRulesEnrollProbabilitySx())) {
+                }else if(!rulesEnrollProbabilityList.contains(r.getRulesEnrollProbability())){
+                    r.setRulesEnrollProbability(null);
+                }
             }
+
         });
     }