diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/Exam_ExamPlanController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/Exam_ExamPlanController.cs
index eaaa66089..6b6f3e9c4 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/Exam_ExamPlanController.cs	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Controllers/Exam_ExamPlanController.cs	
@@ -149,15 +149,16 @@ namespace Learun.Application.Web.Areas.EducationalAdministration.Controllers
         [AjaxOnly]
         public ActionResult Generate(string keyValue)
         {
-            var data = exam_ExamPlanIBLL.GetPlanTimeList(keyValue);
-            if (data.Count() <= 0)
-            {
-                return Fail("请先安排时间！");
-            }
+            //var list = exam_ExamPlanIBLL.GetPlanTimeList(keyValue);
+            //if (list.Count() <= 0)
+            //{
+            //    return Fail("请先安排时间！");
+            //}
 
-            if (!exam_ExamPlanIBLL.IsGenerate(keyValue))
+            var data = exam_ExamPlanIBLL.IsGenerate(keyValue);
+            if (!data.flag)
             {
-                return Fail("请先安排考试！");
+                return Fail(data.str);
             }
 
             exam_ExamPlanIBLL.Generate(keyValue);
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Exam_ExamPlan/Index.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Exam_ExamPlan/Index.cshtml
index a76aca1c4..f25123037 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Exam_ExamPlan/Index.cshtml	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/EducationalAdministration/Views/Exam_ExamPlan/Index.cshtml	
@@ -67,7 +67,7 @@
                         </a>
                         <ul class="dropdown-menu pull-right">
                             <li id="lr_planks"><a><i></i>&nbsp;<span class="lrlt">安排考试</span></a></li>
-                            <li id="lr_examlesson"><a><i></i>&nbsp;<span class="lrlt">一键安排课程</span></a></li>
+                            <li id="lr_examlesson"><a><i></i>&nbsp;<span class="lrlt">一键安排考试课程</span></a></li>
                             <li id="lr_examlessontime"><a><i></i>&nbsp;<span class="lrlt">自动生成课程排考时间</span></a></li>
                             <li id="lr_examclass"><a><i></i>&nbsp;<span class="lrlt">一键安排班级</span></a></li>
                             <li id="lr_examroom"><a><i></i>&nbsp;<span class="lrlt">一键安排考场</span></a></li>
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_ExamPlan/Exam_ExamPlanBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_ExamPlan/Exam_ExamPlanBLL.cs
index f3298d883..73409ae5a 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_ExamPlan/Exam_ExamPlanBLL.cs	
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_ExamPlan/Exam_ExamPlanBLL.cs	
@@ -169,7 +169,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
             }
         }
 
-        public bool IsGenerate(string keyValue)
+        public (bool flag, string str) IsGenerate(string keyValue)
         {
             try
             {
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_ExamPlan/Exam_ExamPlanIBLL.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_ExamPlan/Exam_ExamPlanIBLL.cs
index fcf5be98c..e9032bd11 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_ExamPlan/Exam_ExamPlanIBLL.cs	
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_ExamPlan/Exam_ExamPlanIBLL.cs	
@@ -41,7 +41,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
         void ClearGenerate(string keyValue, int type);
         void Generate(string keyValue);
         void SavePlanTime(string EPId, List<Exam_ExamPlanTimeEntity> list);
-        bool IsGenerate(string keyValue);
+        (bool flag,string str) IsGenerate(string keyValue);
         /// <summary>
         /// 保存实体数据（新增、修改）
         /// </summary>
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_ExamPlan/Exam_ExamPlanService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_ExamPlan/Exam_ExamPlanService.cs
index 15ce9b7ab..36d6a1993 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_ExamPlan/Exam_ExamPlanService.cs	
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/Exam_ExamPlan/Exam_ExamPlanService.cs	
@@ -258,7 +258,7 @@ delete from  Exam_ExamPlanRoom where EPLId in ('{planLessonIds}');");
         /// 是否可以生成排考名单
         /// </summary>
         /// <param name="keyValue">排考记录主表Id</param>
-        public bool IsGenerate(string keyValue)
+        public (bool flag, string str) IsGenerate(string keyValue)
         {
             var db = this.BaseRepository("CollegeMIS");
             try
@@ -266,27 +266,45 @@ delete from  Exam_ExamPlanRoom where EPLId in ('{planLessonIds}');");
                 db.BeginTrans();
                 //排考记录表
                 var examPlan = db.FindEntity<Exam_ExamPlanEntity>(keyValue);
+                //安排考试数据
+                var EPTimeList = db.FindList<Exam_ExamPlanTimeEntity>(x => x.EPId == keyValue);
+                if (EPTimeList.Count() <= 0)
+                {
+                    return (false, "请先安排时间！");
+                }
+
                 //排考安排课程已审核的数据
-                var planLessonData = this.BaseRepository("CollegeMIS").FindList<Exam_ExamPlanLessonEntity>(x => x.EPId == keyValue && x.ELCheckMark == true);
+                var planLessonData = db.FindList<Exam_ExamPlanLessonEntity>(x => x.EPId == keyValue);
                 if (planLessonData.Count() <= 0)
                 {
-                    return false;
+                    return (false, "请先安排考试课程！");
                 }
-                else
+                //考试课程ids
+                var EPLIds = string.Join("','", planLessonData.Select(x => x.EPLId).ToList());
+                //排考班级
+                var EPClass = db.FindList<Exam_ExamPlanClassEntity>($"select * from Exam_ExamPlanClass where eplid in ('{EPLIds}')");
+                if (EPClass.Count() <= 0)
                 {
-                    foreach (var planLesson in planLessonData)
-                    {
-                        var planClassData = this.BaseRepository("CollegeMIS").FindList<Exam_ExamPlanClassEntity>(x => x.EPLId == planLesson.EPLId);
-                        var planRoomData = this.BaseRepository("CollegeMIS").FindList<Exam_ExamPlanRoomEntity>(x => x.EPLId == planLesson.EPLId);
-                        if (planClassData.Count() <= 0 || planRoomData.Count() <= 0)
-                        {
-                            return false;
-                        }
-                    }
+                    return (false,"请安排班级！");
                 }
 
+                //排考考场
+                var EPRoom = db.FindList<Exam_ExamPlanRoomEntity>($"select * from Exam_ExamPlanRoom where eplid in ('{EPLIds}')");
+                if (EPRoom.Count() <= 0)
+                {
+                    return (false, "请安排考场！");
+                }
+                if (EPRoom.Where(x => string.IsNullOrEmpty(x.EmpNo)).Count() <= 0)
+                {
+                    return (false, "请安排监考老师！");
+                }
 
-                return true;
+                if (planLessonData.Where(x => x.ELCheckMark == false).Count() <= 0)
+                {
+                    return (false, "请先安排考试！");
+                }
+               
+                return (true, "");
             }
             catch (Exception ex)
             {