diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/impl/YxHistoryMajorEnrollServiceImpl.java b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/impl/YxHistoryMajorEnrollServiceImpl.java
index 0d4327a..b28ccbb 100644
--- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/impl/YxHistoryMajorEnrollServiceImpl.java
+++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/yx/service/impl/YxHistoryMajorEnrollServiceImpl.java
@@ -170,6 +170,9 @@ public class YxHistoryMajorEnrollServiceImpl extends ServiceImpl<YxHistoryMajorE
         if (StringUtils.isNotBlank(id)) {
             lambdaQueryWrapper.in(YxHistoryMajorEnroll::getId, Arrays.asList(id.split(",")));
         }
+        lambdaQueryWrapper.eq(YxHistoryMajorEnroll::getMajorType,"体育类");
+        lambdaQueryWrapper.eq(YxHistoryMajorEnroll::getBatch,"本科");
+        //lambdaQueryWrapper.in(YxHistoryMajorEnroll::getRulesEnrollProbability,"专过文排","文过专排");
         List<YxHistoryMajorEnroll> list = list(lambdaQueryWrapper);
         if (CollectionUtils.isNotEmpty(list)) {
             Map<String, YxHistoryScoreControlLine> historyScoreControlLineMap = yxHistoryScoreControlLineService.allMaps();
@@ -193,6 +196,8 @@ public class YxHistoryMajorEnrollServiceImpl extends ServiceImpl<YxHistoryMajorE
                 batch = record.getBatch();
                 category = record.getCategory();
                 year = record.getYear();
+                wenhuaBili = null;
+                zhuanyeBili = null;
                 probabilityOperator = record.getProbabilityOperator();
                 rulesEnrollProbability = record.getRulesEnrollProbability();
                 if (StringUtils.isBlank(rulesEnrollProbability)) {
@@ -214,7 +219,7 @@ public class YxHistoryMajorEnrollServiceImpl extends ServiceImpl<YxHistoryMajorE
                         continue;
                     }
                 } else {
-                    key = category + "_" + batch + "_" + majorType + "_" + year;
+                    key = category + "_" + (batch.equals("提前批")?"本科提前批":batch) + "_" + majorType + "_" + year;
                 }
 
                 historyScoreControlLine = historyScoreControlLineMap.get(key);
@@ -223,10 +228,23 @@ public class YxHistoryMajorEnrollServiceImpl extends ServiceImpl<YxHistoryMajorE
                 }
                 culturalScore = historyScoreControlLine.getCulturalScore();
                 specialScore = historyScoreControlLine.getSpecialScore();
+
+                /*if (probabilityOperator.equals("专*0.6670")) {
+                    System.out.println("11");
+                }*/
+
                 if (("文过专排".equals(rulesEnrollProbability)|| "文过专排主科".equals(rulesEnrollProbability)) && StringUtils.isBlank(probabilityOperator)) {
-                    probabilityOperator = "专*1";
+                    if ("体育类".equals(majorType)) {
+                        probabilityOperator = "专*0.667";
+                    }else{
+                        probabilityOperator = "专*1";
+                    }
                 }else if ("专过文排".equals(rulesEnrollProbability) && StringUtils.isBlank(probabilityOperator)) {
-                    probabilityOperator = "文*1";
+                    if ("体育类".equals(majorType)) {
+                        probabilityOperator = "文*0.133";
+                    }else{
+                        probabilityOperator = "文*1";
+                    }
                 }else if ("文+专".equals(rulesEnrollProbability) && StringUtils.isBlank(probabilityOperator)) {
                     probabilityOperator = "文*1+专*1";
                 }
@@ -254,11 +272,21 @@ public class YxHistoryMajorEnrollServiceImpl extends ServiceImpl<YxHistoryMajorE
                 } else if ("其他计算办法".equals(rulesEnrollProbability)) {
                     record.setRulesEnrollProbability("其他计算办法");
                 } else {
-                    if (wenhuaBili == null || zhuanyeBili == null) {
+                    if (wenhuaBili == null && zhuanyeBili == null) {
                         wenhuaBili = YxConstant.bigDecimal100;
                         zhuanyeBili = YxConstant.bigDecimal100;
                     }
-                    record.setControlLine((culturalScore.multiply(wenhuaBili)).add((specialScore.multiply(zhuanyeBili))));
+                    if (wenhuaBili!=null && zhuanyeBili!=null) {
+                        //文+专
+                        record.setControlLine((culturalScore.multiply(wenhuaBili)).add((specialScore.multiply(zhuanyeBili))));
+                    }else if(wenhuaBili==null && zhuanyeBili!=null){
+                        //专
+                        record.setControlLine((specialScore.multiply(zhuanyeBili)));
+                    }else if(wenhuaBili!=null && zhuanyeBili==null){
+                        //文
+                        record.setControlLine((culturalScore.multiply(wenhuaBili)));
+                    }
+
                     record.setRulesEnrollProbability(probabilityOperator);
                 }
             }