Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
===================================================================
diff -u -r27952 -r27955
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java	(.../JasperReportManagerImpl.java)	(revision 27952)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java	(.../JasperReportManagerImpl.java)	(revision 27955)
@@ -7814,9 +7814,9 @@
 			String endDate, String tousseName, String orgUnit,String tousseType) {
 		
 		List<DepartMentTousseOperate> toList = new ArrayList<DepartMentTousseOperate>();
-		Map<String,DepartMentTousseOperate> operateMap = new HashMap<String,DepartMentTousseOperate>();
-		Map<String,DepartMentTousseOperate_child> toMap = new HashMap<String,DepartMentTousseOperate_child>();
-		Map<String,DepartMentTousseOperate_recycChild> recycToMap = new HashMap<String,DepartMentTousseOperate_recycChild>();
+		Map<String,DepartMentTousseOperate> operateMap = new LinkedHashMap<String,DepartMentTousseOperate>();
+		Map<String,DepartMentTousseOperate_child> toMap = new LinkedHashMap<String,DepartMentTousseOperate_child>();
+		Map<String,DepartMentTousseOperate_recycChild> recycToMap = new LinkedHashMap<String,DepartMentTousseOperate_recycChild>();
 		
 		String tousseSql = "";
 		String tdSql = "";
@@ -7845,7 +7845,7 @@
 					+" and "+ dateQueryAdapter.dateAdapter(endDate)
 					+" and ip.depart = '"+orgUnit+"' "
 					+ tousseSql
-					+" group by ip.id,ti.tousseName,ip.applicationTime,ti.tousseType";
+					+" group by ip.id,ti.tousseName,ip.applicationTime,ti.tousseType order by ip.applicationTime desc";
 		
 		ResultSet rs = objectDao.executeSql(sql1);
 		
@@ -7870,7 +7870,7 @@
 			DatabaseUtil.closeResultSetAndStatement(rs);
 		}
 		
-		String sql2 = "select rr.recyclingApplication_id as id,po.name as tousseName,rr.recyclingTime,"
+		String sql2 = "select * from (select rr.recyclingApplication_id as id,po.name as tousseName,rr.recyclingTime,"
 					+"sum(ci.amount-case when numOfUnwashedStops is null then 0 else numOfUnwashedStops end) as amount from RecyclingRecord rr,ClassifiedItem ci,TousseDefinition po"
 					+" where rr.id = ci.recyclingRecordId "
 					+" and ci.toussedefinition_id = po.id"
@@ -7889,7 +7889,7 @@
 					+" and "+ dateQueryAdapter.dateAdapter(endDate)
 					+" and rr.depart = '"+orgUnit+"'"
 					+ tdSql
-					+" group by rr.recyclingApplication_id,po.name,rr.recyclingTime";
+					+" group by rr.recyclingApplication_id,po.name,rr.recyclingTime )t order by t.recyclingTime desc  ";
 		
 		ResultSet rs2 = objectDao.executeSql(sql2);