diff --git a/WebRoot/WEB-INF/jsp/sunvote/homework/homework_edit2.jsp b/WebRoot/WEB-INF/jsp/sunvote/homework/homework_edit2.jsp
index a81f77d..08283f0 100644
--- a/WebRoot/WEB-INF/jsp/sunvote/homework/homework_edit2.jsp
+++ b/WebRoot/WEB-INF/jsp/sunvote/homework/homework_edit2.jsp
@@ -41,11 +41,11 @@
 						<table id="table_report" class="table">
 							<tr>
 								<td style="width:95px;text-align: right;padding-top: 13px;">练习标题</td>
-								<td><input type="text" name="NAME" class="form-control" id="NAME" value="${pd.CODE}" maxlength="255" placeholder="输入练习标题，不超过20个汉字" title="作业代码" /></td>
+								<td><input type="text" name="NAME" class="form-control" id="NAME" value="${pd.NAME}" maxlength="255" placeholder="输入练习标题，不超过20个汉字" title="作业代码" /></td>
 							</tr>
 							<tr>
 								<td style="width:95px;text-align: right;padding-top: 13px;">练习说明</td>
-								<td><input type="text" name=HOMEWORK_DESC class="form-control" id="HOMEWORK_DESC" value="${pd.NAME}" maxlength="255" placeholder="输入题目说明，如教材第12页1-5题，教辅第5页1-3题，尽量精简，不超过100个汉字" title="作业名称" /></td>
+								<td><input type="text" name=HOMEWORK_DESC class="form-control" id="HOMEWORK_DESC" value="${pd.HOMEWORK_DESC}" maxlength="255" placeholder="输入题目说明，如教材第12页1-5题，教辅第5页1-3题，尽量精简，不超过100个汉字" title="作业名称" /></td>
 							</tr>
 							<tr>
 								<td style="width:95px;text-align: right;padding-top: 13px;">指定班级完成时间</td>
@@ -171,6 +171,10 @@
 						</div>
 						<div id="zhongxin2" class="center" style="display:none"><br/><br/><br/><br/><br/><img src="static/images/jiazai.gif" /><br/><h4 class="lighter block green">提交中...</h4></div>
 					</form>
+					
+					
+					${pd}
+					
 					</div>
 					<!-- /.col -->
 				</div>
@@ -235,6 +239,7 @@
 			}
 		});
 	}
+	
 	</script>
 </body>
 </html>
\ No newline at end of file
diff --git a/WebRoot/WEB-INF/jsp/sunvote/homework/homework_list.jsp b/WebRoot/WEB-INF/jsp/sunvote/homework/homework_list.jsp
index 5a22421..8af6dbe 100644
--- a/WebRoot/WEB-INF/jsp/sunvote/homework/homework_list.jsp
+++ b/WebRoot/WEB-INF/jsp/sunvote/homework/homework_list.jsp
@@ -156,7 +156,7 @@
 		window.top.loading.show();
 	}
 	function edit(Id){
-		var path = '<%=basePath%>homework/goEdit2.do?school_id=${pd.SCHOOL_ID}&ID='+Id;
+		var path = '<%=basePath%>homework/goEdit2.do?school_id=${pd.SCHOOL_ID}&HOMEWORK_ID='+Id;
 		parent.$("#mainFrame").attr('src',path);
 		window.top.loading.show();
 	}
diff --git a/WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_main.jsp b/WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_main.jsp
index c240a50..a94dffe 100644
--- a/WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_main.jsp
+++ b/WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_main.jsp
@@ -187,7 +187,7 @@
 		function homeWork(schoolId){
 			//var path = "../school/goEdit2.do?ID=" + schoolId ;
 
-			var path = '<%=basePath%>homework/goEdit2.do?teacher_id=${pd.TEACHER.ID}&ID=' + schoolId ;
+			var path = '<%=basePath%>homework/goAdd2.do?teacher_id=${pd.TEACHER.ID}&ID=' + schoolId ;
 			
 				$("#mainFrame").attr('src',path);
 				window.top.loading.show();
diff --git a/src/com/fh/controller/sunvote/homework/HomeworkController.java b/src/com/fh/controller/sunvote/homework/HomeworkController.java
index 2110d50..a447155 100644
--- a/src/com/fh/controller/sunvote/homework/HomeworkController.java
+++ b/src/com/fh/controller/sunvote/homework/HomeworkController.java
@@ -113,7 +113,7 @@ public class HomeworkController extends BaseController {
 		logBefore(logger, Jurisdiction.getUsername() + "列表Homework");
 		ModelAndView mv = this.getModelAndView();
 		PageData pd = new PageData();
-		pd = this.getPageData();
+		pd = this.getPageData();	
 		String keywords = pd.getString("keywords"); // 关键词检索条件
 		if (null != keywords && !"".equals(keywords)) {
 			pd.put("keywords", keywords.trim());
@@ -143,6 +143,23 @@ public class HomeworkController extends BaseController {
 		mv.addObject("pd", pd);
 		return mv;
 	}
+	
+	/**
+	 * 去新增页面
+	 * 
+	 * @param
+	 * @throws Exception
+	 */
+	@RequestMapping(value = "/goAdd2")
+	public ModelAndView goAdd2() throws Exception {
+		ModelAndView mv = this.getModelAndView();
+		PageData pd = new PageData();
+		pd = this.getPageData();
+		mv.setViewName("sunvote/homework/homework_edit2");
+		mv.addObject("msg", "save");
+		mv.addObject("pd", pd);
+		return mv;
+	}
 
 	/**
 	 * 去修改页面
@@ -174,7 +191,7 @@ public class HomeworkController extends BaseController {
 		PageData pd = new PageData();
 		pd = this.getPageData();
 		pd = homeworkService.findById(pd); // 根据ID读取
-		pd.put("PROBLEMS", homeworkproblemService.listProblem(pd));
+		pd.put("QUESTIONS", homeworkproblemService.listProblem(pd));
 		pd.put("TEACHER_ID", geTeacherID());
 		mv.setViewName("sunvote/homework/homework_edit2");
 		mv.addObject("msg", "edit");
@@ -372,7 +389,7 @@ public class HomeworkController extends BaseController {
 					homeworkproblemService.save(qpd);
 				}
 
-				responseGson.setData(pd.getString("CODE"));
+				responseGson.setData(hpd.getString("CODE"));
 			} else {
 				responseGson.setDataError();
 			}