diff --git a/WebRoot/WEB-INF/jsp/sunvote/homework/homework_report.jsp b/WebRoot/WEB-INF/jsp/sunvote/homework/homework_report.jsp
index 031580f..ff07710 100644
--- a/WebRoot/WEB-INF/jsp/sunvote/homework/homework_report.jsp
+++ b/WebRoot/WEB-INF/jsp/sunvote/homework/homework_report.jsp
@@ -147,6 +147,7 @@
 	#right_ans{
 		margin-right:30px;
 	}
+	.btn-primary{background-color:#3bc2d6 !important;border-color:#3bc2d6;display: inline-block;width: 100px;font-size:16px;text-shadow:none;}
 	</style>
 </head>
 
@@ -156,7 +157,10 @@
 		<p>
 			<span class="right_b"></span>练习报表
 		</p>
-	</div>						
+	</div>	
+		<div class="head_box_r">
+			<button class="btn btn-primary" onclick="history.go(-1)">返回</button>
+		</div>							
 	<div class="clear"></div>
 </div>
 <div style="padding:0 20px;padding-top:3%;padding-bottom:3%;margin-top:102px;">
diff --git a/WebRoot/WEB-INF/jsp/sunvote/teacher/teach_paper.jsp b/WebRoot/WEB-INF/jsp/sunvote/teacher/teach_paper.jsp
index 0ed4507..3ffe377 100644
--- a/WebRoot/WEB-INF/jsp/sunvote/teacher/teach_paper.jsp
+++ b/WebRoot/WEB-INF/jsp/sunvote/teacher/teach_paper.jsp
@@ -137,5 +137,5 @@
 	<script src="../static/js/bootstrap.min.js" ></script>
 	<script src="../static/ace/js/date-time/bootstrap-datepicker.js"></script>
 	<script src="../static/ace/js/bootbox.js"></script>
-	<script src="../static/js/teach_paper.js?a=2"></script>
+	<script src="../static/js/teach_paper.js?a=0"></script>
 </html>
\ No newline at end of file
diff --git a/WebRoot/static/js/teach_paper.js b/WebRoot/static/js/teach_paper.js
index ad23785..a0a1f25 100644
--- a/WebRoot/static/js/teach_paper.js
+++ b/WebRoot/static/js/teach_paper.js
@@ -12,7 +12,9 @@
 				type:"post",
 				success:function(data){
 					console.log(data);
-					subject_id=data.data.subjectList[0].SUBJECT_ID;
+					if(typeof(data.data.subjectList) != 'undefind' && data.data.subjectList.length > 0){
+						subject_id=data.data.subjectList[0].SUBJECT_ID;
+					}
 					user_id=data.data.ID;
 
 					if(data.data.classInfoList.length>0){
diff --git a/src/com/fh/controller/sunvote/homework/HomeworkController.java b/src/com/fh/controller/sunvote/homework/HomeworkController.java
index 2b1b6b3..38fa012 100644
--- a/src/com/fh/controller/sunvote/homework/HomeworkController.java
+++ b/src/com/fh/controller/sunvote/homework/HomeworkController.java
@@ -136,7 +136,7 @@ public class HomeworkController extends BaseController {
 		ModelAndView mv = this.getModelAndView();
 		PageData pd = new PageData();
 		pd = this.getPageData();
-		if(pd.get("SCHOOL_ID") == null){
+		if(pd.get("SCHOOL_ID") == null && pd.get("TEACHER_ID") == null){
 			pd.put("TEACHER_ID", getTeacherID());
 		}
 		String keywords = pd.getString("keywords"); // 关键词检索条件
diff --git a/轻松考-网络版-概要设计 .doc b/轻松考-网络版-概要设计 .doc
index 44426c0..9b90c9a 100644
--- a/轻松考-网络版-概要设计 .doc
+++ b/轻松考-网络版-概要设计 .doc