diff --git a/WebRoot/WEB-INF/jsp/sunvote/admin/admin_main.jsp b/WebRoot/WEB-INF/jsp/sunvote/admin/admin_main.jsp
index f690275..a59f616 100644
--- a/WebRoot/WEB-INF/jsp/sunvote/admin/admin_main.jsp
+++ b/WebRoot/WEB-INF/jsp/sunvote/admin/admin_main.jsp
@@ -241,7 +241,7 @@
 									data-placeholder="这里输入所属学校">
 									<option value="-1">--请选择--</option>
 									<c:forEach items="${gradeInfos}" var="var" varStatus="vs">
-										<option value="${var.GRADE_ID}">${var.GNAME}</option>
+										<option value="${var.GRADE_ID}">${var.NAME}</option>
 									</c:forEach>
 								</select>
 							</div>
diff --git a/WebRoot/WEB-INF/jsp/sunvote/teacher/creat_question.jsp b/WebRoot/WEB-INF/jsp/sunvote/teacher/creat_question.jsp
index b2dd878..4138149 100644
--- a/WebRoot/WEB-INF/jsp/sunvote/teacher/creat_question.jsp
+++ b/WebRoot/WEB-INF/jsp/sunvote/teacher/creat_question.jsp
@@ -111,6 +111,7 @@
 					<option value="3">阅读理解</option>
 					<option value="4">判断题</option>
 					<option value="5">多选题</option>
+					<option value="6">填空题</option>
 				</select>
 		    </div> 
 		    <div class="clearfix"></div>
diff --git a/WebRoot/static/js/control-604.js b/WebRoot/static/js/control-604.js
index c036330..d0adcd4 100644
--- a/WebRoot/static/js/control-604.js
+++ b/WebRoot/static/js/control-604.js
@@ -72,7 +72,7 @@ $(function() {
 	}
 
 	/***************************************************************************
-	 * 1、单选题 2、完形填空 3、阅读理解 4、判断题 5、多选题
+	 * 1、单选题 2、完形填空 3、阅读理解 4、判断题 5、多选题 6、填空题
 	 **************************************************************************/
 
 	function addQuestion(type, a_num, index_s_2, index_e_2, fraction2) {