diff --git a/WebRoot/WEB-INF/jsp/sunvote/student/student_edit2.jsp b/WebRoot/WEB-INF/jsp/sunvote/student/student_edit2.jsp
index 7f97285..ce6e499 100644
--- a/WebRoot/WEB-INF/jsp/sunvote/student/student_edit2.jsp
+++ b/WebRoot/WEB-INF/jsp/sunvote/student/student_edit2.jsp
@@ -29,10 +29,12 @@
 					
 					<form action="student/${msg }.do" name="Form" id="Form" method="post">
 						<input type="hidden" name="ID" id="ID" value="${pd.ID}"/>
+						<input type="hidden" name="CLASS_ID" id="CLASS_ID" value="${pd.CLASS_ID}"/>
+						<input type="hidden" name="TERM_ID" id="TERM_ID" value="${pd.TERM_ID}"/>
 						<div id="zhongxin" style="padding-top: 13px;">
 						<table id="table_report" class="table table-striped table-bordered table-hover">
 							<tr>
-								<td style="width:75px;text-align: right;padding-top: 13px;">学生姓名:</td>
+								<td style="width:75px;text-align: right;padding-top: 13px;">姓名:</td>
 								<td><input type="text" name="NAME" id="NAME" value="${pd.NAME}" maxlength="255" placeholder="这里输入学生姓名" title="学生姓名" style="width:98%;"/></td>
 							</tr>
 							<tr>
@@ -122,96 +124,7 @@
 				$("#NAME").focus();
 			return false;
 			}
-			if($("#SNO").val()==""){
-				$("#SNO").tips({
-					side:3,
-		            msg:'请输入学籍号',
-		            bg:'#AE81FF',
-		            time:2
-		        });
-				$("#SNO").focus();
-			return false;
-			}
-			if($("#NUMBER").val()==""){
-				$("#NUMBER").tips({
-					side:3,
-		            msg:'请输入学号',
-		            bg:'#AE81FF',
-		            time:2
-		        });
-				$("#NUMBER").focus();
-			return false;
-			}
-			if($("#SEX").val()==""){
-				$("#SEX").tips({
-					side:3,
-		            msg:'请输入性别',
-		            bg:'#AE81FF',
-		            time:2
-		        });
-				$("#SEX").focus();
-			return false;
-			}
-			if($("#GROUPID").val()==""){
-				$("#GROUPID").tips({
-					side:3,
-		            msg:'请输入组号',
-		            bg:'#AE81FF',
-		            time:2
-		        });
-				$("#GROUPID").focus();
-			return false;
-			}
-			if($("#SIGN_NO").val()==""){
-				$("#SIGN_NO").tips({
-					side:3,
-		            msg:'请输入签到码',
-		            bg:'#AE81FF',
-		            time:2
-		        });
-				$("#SIGN_NO").focus();
-			return false;
-			}
-			if($("#PARENT_NAME").val()==""){
-				$("#PARENT_NAME").tips({
-					side:3,
-		            msg:'请输入家长姓名',
-		            bg:'#AE81FF',
-		            time:2
-		        });
-				$("#PARENT_NAME").focus();
-			return false;
-			}
-			if($("#PARENT_PHONE").val()==""){
-				$("#PARENT_PHONE").tips({
-					side:3,
-		            msg:'请输入家长手机号',
-		            bg:'#AE81FF',
-		            time:2
-		        });
-				$("#PARENT_PHONE").focus();
-			return false;
-			}
-			if($("#KEYPAD_ID").val()==""){
-				$("#KEYPAD_ID").tips({
-					side:3,
-		            msg:'请输入键盘ID',
-		            bg:'#AE81FF',
-		            time:2
-		        });
-				$("#KEYPAD_ID").focus();
-			return false;
-			}
-			if($("#REMARK").val()==""){
-				$("#REMARK").tips({
-					side:3,
-		            msg:'请输入备注',
-		            bg:'#AE81FF',
-		            time:2
-		        });
-				$("#REMARK").focus();
-			return false;
-			}
+			
 			$("#Form").submit();
 			$("#zhongxin").hide();
 			$("#zhongxin2").show();
