Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
===================================================================
diff -u -r27889 -r27895
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java	(.../JasperReportManagerImpl.java)	(revision 27889)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java	(.../JasperReportManagerImpl.java)	(revision 27895)
@@ -1,9 +1,11 @@
 package com.forgon.disinfectsystem.jasperreports.service;
 
 import java.io.File;
+import java.io.UnsupportedEncodingException;
 import java.lang.annotation.Annotation;
 import java.math.BigDecimal;
 import java.math.RoundingMode;
+import java.net.URLDecoder;
 import java.sql.Connection;
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -7809,7 +7811,11 @@
 		String tdSql = "";
 		String recycSql = "";
 		if(StringUtils.isNotBlank(tousseName)){
-			
+			try {
+				tousseName = URLDecoder.decode(tousseName, "utf-8");
+			} catch (UnsupportedEncodingException e) {
+				e.printStackTrace();
+			}
 			if(TousseDefinition.PACKAGE_TYPE_DISINFECTION.equals(tousseType)){
 				tousseName = tousseName.replace("[", "[[]");
 				tousseSql = " and ti.tousseName like '%"+tousseName+"%'";
Index: ssts-operationmonitor/src/main/java/com/forgon/disinfectsystem/supplyroomcontrol/service/SupplyRoomControlManagerImpl2.java
===================================================================
diff -u -r27833 -r27895
--- ssts-operationmonitor/src/main/java/com/forgon/disinfectsystem/supplyroomcontrol/service/SupplyRoomControlManagerImpl2.java	(.../SupplyRoomControlManagerImpl2.java)	(revision 27833)
+++ ssts-operationmonitor/src/main/java/com/forgon/disinfectsystem/supplyroomcontrol/service/SupplyRoomControlManagerImpl2.java	(.../SupplyRoomControlManagerImpl2.java)	(revision 27895)
@@ -78,7 +78,7 @@
         try {
             String selectSql = raRoomControlHelper.buildSelectSql(supplyRoomVo);
             String whereSql = raRoomControlHelper.buildWhereSql(supplyRoomVo);
-            String sql = "select * from (" + selectSql + whereSql + " order by po.\"applicationTime\" ";
+            String sql = "select * from (" + selectSql + whereSql + " order by po.\"applicationTime\" desc ";
             String countSql = "select count(*), sum(po.\"amount\"), sum(po.\"recyclingAmount\") from (";
             if (TousseDefinition.PACKAGE_TYPE_DRESSING.equals(supplyRoomVo.getTousseType()) || DisposableGoods.TYPE_NAME.equals(supplyRoomVo.getTousseType())) {
             	countSql = "select count(*), sum(po.\"amount\"), 0 from (";
@@ -134,7 +134,7 @@
             String whereSql = rvRoomControlHelper.buildWhereSql(supplyRoomVo);
             Map<String, Object> countSqlS = rvRoomControlHelper.getCountSqlS(whereSql);
             whereSql += " group by po.tousseName,po.reviewer,po.reviewTime,po.sterilizationBasket";
-            selectSql += whereSql;
+            selectSql += whereSql + " order by po.reviewTime desc ";
             logger.debug("[sql]:" + selectSql);
             return this.getResult(rvRoomControlHelper, selectSql, countSqlS);
         }
@@ -150,7 +150,7 @@
             String selectSql = stRoomControlHelper.buildSelectSql(supplyRoomVo);
             String whereSql = stRoomControlHelper.buildWhereSql(supplyRoomVo);
             Map<String, Object> countSqlS = stRoomControlHelper.getCountSqlS(whereSql);
-            selectSql += whereSql;
+            selectSql += whereSql + " order by startDate desc ";
             logger.debug("[sql]:" + selectSql);
             return this.getResult(stRoomControlHelper, selectSql, countSqlS);
         }
@@ -166,7 +166,7 @@
             String selectSql = ipRoomControlHelper.buildSelectSql(supplyRoomVo);
             String whereSql = ipRoomControlHelper.buildWhereSql(supplyRoomVo);
             String countSql = "select count(*),sum(po.amount),1 ";
-            selectSql += whereSql;
+            selectSql += whereSql + " order by i.sendTime desc ";
             countSql += whereSql;
             logger.debug("[sql]:" + selectSql);
             return this.getResult(ipRoomControlHelper, selectSql, countSql);
Index: ssts-operationmonitor/src/main/java/com/forgon/disinfectsystem/supplyroomcontrol/service/SupplyRoomControlManagerImpl.java
===================================================================
diff -u -r27800 -r27895
--- ssts-operationmonitor/src/main/java/com/forgon/disinfectsystem/supplyroomcontrol/service/SupplyRoomControlManagerImpl.java	(.../SupplyRoomControlManagerImpl.java)	(revision 27800)
+++ ssts-operationmonitor/src/main/java/com/forgon/disinfectsystem/supplyroomcontrol/service/SupplyRoomControlManagerImpl.java	(.../SupplyRoomControlManagerImpl.java)	(revision 27895)
@@ -634,7 +634,7 @@
 		Integer [] amountArray = countBySql( amountSql + sql );
 		
 		List<PackingTask> tasksList = objectDao.findBySql(
-				PackingTask.class.getSimpleName(), sql, Integer.parseInt(currentPage), Integer.parseInt(pageSize), null);
+				PackingTask.class.getSimpleName(), sql, Integer.parseInt(currentPage), Integer.parseInt(pageSize), "startTime desc ");
 		
 		Map PackingMap = new HashMap();
 		PackingMap.put("totalCount", amountArray[0]);
@@ -721,7 +721,7 @@
 		
 		Integer [] amountArry = countBySql( countSql + sql );
 		List<TousseInstance> tousseInstanceList = objectDao.findBySql(
-				TousseInstance.class.getSimpleName(), sql, Integer.parseInt(currentPage), Integer.parseInt(pageSize), null);
+				TousseInstance.class.getSimpleName(), sql, Integer.parseInt(currentPage), Integer.parseInt(pageSize), "operationTime desc");
 		Map ReviewMap = new HashMap();
 		ReviewMap.put("totalCount", amountArry[0]);
 		ReviewMap.put("totalReviewAmount", amountArry[1]);