diff --git a/WebRoot/WEB-INF/jsp/sunvote/teacher/creat_question.jsp b/WebRoot/WEB-INF/jsp/sunvote/teacher/creat_question.jsp
index 451ed96..848b8af 100644
--- a/WebRoot/WEB-INF/jsp/sunvote/teacher/creat_question.jsp
+++ b/WebRoot/WEB-INF/jsp/sunvote/teacher/creat_question.jsp
@@ -203,7 +203,7 @@
     </div><!-- /.modal-content -->
   </div><!-- /.modal-dialog -->
 </div><!-- /.modal -->
-<div class="loading" style="background:rgba(0,0,0,0.5);width:100%;height:100%;position:absolute;top:0;display:none;">
+<div class="loading" style="background:rgba(0,0,0,0.5);width:100%;height:100%;position:fixed;top:0;display:none;">
 	<img src="../static/images/loading.gif" width="200px" style="position:absolute;top:0;bottom:0;left:0;right:0;margin:auto;"/>
 </div>
 <script>
diff --git a/WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_main.jsp b/WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_main.jsp
index 1b2a223..fa4b97f 100644
--- a/WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_main.jsp
+++ b/WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_main.jsp
@@ -98,7 +98,7 @@
 			</div>
 		</c:forEach>
 		<div class="test">测验</div>
-		<div class="analysis">分析</div>
+		<!-- <div class="analysis">分析</div> -->
 	</div>
 	<div style="width:70%;height:100%;margin-left:30%;" class="content_r">
 		<iframe name="mainFrame" id="mainFrame" frameborder="0" src="paper/list2.do?" ></iframe>
