diff --git a/greenH5modul/src/com/jysoft/card/service/NewCardService.java b/greenH5modul/src/com/jysoft/card/service/NewCardService.java
index 8be6f26..bdc70e5 100644
--- a/greenH5modul/src/com/jysoft/card/service/NewCardService.java
+++ b/greenH5modul/src/com/jysoft/card/service/NewCardService.java
@@ -409,7 +409,7 @@ public class NewCardService {
 			String sql = " SELECT gc.DATA_ID AS \"dataId\",MAX(gc.CARD_TYPE) AS \"carType\",MAX(gc.TYPE_NAME) AS \"typeName\","
 					+ " MAX(gc.IS_ENABLE_FACE) AS \"isEnableFace\",MAX(gc.APPLY_TIME) AS \"applyTime\","
 					+ " MAX(gc.EXAMINE_BATCH) AS \"examineBatch\",MAX(gc.EXAMINE_STATE) AS \"examineState\","
-					+ " MAX(gc.CHECK_ID) AS \"checkId\",MAX(gc.CHECK_ROLE) AS \"checkRole\","
+					+ " MAX(gc.CHECK_ID) AS \"checkId\",MAX(gc.CHECK_ROLE) AS \"checkRole\",MAX(gc.USER_NAME) AS \"userName\","
 					+ " MAX(gc.EXAMINE_PERSON_ID) AS \"checkUserId\",MAX(gc.OPER_TYPE) AS \"operType\""
 					+ " FROM GREEN_CARD gc" + " WHERE gc.DATA_ID = ?" + " GROUP BY gc.DATA_ID";
 			System.err.println(sql);
@@ -475,7 +475,7 @@ public class NewCardService {
 					+ " gc.APPLY_TYPE AS \"applyType\",gc.APPLY_TERM AS \"applyTerm\",gc.DATA_ID AS \"dataId\","
 					+ " gc.EXAMINE_BATCH AS \"examineBatch\",gc.EXAMINE_STATE AS \"examineState\","
 					+ " gc.CHECK_ID AS \"checkId\",gc.CHECK_ROLE AS \"checkRole\",gc.EXAMINE_PERSON_ID AS \"checkUserId\","
-					+ " gc.OPER_TYPE AS \"operType\""
+					+ " gc.OPER_TYPE AS \"operType\",gc.USER_NAME AS \"userName\""
 					+ " FROM GREEN_CARD gc" + " WHERE gc.DATA_ID = ?";
 			System.err.println(sql);
 			parameter.add(vo.getDataId());
@@ -546,7 +546,7 @@ public class NewCardService {
 					+ " gc.LEND_TIME AS \"lendTime\",gc.BACK_TIME AS \"backTime\","
 					+ " gc.ACTUAL_BACK_TIME AS \"actualBackTime\",gc.REMARK AS \"remark\","
 					+ " gc.CHECK_ID AS \"checkId\",gc.CHECK_ROLE AS \"checkRole\",gc.EXAMINE_PERSON_ID AS \"checkUserId\","
-					+ " gc.OPER_TYPE AS \"operType\""
+					+ " gc.OPER_TYPE AS \"operType\",gc.USER_NAME AS \"userName\""
 					+ " FROM GREEN_CARD gc"
 					+ " WHERE gc.DATA_ID = ?";
 			System.err.println(sql);
@@ -592,7 +592,7 @@ public class NewCardService {
 					+ " MAX(gc.CONTRACT_START_TIME) AS \"contractStartTime\",MAX(gc.CONTRACT_END_TIME) AS \"contractEndTime\","
 					+ " MAX(gc.CARD_START_TIME) AS \"cardStartTime\",MAX(gc.CARD_END_TIME) AS \"cardEndTime\","
 					+ " MAX(gc.ACCESS_AREA) AS \"accessArea\",MAX(gc.BZ_NUM) AS \"bzNum\","
-					+ " MAX(gc.CHECK_ID) AS \"checkId\",MAX(gc.CHECK_ROLE) AS \"checkRole\","
+					+ " MAX(gc.CHECK_ID) AS \"checkId\",MAX(gc.CHECK_ROLE) AS \"checkRole\",MAX(gc.USER_NAME) AS \"userName\","
 					+ " MAX(gc.EXAMINE_PERSON_ID) AS \"checkUserId\",MAX(gc.OPER_TYPE) AS \"operType\""
 					+ " FROM GREEN_CARD gc"
 					+ " WHERE gc.DATA_ID = ? GROUP BY gc.DATA_ID";
@@ -649,7 +649,8 @@ public class NewCardService {
 					+ " MAX(gc.CARD_START_TIME) AS \"cardStartTime\",MAX(gc.CARD_END_TIME) AS \"cardEndTime\","
 					+ " MAX(gc.ACCESS_AREA) AS \"accessArea\",MAX(gc.CAR_NUM) AS \"carNum\",MAX(gc.TICKET_NO) AS \"ticketNo\","
 					+ " MAX(gc.WORK_CONTENT) AS \"workContent\",MAX(gc.OPER_TYPE) AS \"operType\","
-					+ " MAX(gc.CHECK_ID) AS \"checkId\",MAX(gc.CHECK_ROLE) AS \"checkRole\",MAX(gc.EXAMINE_PERSON_ID) AS \"checkUserId\""
+					+ " MAX(gc.CHECK_ID) AS \"checkId\",MAX(gc.CHECK_ROLE) AS \"checkRole\",MAX(gc.EXAMINE_PERSON_ID) AS \"checkUserId\","
+					+ " MAX(gc.USER_NAME) AS \"userName\""
 					+ " FROM GREEN_CARD gc WHERE gc.DATA_ID = ? GROUP BY gc.DATA_ID";
 			parameter.add(vo.getDataId());
 			dataList = iHibernateDao.queryForListWithSql(sql.toString(), parameter.toArray(),
@@ -778,7 +779,8 @@ public class NewCardService {
 			String sql = " SELECT * FROM (SELECT ROWNUM num,A.* FROM ( "
 					+ " SELECT * FROM (SELECT MAX(gc.DATA_ID) AS \"dataId\",MAX(gc.CARD_TYPE) AS \"carType\","
 					+ " MAX(gc.TYPE_NAME) AS \"typeName\",MAX(gc.APPLY_TIME) AS \"applyTime\","
-					+ " MAX(gc.EXAMINE_BATCH) AS \"examineBatch\",MAX(gc.EXAMINE_STATE) AS \"examineState\""
+					+ " MAX(gc.EXAMINE_BATCH) AS \"examineBatch\",MAX(gc.EXAMINE_STATE) AS \"examineState\","
+					+ " MAX(CARD_STATUS) AS \"cardStatus\""
 					+ " FROM GREEN_CARD gc "
 					+ " WHERE gc.USER_ID = ? GROUP BY gc.DATA_ID) B ORDER BY B.\"applyTime\" DESC) " + " A WHERE ROWNUM<=?) WHERE  num > ?";
 			System.err.println(sql);
@@ -1241,12 +1243,12 @@ public class NewCardService {
 					+ " SELECT * FROM ("
 					+ " SELECT MAX(gc.DATA_ID) AS \"dataId\",MAX(gc.CARD_TYPE) AS \"carType\","
 					+ " MAX(gc.TYPE_NAME) AS \"typeName\",MAX(gc.APPLY_TIME) AS \"applyTime\","
-					+ " MAX(gc.EXAMINE_BATCH) AS \"examineBatch\",MAX(gc.EXAMINE_STATE) AS \"examineState\""
+					+ " MAX(gc.EXAMINE_BATCH) AS \"examineBatch\",MAX(gc.EXAMINE_STATE) AS \"examineState\","
+					+ " MAX(gc.CARD_STATUS) AS \"cardStatus\",MAX(gc.USER_NAME) AS \"userName\""
 					+ " FROM GREEN_CARD gc "
 					+ " WHERE (gc.EXAMINE_BATCH = '1' AND gc.EXAMINE_STATE = '0' AND gc.EXAMINE_PERSON_ID = ?) OR"
-					+ " (gc.EXAMINE_BATCH IN ('2','3') AND gc.EXAMINE_STATE = '0' AND gc.CHECK_ROLE IN ("+handlePlaceholder(aduitRoles)+")) OR"
-					+ "	(gc.CARD_TYPE = '第三方人员' AND gc.EXAMINE_BATCH = '4' AND gc.EXAMINE_STATE = '0' AND gc.CHECK_ROLE IN ("+handlePlaceholder(aduitRoles)+")) OR"
-					+ " (gc.CARD_TYPE != '第三方人员' AND gc.EXAMINE_BATCH = '4' AND gc.EXAMINE_STATE = '0' AND gc.OPER_CARD_ID = ?)"
+					+ " (gc.EXAMINE_BATCH != '1' AND gc.OPER_TYPE = '2' AND gc.EXAMINE_STATE = '0' AND gc.OPER_CARD_ID = ?) OR"
+					+ " (gc.EXAMINE_BATCH != '1' AND gc.OPER_TYPE IN ('0','1') AND gc.EXAMINE_STATE = '0' AND gc.CHECK_ROLE IN ("+handlePlaceholder(aduitRoles)+")) OR"
 					+ " GROUP BY gc.DATA_ID"
 					+ ") B ORDER BY B.\"applyTime\" DESC) " + " A WHERE ROWNUM <= ?) WHERE  num > ?";
 			System.err.println(sql);
@@ -1255,16 +1257,14 @@ public class NewCardService {
 			Integer page = (pageNum - 1) * pageSize;
 			Integer limit = pageNum * pageSize;
 			parameter.add(userId);
-			for (int j = 0; j < 2; j++) {
-				if(CollectionUtils.isEmpty(aduitRoles)){
-					parameter.add("-1");
-				}else{
-					for (int i = 0; i < aduitRoles.size(); i++) {
-						parameter.add(aduitRoles.get(i));
-					}
+			parameter.add(userId);
+			if(CollectionUtils.isEmpty(aduitRoles)){
+				parameter.add("-1");
+			}else{
+				for (int i = 0; i < aduitRoles.size(); i++) {
+					parameter.add(aduitRoles.get(i));
 				}
 			}
-			parameter.add(userId);
 			parameter.add(limit);
 			parameter.add(page);
 			List<Map<String, Object>> list = iHibernateDao.queryForListWithSql(sql,parameter.toArray());
@@ -1288,7 +1288,8 @@ public class NewCardService {
 					+ " SELECT * FROM ("
 					+ " SELECT MAX(gc.DATA_ID) AS \"dataId\",MAX(gc.CARD_TYPE) AS \"carType\","
 					+ " MAX(gc.TYPE_NAME) AS \"typeName\",MAX(gc.APPLY_TIME) AS \"applyTime\","
-					+ " MAX(gc.EXAMINE_BATCH) AS \"examineBatch\",MAX(gc.EXAMINE_STATE) AS \"examineState\""
+					+ " MAX(gc.EXAMINE_BATCH) AS \"examineBatch\",MAX(gc.EXAMINE_STATE) AS \"examineState\","
+					+ " MAX(gc.CARD_STATUS) AS \"cardStatus\",MAX(gc.USER_NAME) AS \"userName\""
 					+ " FROM GREEN_CARD gc "
 					+ "	LEFT JOIN GREEN_CARD_EXAMINE gce ON gc.ID = gce.CARD_ID "
 					+ " WHERE (gc.CARD_TYPE IN ('职工卡','第三方人员') AND gce.USER_ID = ? ) OR"