diff --git a/WebRoot/WEB-INF/jsp/sunvote/coursemanagement/coursemanagement_edit.jsp b/WebRoot/WEB-INF/jsp/sunvote/coursemanagement/coursemanagement_edit.jsp
index 8a06184..ae73386 100644
--- a/WebRoot/WEB-INF/jsp/sunvote/coursemanagement/coursemanagement_edit.jsp
+++ b/WebRoot/WEB-INF/jsp/sunvote/coursemanagement/coursemanagement_edit.jsp
@@ -34,8 +34,7 @@
 							<tr>
 								<td style="width:75px;text-align: right;padding-top: 13px;">老师:</td>
 								<td>
-								<%-- <input type="number" name="TEACHER_ID" id="TEACHER_ID" value="${pd.TEACHER_ID}" maxlength="32" placeholder="这里输入老师" title="老师" style="width:98%;"/></td> --%>
-								<select class="chosen-select form-control" name="TEACHER_ID" id="TEACHER_ID" data-placeholder="这里输入班级类型">
+								<select class="chosen-select form-control" name="TEACHER_ID" id="TEACHER_ID" data-placeholder="这里输入">
 									<c:forEach var="item" items="${teachers}">
 										<option value="${item.ID}"  <c:if test="${pd.TEACHER_ID==item.ID}">selected="true"</c:if>>${item.NAME}</option>
 									</c:forEach>
@@ -54,6 +53,16 @@
 								</td>
 							</tr>
 							<tr>
+								<td style="width:75px;text-align: right;padding-top: 13px;">年级:</td>
+								<td>
+								<select class="chosen-select form-control" name="GRADE_ID" id="GRADE_ID" data-placeholder="这里输入班级类型">
+									<c:forEach var="item" items="${grades}">
+										<option value="${item.ID}"  <c:if test="${pd.GRADE_ID==item.ID}">selected="true"</c:if>>${item.NAME}</option>
+									</c:forEach>
+								</select>
+								</td>
+							</tr>
+							<tr>
 								<td style="width:75px;text-align: right;padding-top: 13px;">科目:</td>
 								<td>
 								<%-- <input type="number" name="SUBJECT_ID" id="SUBJECT_ID" value="${pd.SUBJECT_ID}" maxlength="32" placeholder="这里输入科目" title="科目" style="width:98%;"/></td> --%>
@@ -66,24 +75,14 @@
 							</tr>
 							<tr>
 								<td style="width:75px;text-align: right;padding-top: 13px;">学期:</td>
+								<td>
 								<select class="chosen-select form-control" name="TERM_ID" id="TERM_ID" data-placeholder="学期">
-									<c:forEach var="item" items="${subjects}">
-										<option value="${item.ID}"  <c:if test="${pd.TERM_ID==item.TERM_ID}">selected="true"</c:if>>${item.NAME}</option>
+									<c:forEach var="item" items="${terms}">
+										<option value="${item.TERM_ID}"  <c:if test="${pd.TERM_ID==item.TERM_ID}">selected="true"</c:if>>${item.NAME}</option>
 									</c:forEach>
 								</select>
+								</td>
 							</tr>
-							<%-- <tr>
-								<td style="width:75px;text-align: right;padding-top: 13px;">开始时间:</td>
-								<td><input class="span10 date-picker" name="START_DATE" id="START_DATE" value="${pd.START_DATE}" type="text" data-date-format="yyyy-mm-dd" readonly="readonly" placeholder="开始时间" title="开始时间" style="width:98%;"/></td>
-							</tr>
-							<tr>
-								<td style="width:75px;text-align: right;padding-top: 13px;">结束时间:</td>
-								<td><input class="span10 date-picker" name="END_DATE" id="END_DATE" value="${pd.END_DATE}" type="text" data-date-format="yyyy-mm-dd" readonly="readonly" placeholder="结束时间" title="结束时间" style="width:98%;"/></td>
-							</tr>
-							<tr>
-								<td style="width:75px;text-align: right;padding-top: 13px;">备注:</td>
-								<td><input type="text" name="REMARK" id="REMARK" value="${pd.REMARK}" maxlength="255" placeholder="这里输入备注" title="备注" style="width:98%;"/></td>
-							</tr> --%>
 							<tr>
 								<td style="text-align: center;" colspan="10">
 									<a class="btn btn-mini btn-primary" onclick="save();">保存</a>