@@ -212,9 +212,9 @@
 			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(){
+		/* $(".analysis").click(function(){
 			$(".content_r").html('<img src="static/images/analysis.png" width="100%" />');
-		})
+		}) */
 	</script>
 	
 </body>
diff --git a/WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_report_test.jsp b/WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_report_test.jsp
index c3be58b..8d45d9f 100644
--- a/WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_report_test.jsp
+++ b/WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_report_test.jsp
@@ -33,15 +33,15 @@
 			<input type="hidden" name="CLASSID" id="CLASSID" value="${info.CLASS_ID}" />
 			<table style="margin-top:5px;">
 				<tr>
-					<td>试卷名称: ${info.testsize}</td>
+					<td>试卷名称: ${testpaperInfo.NAME}</td>
 				</tr>
 				<tr>
-					<td>收卷时间: ${info.CLASS_NAME}</td>
+					<td>收卷时间: ${testpaperInfo.END_DATE}</td>
 				</tr>
 				<tr>
-					<td>班级名册：${info.CLASS_NAME}</td>
+					<td>班级名册：${classInfo.CLASS_NAME}</td>
 					<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>
-					<td><span>学生人数: ${info.STUDENT_NUM}</span></td>
+					<td><span>学生人数: ${classInfo.studentNum}</span></td>
 					
 				</tr>
 			</table>
@@ -56,8 +56,8 @@
 						<th class="center">得分</th>
 						<th class="center">正确率</th>
 						<th class="center">排名</th>
-						<c:forEach items="${testpaperList}" var="var" varStatus="vs">
-							<th class="center">${var.NAME}</th>
+						<c:forEach items="${questionInfo}" var="var" varStatus="vs">
+							<th class="center">题目${vs.index+1}</th>
 						</c:forEach>
 						<th class="center">非选择题得分</th>
 						<th class="center">总分</th>
@@ -71,28 +71,30 @@
 						<td class="center"></td>
 						<td class="center"></td>
 						<td class="center"></td>
-						<c:forEach items="${testpaperList}" var="var" varStatus="vs">
-							<td class="center">${var.TOTAL_SCORE}</td>
+						<c:forEach items="${questionInfo}" var="var" varStatus="vs">
+							<td class="center"><fmt:formatNumber type="number"
+									value="${var == 0 ? 0: (var / classInfo.studentNum * 100)}"
+									maxFractionDigits="1" />%</td>
 						</c:forEach>
 						<td class="center"></td>
 						<td class="center"></td>
 					</tr>
 
 					<c:choose>
-						<c:when test="${not empty studentList}">
-							<c:forEach items="${studentList}" var="var" varStatus="vs">
+						<c:when test="${not empty studentInfo}">
+							<c:forEach items="${studentInfo}" var="var" varStatus="vs">
 								<tr>
-									<td class="center"><a
-										href="<%=basePath%>report/student_report。do?studentid=${var.ID}">${var.NAME}</a>
-									</td>
-									<td class="center"><fmt:formatNumber type="number"
-											value="${var.TOTALSCORE == 0 ? 0: (var.GETSCORE / var.TOTALSCORE * 100)}"
-											maxFractionDigits="1" />%</td>
-									<td class="center">${var.GETSCORE }</td>
-									<c:forEach items="${testpaperList}" var="var1" varStatus="vs1">
-										<td class="center"><c:set var="TEST_ID"
-												value="${var1.TESTPAPER_ID}" /> ${var[TEST_ID] }</td>
+									<td class="center">${var.KEYPAD_ID}</td>
+									<td class="center">${var.SNO}</td>
+									<td class="center">${var.NAME}</td>
+									<td class="center">${var.GETSCORE}</td>
+									<td class="center">${var.RIGHT}</td>
+									<td class="center">${vs.index + 1}</td>
+									<c:forEach items="${questionInfo}" var="var1" varStatus="vs1">
+										<td class="center">${var.detail[vs1.index].ANSWER}</td>
 									</c:forEach>
+									<td class="center">${var.OTHER_SCORE}</td>
+									<td class="center">${var.GETSCORE}</td>
 								</tr>
 							</c:forEach>
 						</c:when>
diff --git a/WebRoot/WEB-INF/jsp/system/index/head.jsp b/WebRoot/WEB-INF/jsp/system/index/head.jsp
index 0b25a70..6d7837e 100644
--- a/WebRoot/WEB-INF/jsp/system/index/head.jsp
+++ b/WebRoot/WEB-INF/jsp/system/index/head.jsp
@@ -65,7 +65,7 @@
 								<!-- <li>
 									<a onclick="editPhoto();" style="cursor:pointer;"><i class="ace-icon glyphicon glyphicon-picture"></i>修改头像</a>editUserH()在 WebRoot\static\js\myjs\head.js中
 								</li> -->
-								<li>
+								<li style="display:none">
 									<a onclick="editUserH();" style="cursor:pointer;"><i class="ace-icon fa fa-user"></i>修改资料</a><!-- editUserH()在 WebRoot\static\js\myjs\head.js中 -->
 								</li>
 								<li id="systemset" style="display:none" >
diff --git a/WebRoot/static/js/control1.js b/WebRoot/static/js/control1.js
index 794dc37..e38a0e9 100644
--- a/WebRoot/static/js/control1.js
+++ b/WebRoot/static/js/control1.js
@@ -9,8 +9,12 @@
 		  if (r != null) return unescape(r[2]); return null;
 	  	}
 	function getData(startDate,endDate){
+		var attend = "" ;
+		if(startDate != null && endDate != null){
+			attend = "&start_Date="+startDate+"&end_Date="+endDate;
+		}
 		$.ajax({
-			url:URL+"&start_Date="+startDate+"&end_Date="+endDate,
+			url:URL+ attend,
 			type:"get",
 			async:false,
 			dataType:"json",
diff --git a/resources/mybatis1/sunvote/TestPaperInfoMapper.xml b/resources/mybatis1/sunvote/TestPaperInfoMapper.xml
index 9964956..d2375e2 100644
--- a/resources/mybatis1/sunvote/TestPaperInfoMapper.xml
+++ b/resources/mybatis1/sunvote/TestPaperInfoMapper.xml
@@ -194,6 +194,24 @@
 		</if>
 	</select>
 	
+	<!-- 列表(全部) -->
+	<select id="reportPaperDetail" parameterType="pd" resultType="pd">
+		SELECT
+			sv_testpaperinfo.QUESTION_ID,
+			sv_testpaperinfo.SCORE,
+			sv_testpaperinfo.ANSWER,
+			sv_testpaperinfo.`RIGHT`,
+			sv_paperquestion.RANK
+			FROM
+				sv_testpaperinfo
+			LEFT JOIN sv_paperquestion ON sv_testpaperinfo.QUESTION_ID = sv_paperquestion.QUESTION_ID
+			WHERE
+				sv_testpaperinfo.STUDENT_ID = #{STUDENT_ID}
+			AND sv_testpaperinfo.TEST_ID = #{TEST_ID}
+			ORDER BY
+				sv_paperquestion.RANK
+	</select>
+	
 	
 	<!-- 批量删除 -->
 	<delete id="deleteAll" parameterType="String">
diff --git a/src/com/fh/controller/sunvote/report/ReportController.java b/src/com/fh/controller/sunvote/report/ReportController.java
index d159b5a..d039c31 100644
--- a/src/com/fh/controller/sunvote/report/ReportController.java
+++ b/src/com/fh/controller/sunvote/report/ReportController.java
@@ -1,5 +1,8 @@
 package com.fh.controller.sunvote.report;
 
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
 import java.util.List;
 
 import javax.annotation.Resource;
@@ -15,6 +18,7 @@ import com.fh.service.sunvote.sclass.SClassManager;
 import com.fh.service.sunvote.student.StudentManager;
 import com.fh.service.sunvote.studenttest.StudentTestManager;
 import com.fh.service.sunvote.testpaper.TestPaperManager;
+import com.fh.service.sunvote.testpaperinfo.TestPaperInfoManager;
 import com.fh.util.Jurisdiction;
 import com.fh.util.PageData;
 
@@ -34,6 +38,9 @@ public class ReportController extends BaseController {
 	@Resource(name="studenttestService")
 	private StudentTestManager studenttestService;
 	
+	@Resource(name="testpaperinfoService")
+	private TestPaperInfoManager testpaperinfoService;
+	
 	
 
 	@RequestMapping(value="/report")
@@ -126,13 +133,13 @@ public class ReportController extends BaseController {
 		List<PageData> testpaperList = testpaperService.listAll(pd);
 		pd.put("ID", pd.get("CLASS_ID"));
 		PageData classPageData = sclassService.findById(pd);
-		int totalScore = 0 ;
-		int avgScore = 0;
+		float totalScore = 0 ;
+		float avgScore = 0;
 		for(PageData testPaperPageData:testpaperList){
 			String totalScoreStr = testPaperPageData.getString("TOTAL_SCORE");
 			if(totalScoreStr != null){
 				try{
-					totalScore += Integer.parseInt(totalScoreStr);
+					totalScore += Float.parseFloat(totalScoreStr);
 				}catch(Exception ex){
 					logger.info(ex);
 				}
@@ -140,15 +147,15 @@ public class ReportController extends BaseController {
 			String avgScoreStr = testPaperPageData.getString("AVG_SCORE");
 			if(avgScoreStr != null){
 				try{
-					avgScore += Integer.parseInt(avgScoreStr);
+					avgScore += Float.parseFloat(avgScoreStr);
 				}catch(Exception ex){
 					logger.info(ex);
 				}
 			}
 			
 		}
-		int allGetScore = 0;
-		int maxScore = 0 ;
+		float allGetScore = 0;
+		float maxScore = 0 ;
 		// 查询学生名单及人数
 		if(studentList != null && studentList.size() > 0){
 			for(PageData studentPageData : studentList){
@@ -163,12 +170,12 @@ public class ReportController extends BaseController {
 				List<PageData> studentTestList = studenttestService.reportListData(search);
 				studentPageData.put("testList", studentTestList);
 				
-				int getScore = 0 ;
+				float getScore = 0 ;
 				for(PageData studentTestPageData:studentTestList){
 					String getScoreStr = studentTestPageData.getString("SCORE");
 					if(getScoreStr != null){
 						try{
-							getScore += Integer.parseInt(getScoreStr);
+							getScore += Float.parseFloat(getScoreStr);
 						}catch(Exception ex){
 							logger.info(ex);
 						}
@@ -212,6 +219,79 @@ public class ReportController extends BaseController {
 	public ModelAndView paper_report() throws Exception{
 		logBefore(logger, Jurisdiction.getUsername()+"测试试卷报表");
 		ModelAndView mv = this.getModelAndView();
+		PageData pd = getPageData();
+		
+		// 查询班级信息
+		pd.put("ID", pd.get("CLASS_ID"));
+		PageData classPageData = sclassService.findById(pd);
+		
+		// 查询测试试卷信息
+		pd.put("TESTPAPER_ID", pd.get("TESTID"));
+		PageData testpaperPd = testpaperService.findById(pd);
+		
+		// 查询班级学生
+		List<PageData> studentList = studentService.listAllClass(pd);
+		List<Integer> questionList = new ArrayList<Integer>();
+		for(PageData studentPd : studentList){
+			
+			// 查询答题情况
+			studentPd.put("TEST_ID", pd.getString("TESTID"));
+			studentPd.put("STUDENT_ID", studentPd.getString("ID"));
+			List<PageData> detail = testpaperinfoService.reportPaperDetail(studentPd);
+			studentPd.put("detail", detail);
+			
+			float score = 0 ;
+			for(int i = 0 ; i < detail.size(); i++){
+				PageData pad = detail.get(i);
+				if("1".equals(pad.getString("RIGHT"))){
+					if (questionList.size() > i) {
+						questionList.set(i, questionList.get(i) + 1);
+					}else{
+						questionList.add(1);
+					}
+				}
+				
+				String scoreStr = pad.getString("SCORE");
+				
+				try{
+					score += Float.parseFloat(scoreStr);
+				}catch(Exception ex){
+					ex.printStackTrace();
+				}
+				
+			}
+			studentPd.put("GETSCORE", score);
+		}
+	
+		
+		Collections.sort(studentList,new Comparator<PageData>(){
+
+			@Override
+			public int compare(PageData o1, PageData o2) {
+				String o1GetScore = o1.getString("GETSCORE");
+				String o2GetScore = o2.getString("GETSCORE");
+				float o1score = 0 ;
+				float o2score = 0 ;
+				try{
+					o1score = Float.parseFloat(o1GetScore);
+				}catch(Exception e){
+					o1score = -1 ;
+				}
+				try{
+					o2score = Float.parseFloat(o2GetScore);
+				}catch(Exception e){
+					o2score = -1 ;
+				}
+				return  o2score - o1score > 0 ? 1 : -1;
+			}
+			
+		});
+		
+		classPageData.put("studentNum", studentList.size());
+		mv.addObject("classInfo", classPageData);
+		mv.addObject("testpaperInfo", testpaperPd);
+		mv.addObject("questionInfo", questionList);
+		mv.addObject("studentInfo", studentList);
 		
 		mv.setViewName("sunvote/teacher/teacher_report_test");
 		return mv;
diff --git a/src/com/fh/service/sunvote/testpaperinfo/TestPaperInfoManager.java b/src/com/fh/service/sunvote/testpaperinfo/TestPaperInfoManager.java
index 4373258..6b9195b 100644
--- a/src/com/fh/service/sunvote/testpaperinfo/TestPaperInfoManager.java
+++ b/src/com/fh/service/sunvote/testpaperinfo/TestPaperInfoManager.java
@@ -48,6 +48,11 @@ public interface TestPaperInfoManager{
 	 * @throws Exception
 	 */
 	public List<PageData> listAll(PageData pd)throws Exception;
+	/**列表(全部)
+	 * @param pd
+	 * @throws Exception
+	 */
+	public List<PageData> reportPaperDetail(PageData pd)throws Exception;
 	
 	/**通过id获取数据
 	 * @param pd
diff --git a/src/com/fh/service/sunvote/testpaperinfo/impl/TestPaperInfoService.java b/src/com/fh/service/sunvote/testpaperinfo/impl/TestPaperInfoService.java
index 391968b..83e502e 100644
--- a/src/com/fh/service/sunvote/testpaperinfo/impl/TestPaperInfoService.java
+++ b/src/com/fh/service/sunvote/testpaperinfo/impl/TestPaperInfoService.java
@@ -68,6 +68,14 @@ public class TestPaperInfoService implements TestPaperInfoManager{
 	public List<PageData> listAll(PageData pd)throws Exception{
 		return (List<PageData>)dao.findForList("TestPaperInfoMapper.listAll", pd);
 	}
+	/**列表(全部)
+	 * @param pd
+	 * @throws Exception
+	 */
+	@SuppressWarnings("unchecked")
+	public List<PageData> reportPaperDetail(PageData pd)throws Exception{
+		return (List<PageData>)dao.findForList("TestPaperInfoMapper.reportPaperDetail", pd);
+	}
 	
 	/**通过id获取数据
 	 * @param pd
diff --git a/src/com/fh/util/PageData.java b/src/com/fh/util/PageData.java
index b3451a7..68d2281 100644
--- a/src/com/fh/util/PageData.java
+++ b/src/com/fh/util/PageData.java
@@ -87,7 +87,11 @@ public class PageData extends HashMap implements Map{
 	}
 	
 	public String getString(Object key) {
-		return (String)get(key);
+		Object obj = get(key);
+		if(obj != null){
+			return obj.toString();
+		}
+		return "";
 	}
 	
 	@SuppressWarnings("unchecked")