diff --git a/WebRoot/WEB-INF/jsp/sunvote/student/student_list2.jsp b/WebRoot/WEB-INF/jsp/sunvote/student/student_list2.jsp
index 2656c84..bf8e5a0 100644
--- a/WebRoot/WEB-INF/jsp/sunvote/student/student_list2.jsp
+++ b/WebRoot/WEB-INF/jsp/sunvote/student/student_list2.jsp
@@ -31,6 +31,8 @@
 							
 						<!-- 检索  -->
 						<form action="student/listcs.do" method="post" name="Form" id="Form">
+						<input type="hidden" name="CLASS_ID" id="CLASS_ID" value="${pd.CLASS_ID}"/>
+						<input type="hidden" name="TERM_ID" id="TERM_ID" value="${pd.TERM_ID}"/>
 						<table style="margin-top:5px;">
 							<tr>
 							</tr>
diff --git a/WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_main.jsp b/WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_main.jsp
index 60c6221..a7a5a9e 100644
--- a/WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_main.jsp
+++ b/WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_main.jsp
@@ -93,8 +93,8 @@
 			</div>
 		</div>
 		<c:forEach items="${pd.TEACHER}" var="var" varStatus="vs">
-			<div class="class" onclick="javascript:chooseClass(${var.CLASS_ID},${var.TERM_ID});">
-				<p id="classStudent"><a  href="javascript:;">${var.GRADE_NAME}${var.SUBJECT_NAME} <span>${var.CLASS_NAME}</span></a></p>
+			<div class="class">
+				<p><a  href="javascript:chooseClass(${var.CLASS_ID},'${var.TERM_ID}');">${var.GRADE_NAME}${var.SUBJECT_NAME} <span>${var.CLASS_NAME}</span></a></p>
 			</div>
 		</c:forEach>
 		<div class="test">测验</div>
@@ -209,7 +209,8 @@
 		})
 		
 		function chooseClass(classID,termID){
-			$(".content_r").html('<iframe name="mainFrame" id="mainFrame" frameborder="0" src="student/listcs.do?class_id="' + classID + '&term_id=' + termID + ' style="width:100%;height:'+$(".content_l").height()+'px;"></iframe>');
+			var path = "student/listcs.do?class_id=" + classID + "&term_id=" + termID ;
+			$(".content_r").html('<iframe name="mainFrame" id="mainFrame" frameborder="0" style="width:100%;height:'+$(".content_l").height()+'px;" src=' + path + '></iframe>');
 		}
 		$(".analysis").click(function(){
 			$(".content_r").html('<img src="static/images/analysis.png" width="100%" />');
diff --git a/src/com/fh/controller/sunvote/student/StudentController.java b/src/com/fh/controller/sunvote/student/StudentController.java
index 85e9c49..a5880a3 100644
--- a/src/com/fh/controller/sunvote/student/StudentController.java
+++ b/src/com/fh/controller/sunvote/student/StudentController.java
@@ -72,16 +72,16 @@ public class StudentController extends BaseController {
 		if(!Jurisdiction.buttonJurisdiction(menuUrl, "add")){return null;} //校验权限
 		ModelAndView mv = this.getModelAndView();
 		PageData pd = new PageData();
+		pd = this.getPageData();
 		String studentID = this.get32UUID();
 		pd.put("ID", studentID);
-		pd = this.getPageData();
+		pd.put("STUDENT_ID", studentID);
 		studentService.save(pd);
 		
 		String termID = pd.getString("TERM_ID");
 		String classID = pd.getString("CLASS_ID");
 		pd.put("CLASSROSTER_ID", get32UUID());
-		pd.put("STUDENT_ID", studentID);
-		pd.put("TERM_ID", termID);
+		pd.put("TEAMID", termID);
 		pd.put("SCLASS_ID", classID);
 		classrosterService.save(pd);
 		
@@ -192,7 +192,7 @@ public class StudentController extends BaseController {
 		ModelAndView mv = this.getModelAndView();
 		PageData pd = new PageData();
 		pd = this.getPageData();
-		mv.setViewName("sunvote/student/student_edit");
+		mv.setViewName("sunvote/student/student_edit2");
 		mv.addObject("msg", "save2");
 		mv.addObject("pd", pd);
 		return mv;