diff --git a/New_College.Api/Controllers/HealthCheckController.cs b/New_College.Api/Controllers/HealthCheckController.cs
index cb37131..dc76c6f 100644
--- a/New_College.Api/Controllers/HealthCheckController.cs
+++ b/New_College.Api/Controllers/HealthCheckController.cs
@@ -78,7 +78,7 @@ namespace New_College.Controllers
 
             //  await v_CustomerInfoServices.CustomeBillExport();
 
-           await d_LongIdMapServices.UpdatePlanProInf("山东省");
+           //await d_LongIdMapServices.UpdatePlanProInf("山东省", "普通类二段");
 
 
             return true;
diff --git a/New_College.Common/Helper/MajorPlanScoreTool.cs b/New_College.Common/Helper/MajorPlanScoreTool.cs
index 6ad7497..8ff04dd 100644
--- a/New_College.Common/Helper/MajorPlanScoreTool.cs
+++ b/New_College.Common/Helper/MajorPlanScoreTool.cs
@@ -33,10 +33,14 @@ namespace New_College.Common
             {
                 percentage = new Random().Next(31, 80);
             }
-            if (LowScore >= requestScore && LowScore <= requestScore + 15)
+            if (LowScore >= requestScore && LowScore <= requestScore + 30)
             {
                 percentage = new Random().Next(1, 30);
             }
+            //else
+            //{
+            //    percentage = new Random().Next(1, 30);
+            //}
 
             return percentage;
         }
diff --git a/New_College.IServices/ID_LongIdMapServices.cs b/New_College.IServices/ID_LongIdMapServices.cs
index cb16188..601a902 100644
--- a/New_College.IServices/ID_LongIdMapServices.cs
+++ b/New_College.IServices/ID_LongIdMapServices.cs
@@ -32,7 +32,7 @@ namespace New_College.IServices
         /// <returns></returns>
         Task<bool> UpdatePlanScoreLine();
         Task<bool> UpdateSchoolScoreLine23(string Location,string subjectType);
-        Task<bool> UpdatePlanProInf(string Location);
+        Task<bool> UpdatePlanProInf(string Location, string batchname);
         Task<bool> Import();
 
         Task<bool> UpdateUniveristyInf();
diff --git a/New_College.Services/D_LongIdMapServices.cs b/New_College.Services/D_LongIdMapServices.cs
index a4bd974..6c88a26 100644
--- a/New_College.Services/D_LongIdMapServices.cs
+++ b/New_College.Services/D_LongIdMapServices.cs
@@ -2453,13 +2453,13 @@ namespace New_College.Services
                         _plancount = a.PlanCount,
                         BatchName = a.BatchName,
                         SubjectType = subjectType,
-                        _23ScoreLine = a.LowScoreRank,
-                        _23Score = a.LowScore.ToString(),
+                        //_23ScoreLine = a.LowScoreRank,
+                        //_23Score = a.LowScore.ToString(),
                         _Score = a.LowScore.ToString(),
                         _24subject = a.SelectSubject,
                         _23subject = a.SelectSubject,
                         _23Count = majorlist.Where(e => e.Years == 2023 && e.MajorCode == a.MajorCode && e.UniversityName == a.UniversityName).Any() ? majorlist.Where(e => e.Years == 2023 && e.MajorCode == a.MajorCode && e.UniversityName == a.UniversityName).FirstOrDefault().PlanCount.ToString() : "0",
-                        // _23Score = majorlist.Where(e => e.Years == 2023 && e.MajorCode == a.MajorCode && e.UniversityName == a.UniversityName).Any() ? majorlist.Where(e => e.Years == 2023 && e.MajorCode == a.MajorCode && e.UniversityName == a.UniversityName).FirstOrDefault().LowScore.ToString() : "0",
+                        _23Score = majorlist.Where(e => e.Years == 2023 && e.MajorCode == a.MajorCode && e.UniversityName == a.UniversityName).Any() ? majorlist.Where(e => e.Years == 2023 && e.MajorCode == a.MajorCode && e.UniversityName == a.UniversityName).FirstOrDefault().LowScore.ToString() : "0",
                         //  _23ScoreLine = majorlist.Where(e => e.Years == 2023 && e.MajorCode == a.MajorCode && e.UniversityName == a.UniversityName).Any() ? majorlist.Where(e => e.Years == 2023 && e.MajorCode == a.MajorCode && e.UniversityName == a.UniversityName).FirstOrDefault().LowScoreRank.ToString() : "0",
                         _22Count = majorlist.Where(e => e.Years == 2022 && e.MajorCode == a.MajorCode && e.UniversityName == a.UniversityName).Any() ? majorlist.Where(e => e.Years == 2022 && e.MajorCode == a.MajorCode && e.UniversityName == a.UniversityName).FirstOrDefault().PlanCount.ToString() : "0",
                         _22Score = majorlist.Where(e => e.Years == 2022 && e.MajorCode == a.MajorCode && e.UniversityName == a.UniversityName).Any() ? majorlist.Where(e => e.Years == 2022 && e.MajorCode == a.MajorCode && e.UniversityName == a.UniversityName).FirstOrDefault().LowScore.ToString() : "0",
