diff --git a/WebRoot/WEB-INF/jsp/sunvote/admin/admin_main.jsp b/WebRoot/WEB-INF/jsp/sunvote/admin/admin_main.jsp
index c9032d8..2d39c28 100644
--- a/WebRoot/WEB-INF/jsp/sunvote/admin/admin_main.jsp
+++ b/WebRoot/WEB-INF/jsp/sunvote/admin/admin_main.jsp
@@ -151,7 +151,7 @@
 						
 					</li>
 					<li>
-						<p>年级设置</p>
+						<p >年级设置</p>
 					</li>
 					<li>
 						<p>年级升级</p>
diff --git a/resources/mybatis1/sunvote/TestPaperInfoMapper.xml b/resources/mybatis1/sunvote/TestPaperInfoMapper.xml
index 1c71d75..f65149d 100644
--- a/resources/mybatis1/sunvote/TestPaperInfoMapper.xml
+++ b/resources/mybatis1/sunvote/TestPaperInfoMapper.xml
@@ -281,6 +281,7 @@
 		LEFT JOIN sv_paperquestion ON sv_testpaperinfo.QUESTION_ID = sv_paperquestion.QUESTION_ID
 		WHERE
 			sv_testpaperinfo.TEST_ID = #{TEST_ID}
+			AND sv_student.ID IS NOT NULL
 		ORDER BY
 			sv_testpaperinfo.STUDENT_ID,
 			(sv_paperquestion.RANK * 1)
diff --git a/src/com/fh/controller/sunvote/report/ReportController.java b/src/com/fh/controller/sunvote/report/ReportController.java
index 2886129..87e345b 100644
--- a/src/com/fh/controller/sunvote/report/ReportController.java
+++ b/src/com/fh/controller/sunvote/report/ReportController.java
@@ -1,5 +1,6 @@
 package com.fh.controller.sunvote.report;
 
+import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Comparator;
@@ -101,8 +102,8 @@ public class ReportController extends BaseController {
 		List<PageData> testpaperList = new ArrayList();
 		List<PageData> studentList = new ArrayList();
 		PageData studentPd = null;
-		float totalScore = 0 ;
-		float getScore = 0 ;
+		double totalScore = 0 ;
+		double getScore = 0 ;
 		for(PageData item : reportData){
 			
 			// 学生列表
@@ -117,14 +118,14 @@ public class ReportController extends BaseController {
 				String totalScoreStr = item.getString("TOTAL_SCORE");
 				if(totalScoreStr != null){
 					try{
-						totalScore +=Float.parseFloat(totalScoreStr);
+						totalScore = new BigDecimal(totalScoreStr).add(new BigDecimal(Double.toString(totalScore))).doubleValue();
 					}catch(Exception ex){
 						logger.info(ex);
 					}
 				}
 				if(score != null){
 					try{
-						getScore += Float.parseFloat(score);
+						getScore = new BigDecimal(score).add(new BigDecimal(Double.toString(getScore))).doubleValue();
 					}catch(Exception ex){
 						logger.info(ex);
 					}
@@ -149,14 +150,14 @@ public class ReportController extends BaseController {
 				String totalScoreStr = item.getString("TOTAL_SCORE");
 				if(totalScoreStr != null){
 					try{
-						totalScore += Float.parseFloat(totalScoreStr);
+						totalScore = new BigDecimal(totalScoreStr).add(new BigDecimal(Double.toString(totalScore))).doubleValue();
 					}catch(Exception ex){
 						logger.info(ex);
 					}
 				}
 				if(score != null){
 					try{
-						getScore += Float.parseFloat(score);
+						getScore = new BigDecimal(score).add(new BigDecimal(Double.toString(getScore))).doubleValue();
 					}catch(Exception ex){
 						logger.info(ex);
 					}