diff --git a/resources/mybatis1/sunvote/CourseManagementMapper.xml b/resources/mybatis1/sunvote/CourseManagementMapper.xml
index f917867..07b0456 100644
--- a/resources/mybatis1/sunvote/CourseManagementMapper.xml
+++ b/resources/mybatis1/sunvote/CourseManagementMapper.xml
@@ -38,6 +38,7 @@
 		insert into 
 	<include refid="tableName"></include>
 		(
+			ID,
 			TEACHER_ID,	
 			CLASS_ID,	
 			SUBJECT_ID,	
@@ -47,6 +48,7 @@
 			TERM_ID,
 			REMARK
 		) values (
+		#{ID},	
 		#{TEACHER_ID},	
 		#{CLASS_ID},	
 		#{SUBJECT_ID},	
@@ -79,7 +81,7 @@
 			REMARK = #{REMARK},
 			GRADE_ID = #{GRADE_ID},	
 			TERM_ID = #{TERM_ID},	
-		ID = ${ID}
+		ID = ID
 		where 
 		ID = #{ID}
 	</update>
diff --git a/resources/mybatis1/sunvote/TeacherMapper.xml b/resources/mybatis1/sunvote/TeacherMapper.xml
index f1c5864..182617d 100644
--- a/resources/mybatis1/sunvote/TeacherMapper.xml
+++ b/resources/mybatis1/sunvote/TeacherMapper.xml
@@ -91,7 +91,7 @@
 			SEX = #{SEX},
 			SUBJECT_IDS = #{SUBJECT_IDS},
 			KEYPAD_ID = #{KEYPAD_ID},
-		ID = ${ID}
+		ID = ID
 		where 
 		ID = #{ID}
 	</update>
diff --git a/src/com/fh/controller/sunvote/coursemanagement/CourseManagementController.java b/src/com/fh/controller/sunvote/coursemanagement/CourseManagementController.java
index 6efff7e..142597d 100644
--- a/src/com/fh/controller/sunvote/coursemanagement/CourseManagementController.java
+++ b/src/com/fh/controller/sunvote/coursemanagement/CourseManagementController.java
@@ -27,6 +27,7 @@ import com.fh.util.PageData;
 import com.fh.util.Jurisdiction;
 import com.fh.util.Tools;
 import com.fh.service.sunvote.coursemanagement.CourseManagementManager;
+import com.fh.service.sunvote.grade.GradeManager;
 import com.fh.service.sunvote.sclass.SClassManager;
 import com.fh.service.sunvote.subject.SubjectManager;
 import com.fh.service.sunvote.teacher.TeacherManager;
@@ -57,6 +58,9 @@ public class CourseManagementController extends BaseController {
 	@Resource(name="termService")
 	private TermManager termService;
 	
+	@Resource(name="gradeService")
+	private GradeManager gradeService;
+	
 	/**保存
 	 * @param
 	 * @throws Exception
@@ -68,6 +72,7 @@ public class CourseManagementController extends BaseController {
 		ModelAndView mv = this.getModelAndView();
 		PageData pd = new PageData();
 		pd = this.getPageData();
+		pd.put("ID", this.get32UUID());
 		coursemanagementService.save(pd);
 		mv.addObject("msg","success");
 		mv.setViewName("save_result");
@@ -176,6 +181,8 @@ public class CourseManagementController extends BaseController {
 		mv.addObject("subjects", subjects);
 		List<PageData> terms = termService.listAll(pd);
 		mv.addObject("terms", terms);
+		List<PageData> grades =  gradeService.listAll(pd);
+		mv.addObject("grades", grades);
 		
 		mv.addObject("msg", "edit");
 		mv.addObject("pd", pd);