diff --git a/WebRoot/WEB-INF/jsp/sunvote/paper/paper_list4.jsp b/WebRoot/WEB-INF/jsp/sunvote/paper/paper_list4.jsp
index df1d39c..4a27619 100644
--- a/WebRoot/WEB-INF/jsp/sunvote/paper/paper_list4.jsp
+++ b/WebRoot/WEB-INF/jsp/sunvote/paper/paper_list4.jsp
@@ -44,7 +44,20 @@
 			</div>
 			<div class="head_box_r">
 				<input type="hidden" name="SCHOOL_ID" id="PAPER_ID" value="${pd.SCHOOL_ID}"/>
-				
+				 <label>年级: </label>&nbsp;&nbsp;
+			      <select name="grade_id" id="grade_id" data-placeholder="这里输入所属年级">
+			      		<option value="">全部</option>
+						<c:forEach items="${gradeInfos}" var="var" varStatus="vs">
+							<option value="${var.GRADE_ID}">${var.GNAME}</option>
+						</c:forEach>
+				</select>
+				<label>科目: </label>&nbsp;&nbsp;
+			    <select name="subject_id" id="subject_id" data-placeholder="这里输入所属科目">
+			    		<option value="">全部</option>
+						<c:forEach items="${subjectInfos}" var="var" varStatus="vs">
+							<option value="${var.SUBJECT_ID}">${var.SCNAME}</option>
+						</c:forEach>
+				</select>&nbsp;&nbsp;&nbsp;&nbsp;
 				<input class="date-picker" type="text" placeholder="开始日期" name="lastStart" id="lastStart" data-date-format="yyyy-mm-dd" readonly="readonly" value="${pd.LASTSTART }"/> 
 				<input type="text" class="date-picker" placeholder="结束日期" name="lastEnd" name="lastEnd" data-date-format="yyyy-mm-dd" readonly="readonly" value="${pd.LASTEND}"/>
 				 <a href="#" onclick="tosearch();"><img
diff --git a/resources/mybatis1/sunvote/PaperMapper.xml b/resources/mybatis1/sunvote/PaperMapper.xml
index db9d5ad..bd05a9e 100644
--- a/resources/mybatis1/sunvote/PaperMapper.xml
+++ b/resources/mybatis1/sunvote/PaperMapper.xml
@@ -138,6 +138,13 @@
 		<if test="pd.PAPER_TYPE != null and pd.PAPER_TYPE != ''"><!-- 关键词检索 -->
 			and PAPER_TYPE = #{pd.PAPER_TYPE}
 		</if>
+		
+		<if test="pd.SUBJECT_ID != null and pd.SUBJECT_ID != ''"><!-- 关键词检索 -->
+			and SUBJECT_ID = #{pd.SUBJECT_ID}
+		</if>
+		<if test="pd.GRADE_ID != null and pd.GRADE_ID != ''"><!-- 关键词检索 -->
+			and GRADE_ID = #{pd.GRADE_ID}
+		</if>
 		<if test="pd.SCHOOL_ID != null and pd.SCHOOL_ID != ''"><!-- 关键词检索 -->
 			and SCHOOL_ID = #{pd.SCHOOL_ID}
 		</if>
diff --git a/src/com/fh/controller/sunvote/paper/PaperController.java b/src/com/fh/controller/sunvote/paper/PaperController.java
index 90d4845..2f2d4ff 100644
--- a/src/com/fh/controller/sunvote/paper/PaperController.java
+++ b/src/com/fh/controller/sunvote/paper/PaperController.java
@@ -363,9 +363,9 @@ public class PaperController extends BaseController {
 		pd.put("PAPER_TYPE","1");
 		page.setPd(pd);
 		List<PageData>	varList = paperService.list(page);	//列出Paper列表
-		pd.put("PAPER_TYPE","2");
-		List<PageData>	varList2 = paperService.list(page);	//列出Paper列表
-		varList.addAll(varList2);
+//		pd.put("PAPER_TYPE","2");
+//		List<PageData>	varList2 = paperService.list(page);	//列出Paper列表
+//		varList.addAll(varList2);
 		mv.setViewName("sunvote/paper/paper_list4");
 		
 		for(PageData p:varList){
@@ -396,6 +396,32 @@ public class PaperController extends BaseController {
 			p.put("EXAM_TIME", examTime);
 		}
 		
+		PageData tpd = new PageData();
+		tpd.put("ID", getUserID());
+		List<PageData> adminInfos = v1Service.getAdminInfo(tpd);
+		List<PageData> gradeInfos = new ArrayList<PageData>();
+		List<PageData> subjectInfos = new ArrayList<PageData>();
+		//  查询学校信息
+		for(PageData pad : adminInfos){
+			PageData tmpd = new PageData();
+			Object gradeId = pad.get("GRADE_ID");
+			tmpd.put("SNAME", pad.get("SNAME"));// 学校名称
+			tmpd.put("SCHOOL_ID", pad.get("SCHOOL_ID"));//学校ID
+			tmpd.put("GRADE_ID", pad.get("GRADE_ID"));//年级id
+			tmpd.put("GNAME", pad.get("GNAME"));//年级名称
+			tmpd.put("SUBJECT_ID", pad.get("SUBJECT_ID"));// 科目id
+			tmpd.put("SCNAME", pad.get("SCNAME"));// 科目名称
+			if(gradeId != null && !"".equals(gradeId)){
+				gradeInfos.add(tmpd);
+			}else{
+				subjectInfos.add(tmpd);
+			}
+			mv.addObject("SNAME", pad.get("SNAME"));
+			mv.addObject("SCHOOL_ID", pad.get("SCHOOL_ID"));
+		}
+		mv.addObject("gradeInfos", gradeInfos);
+		mv.addObject("subjectInfos", subjectInfos);
+		
 		mv.addObject("varList", varList);
 		mv.addObject("pd", pd);
 		mv.addObject("QX",Jurisdiction.getHC());	//按钮权限