diff --git a/WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_report_1.jsp b/WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_report_1.jsp
index c7a0f0f..4d7fc08 100644
--- a/WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_report_1.jsp
+++ b/WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_report_1.jsp
@@ -236,7 +236,13 @@
 			var startDate = $("#lastStart").val();
 			var endDate =  $("#lastEnd").val();
 			var subject_id =  $("#SUBJECT_ID").val();
-			url = url + "&start_date=" + startDate + "&end_date=" + endDate + "&SUBJECT_ID=" + subject_id;
+			url = url + "&start_date=" + startDate ;
+			if(endDate != null){
+				url = url + + "&end_date=" + endDate;
+			}
+			if(subject_id != null){
+				url = url + "&SUBJECT_ID=" + subject_id;
+			}
 			if(role == "admin"){
 				url = url + "&ROLE=admin" ;
 			}
diff --git a/WebRoot/static/js/control-604.js b/WebRoot/static/js/control-604.js
index def932e..20b11dc 100644
--- a/WebRoot/static/js/control-604.js
+++ b/WebRoot/static/js/control-604.js
@@ -424,7 +424,7 @@ $(function() {
 			contentType : "application/x-www-form-urlencoded; charset=utf-8",
 			success : function(data) {
 				$(".loading").css("display", "none");
-				window.location.href = JUMP_URL;
+				window.location.href = JUMP_URL + "&src=";
 			}
 		})
 	}
diff --git a/resources/mybatis1/sunvote/TestPaperMapper.xml b/resources/mybatis1/sunvote/TestPaperMapper.xml
index 436491b..4e4bb6f 100644
--- a/resources/mybatis1/sunvote/TestPaperMapper.xml
+++ b/resources/mybatis1/sunvote/TestPaperMapper.xml
@@ -159,7 +159,7 @@
 			and (CREATE_DATE > #{START_DATE})
 		</if>
 		<if test="END_DATE != null and END_DATE != ''"><!-- 关键词检索 -->
-			and (CREATE_DATE &lt; #{END_DATE})
+			and (CREATE_DATE &lt; CONCAT(#{END_DATE},"A"))
 		</if>
 		
 		order by CREATE_DATE DESC
diff --git a/src/com/fh/Main.java b/src/com/fh/Main.java
index 61c9117..5052057 100644
--- a/src/com/fh/Main.java
+++ b/src/com/fh/Main.java
@@ -5,6 +5,8 @@ import java.io.InputStreamReader;
 import java.net.HttpURLConnection;
 import java.net.URL;
 
+import org.java_websocket.WebSocket;
+
 public class Main {
 
 	public static void main(String[] args) {