diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/TimeTableController.cs b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/TimeTableController.cs
index 93f48ee5d..1590f5ba2 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/TimeTableController.cs	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/PersonnelManagement/Controllers/TimeTableController.cs	
@@ -323,8 +323,9 @@ namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers
             var data = arrangeLessonTermIBLL.GetTimeTableInEducation(startDate, endDate, classNo, empNo, schoolId);
             timeTableList.AddRange(data);
             //选修课课程表
-            var dataOfElective = arrangeLessonTermOfElectiveIBLL.GetTimeTableInEducation(startDate, endDate, classNo, empNo, schoolId);
-            timeTableList.AddRange(dataOfElective);
+            //20220718因 更改教务课表显示格式为班级作为列头，选修课无班级所以不能显示在课表内
+            //var dataOfElective = arrangeLessonTermOfElectiveIBLL.GetTimeTableInEducation(startDate, endDate, classNo, empNo, schoolId);
+            //timeTableList.AddRange(dataOfElective);
 
             var timeTables = timeTableList.ToList();
             var noDataResult = new
@@ -333,6 +334,10 @@ namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers
             {
                 return JsonResult(noDataResult);
             }
+            //最大节次
+            int maxlessontime = timeTables.Max(m =>Convert.ToInt32(m.LessonTime.Substring(1)));
+            //班级列表
+            var classinfolist = timeTables.Select(m => new {m.TeachClassNo, m.ClassName}).OrderBy(m => m.TeachClassNo).GroupBy(m=>new {m.TeachClassNo,m.ClassName});
             var formatData = from d in timeTables
                              let tt = d.LessonTime.Substring(1)
                              group d by tt into g
@@ -365,7 +370,7 @@ namespace Learun.Application.Web.Areas.PersonnelManagement.Controllers
                 ;
 
             var result = new
-            { schoolName = "课程表", semester = $"{strAcademicYear}学年度  第{strSemester}学期", weekList = formatData };
+            { schoolName = "课程表", semester = $"{strAcademicYear}学年度  第{strSemester}学期", maxlessontime, classinfolist, weekList = formatData };
             return JsonResult(result);
         }