@@ -2481,41 +2481,42 @@ namespace New_College.Services
         /// 更新招生计划数据
         /// </summary>
         /// <returns></returns>
-        public async Task<bool> UpdatePlanProInf(string Location)
+        public async Task<bool> UpdatePlanProInf(string Location, string batchname)
         {
 
-            var tbinfo = await t_TbSNeedDataInfoRepository.Query(e => e.Location == Location && e.BatchName == "普通类二段");
+            var tbinfo = await t_TbSNeedDataInfoRepository.Query(e => e.Location == Location && e.BatchName == batchname);
             var universitylist = await d_UniversityRepository.Query(e => e.IsDelete == false);
             // var majorlist = await d_MajorRepository.Query(e => e.Type == 2 && e.IsDelete == false);
 
             #region************************更新招生计划合计****************************
 
-            // var majorlist = await d_PlanMajorScoreLineRepository.Query(e => e.Location == Location && e.Years == 2023);
-            //  var qliylist = await d_QualificationLineRepository.Query(e => e.Location == Location && e.Years == 2023);
+            var majorlist = await d_PlanMajorScoreLineRepository.Query(e => e.Location == Location && e.Years == 2023);
+            var qliylist = await d_QualificationLineRepository.Query(e => e.Location == Location && e.Years == 2023);
             //  var plist = await this.d_PlanMajorDescProRepository.Query(c => c.Location == Location && c.Years == 2023 && c.IsDelete == false);
-            //tbinfo.ForEach(o =>
-            //{
-            //    if (plist.Any(e => e.Major == o.MajorName && e.UniversityName == o.UniversityName))
-            //    {
-            //        o._21Count = plist.Where(e => e.Major == o.MajorName && e.UniversityName == o.UniversityName).FirstOrDefault().PlanCount.ToString();
-            //           o.AcademicYear = plist.Where(e => e.Major == o.MajorName && e.UniversityName == o.UniversityName).FirstOrDefault().AcademicYear;
-            //    }
-            //    if (majorlist.Any(e => e.Major == o.MajorName && e.UniversityName == o.UniversityName))
-            //    {
-            //        o._21Score = majorlist.Where(e => e.Major == o.MajorName && e.UniversityName == o.UniversityName).FirstOrDefault().LowScore.ToString();
-            //        o._21ScoreLine = majorlist.Where(e => e.Major == o.MajorName && e.UniversityName == o.UniversityName).FirstOrDefault().LowScoreRank.ToString();
-            //    }
-            //    if (qliylist.Any(e => e.UniversityName == o.UniversityName))
-            //    {
-            //        o._23SchoolScore = qliylist.Where(e => e.UniversityName == o.UniversityName).FirstOrDefault().LowScore.ToString();
-            //        o._23SchoolScoreLine = qliylist.Where(e => e.UniversityName == o.UniversityName).FirstOrDefault().LowScoreRank.ToString();
-            //        //o._23SchoolAvgScore=
-            //    }
+            tbinfo.ForEach(o =>
+            {
 
 
-            //});
+                if (majorlist.Any(e => e.MajorCode == o.MajorCode && e.UniversityName == o.UniversityName))
+                {
+                    o._23Count = majorlist.Where(e => e.MajorCode == o.MajorCode && e.UniversityName == o.UniversityName).FirstOrDefault().PlanCount.ToString();
+                    o._23Score = majorlist.Where(e => e.MajorCode == o.MajorCode && e.UniversityName == o.UniversityName).FirstOrDefault().LowScore.ToString();
+                    o._23ScoreLine = majorlist.Where(e => e.MajorCode == o.MajorCode && e.UniversityName == o.UniversityName).FirstOrDefault().LowScoreRank;
+                //    o.AcademicYear = majorlist.Where(e => e.MajorCode == o.MajorCode && e.UniversityName == o.UniversityName).FirstOrDefault().r;
+                }
 
-            //await t_TbSNeedDataInfoRepository.BatchUpdate(tbinfo);
+
+                if (majorlist.Any(e => e.UniversityName == o.UniversityName))
+                {
+                    o._23SchoolScore = qliylist.Where(e => e.UniversityName == o.UniversityName).Min(e=>e.LowScore).ToString();
+                    o._23SchoolScoreLine = qliylist.Where(e => e.UniversityName == o.UniversityName).Max(e=>e.LowScoreRank).ToString();
+                    //o._23SchoolAvgScore=
+                }
+
+
+            });
+
+            await t_TbSNeedDataInfoRepository.BatchUpdate(tbinfo);
 
 
             #endregion************************更新招生计划合计****************************