diff --git a/servers/boe-server-all/src/main/java/com/xboe/school/study/service/impl/StudyServiceImpl.java b/servers/boe-server-all/src/main/java/com/xboe/school/study/service/impl/StudyServiceImpl.java
index 11731bb0..16fa2805 100644
--- a/servers/boe-server-all/src/main/java/com/xboe/school/study/service/impl/StudyServiceImpl.java
+++ b/servers/boe-server-all/src/main/java/com/xboe/school/study/service/impl/StudyServiceImpl.java
@@ -184,12 +184,11 @@ public class StudyServiceImpl implements IStudyService{
 		}
 		if(status!=null) {
 			if(status==3) {
-				query.addFilter(FieldFilters.eq("status", 2));
-				query.addGroupBy("studyId");
+				query.addFilter(FieldFilters.gt("progress", 0));
+				query.addFilter(FieldFilters.eq("progress", 100));
 				return scItemDao.findPage(query.builder());
 			}else if(status==2){
-				query.addFilter(FieldFilters.eq("status",9));
-				query.addGroupBy("studyId");
+				query.addFilter(FieldFilters.eq("progress",100));
 				return scItemDao.findPage(query.builder());
 			}else if (status == 1) {
 				String sql = "select bsc.id,bsc.course_id,bsc.course_name,bsc.aname,item.content_id,0 as progress,1 as status from boe_study_course bsc " +
@@ -249,14 +248,14 @@ public class StudyServiceImpl implements IStudyService{
 //				" where bsc.course_id = '" + courseId + "' and item.content_id = '"+ contentId+"' group by bsc.id" +
 //				" )group by bsc.id) a group by a.id";
 		String sql = "select a.id, a.course_id, a.course_name, a.aname, " +
-				"IFNULL(b.finish_time, 0) as finish_time, IFNULL(b.progress, 0) as progress, IFNULL(b.status, 1) as status " +
+				"IFNULL(b.finish_time, '0') as finish_time, IFNULL(b.progress, 0) as progress, IFNULL(b.status, 1) as status " +
 				"from (select id, course_id, course_name, aname, 0, 1 from boe_study_course where course_id = '" + courseId + "') a " +
 				"left join " +
 				"(select bsc.id, bsc.course_id, bsc.course_name, bsc.aname, item.finish_time, item.progress, item.status " +
 				"from boe_study_course bsc left join boe_study_course_item item on item.course_id = bsc.course_id and item.study_id = bsc.id " +
 				"where bsc.course_id = '" + courseId + "' and item.content_id = '" + contentId + "' group by bsc.id) b " +
 				"on a.course_id = b.course_id and a.id = b.id " +
-				"group by a.id";
+				"group by a.id limit "+ pageIndex+","+ pageSize+";";
 		String sql2 = "select count(*) as total from (select a.id, a.course_id, a.course_name, a.aname, " +
 				"IFNULL(b.finish_time, 0) as finish_time, IFNULL(b.progress, 0) as progress, IFNULL(b.status, 1) as status " +
 				"from (select id, course_id, course_name, aname, 0, 1 from boe_study_course where course_id = '" + courseId + "') a " +