Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java
===================================================================
diff -u -r25293 -r25301
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java	(.../JasperreportsAction.java)	(revision 25293)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java	(.../JasperreportsAction.java)	(revision 25301)
@@ -43,7 +43,6 @@
 import org.apache.struts2.convention.annotation.ParentPackage;
 import org.apache.struts2.convention.annotation.Result;
 import org.apache.struts2.convention.annotation.Results;
-import org.springframework.beans.factory.annotation.Autowired;
 
 import com.forgon.Constants;
 import com.forgon.databaseadapter.service.DateQueryAdapter;
@@ -88,14 +87,11 @@
 import com.forgon.disinfectsystem.jasperreports.javabeansource.SummaryUseRecordForDepartmentVO;
 import com.forgon.disinfectsystem.jasperreports.javabeansource.TousseSterilizationInspectSituationBean;
 import com.forgon.disinfectsystem.jasperreports.javabeansource.UseRecordOperatorBean;
-import com.forgon.disinfectsystem.jasperreports.javabeansource.WorkQualityCollection;
 import com.forgon.disinfectsystem.jasperreports.javabeansource.YearReportChartBean;
 import com.forgon.disinfectsystem.jasperreports.service.CustomReportsOfDgsfy;
 import com.forgon.disinfectsystem.jasperreports.service.CustomReportsOfZsyy;
 import com.forgon.disinfectsystem.jasperreports.service.JasperReportManager;
 import com.forgon.disinfectsystem.jasperreports.service.WorkQualityCollectionReport;
-import com.forgon.disinfectsystem.jasperreports.service.WorkQualityCollectionReportImpl;
-import com.forgon.disinfectsystem.jasperreports.service.dataindex.DataIndex;
 import com.forgon.disinfectsystem.materialerrordamage.service.MaterialErrorDamageDetailManager;
 import com.forgon.disinfectsystem.recyclingrecord.service.RecyclingItemManager;
 import com.forgon.disinfectsystem.tousse.materialdefinition.service.MaterialDefinitionManager;
@@ -2788,16 +2784,23 @@
 		String endDate = StrutsParamUtils.getPraramValue("endDate", "");
 		
 		String querySupplyRoom = StrutsParamUtils.getPraramValue("querySupplyRoom", "");
-		String sterilizerName = StrutsParamUtils.getPraramValue("sterilizerName", "");
+		String sterilizerNames = StrutsParamUtils.getPraramValue("sterilizerName", "");
 		String sendDepart = StrutsParamUtils.getPraramValue("sendDepart", "");
 		String frequency = StrutsParamUtils.getPraramValue("frequency", "");
 		
+		// 记录排序方式
+		String order = StrutsParamUtils.getPraramValue("sterilizationRecordInfoReportOrder", "desc");
+		
+		if (!"asc".equals(order) && ! "desc".equals(order)){
+			order = "desc";
+		}
+		
 		String sql = "  select ti.sterilizerName,ti.sterileFrequency,ti.tousseName,ti.locationForDisplay,"
 				+ " ti.sterileEndTime,ti.sterilizationUser,count(*) amount from tousseinstance ti ";
 				
   		String endSql = " group by ti.sterilizerName,ti.sterileFrequency,ti.tousseName,"
 		  				+" ti.locationForDisplay,ti.sterileEndTime,ti.sterilizationUser,ti.status"
-		  				+" order by ti.sterileEndTime desc";
+		  				+" order by ti.sterileEndTime " + order;
 		if (StringUtils.isNotBlank(startDate) && StringUtils.isNotBlank(endDate)) {
 			
 			//由于包实例TousseInstance表的sterileStartTime字段并不是date类型而是文本类型,所以改为直接用文件比较判断,虽然效率会低一点,后期优化还需待改造
@@ -2830,9 +2833,9 @@
 			if(StringUtils.isNotBlank(sendDepart)){
 				sql += " and ti.locationForDisplay = '" + sendDepart + "'";
 			}
-			if(StringUtils.isNotBlank(sterilizerName)
-					&& !StringUtils.equals(Constants.STR_ALL, sterilizerName)){
-				sql += " and ti.sterilizerName = '" + sterilizerName + "'";
+			if(StringUtils.isNotBlank(sterilizerNames)
+					&& sterilizerNames.indexOf(Constants.STR_ALL) == -1){
+				sql += SqlUtils.get_InSql("ti.sterilizerName", sterilizerNames.split(","));
 			}
 			if(StringUtils.isNotBlank(frequency)){
 				sql += " and ti.sterileFrequency = '" + frequency + "'";