Index: ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordListSqlGenerator.java
===================================================================
diff -u -r13934 -r13942
--- ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordListSqlGenerator.java	(.../RecyclingRecordListSqlGenerator.java)	(revision 13934)
+++ ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordListSqlGenerator.java	(.../RecyclingRecordListSqlGenerator.java)	(revision 13942)
@@ -137,22 +137,22 @@
 			
 			String tempSql = "(SELECT TOP "
 					+ end
-					+ " r.*,p.type,p.remark FROM RecyclingRecord r left join InvoicePlan p on r.recyclingApplication_id = p.id where p.handleDepartCoding = '"
+					+ " r.*,p.type,p.remark FROM RecyclingRecord r left join InvoicePlan p on r.recyclingApplication_id = p.id where r.orgUnitCoding = '"
 					+ orgUnitCodingFromSupplyRoomConfig
 					+ "' and " 
 					+ filterSql
 					+ " order by recyclingTime desc) A";
 			String tempSql2 = "(SELECT TOP "
 					+ (start - 1)
-					+ " r.id FROM RecyclingRecord r left join InvoicePlan p on r.recyclingApplication_id = p.id where p.handleDepartCoding = '"
+					+ " r.id FROM RecyclingRecord r left join InvoicePlan p on r.recyclingApplication_id = p.id where r.orgUnitCoding = '"
 					+ orgUnitCodingFromSupplyRoomConfig
 					+ "' and " 
 					+ filterSql
 					+ " order by recyclingTime desc)";
 			sql = "SELECT TOP 20 * FROM " + tempSql + " WHERE id not in "
 					+ tempSql2;
 		} else if (dbConnection.isOracle()) {
-			sql = "SELECT * FROM (SELECT A.*, ROWNUM RN FROM (SELECT r.*,p.type,p.remark FROM RecyclingRecord r left join InvoicePlan p on r.recyclingApplication_id = p.id where p.handleDepartCoding = '"
+			sql = "SELECT * FROM (SELECT A.*, ROWNUM RN FROM (SELECT r.*,p.type,p.remark FROM RecyclingRecord r left join InvoicePlan p on r.recyclingApplication_id = p.id where r.orgUnitCoding = '"
 					+ orgUnitCodingFromSupplyRoomConfig
 					+ "' and " 
 					+ filterSql
@@ -165,7 +165,7 @@
 	
 	public String getCountSql(){
 		String countSql = "select count(*) from RecyclingRecord r left join InvoicePlan p on r.recyclingApplication_id = p.id" 
-				+ " where p.handleDepartCoding = '" 
+				+ " where r.orgUnitCoding = '" 
 				+ AcegiHelper.getLoginUser().getOrgUnitCodingFromSupplyRoomConfig() 
 				+ "' and " 
 				+ filterSql;