Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
===================================================================
diff -u -r35058 -r35080
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java	(.../JasperReportManagerImpl.java)	(revision 35058)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java	(.../JasperReportManagerImpl.java)	(revision 35080)
@@ -29520,7 +29520,7 @@
 		if(StringUtils.isBlank(handleDepartCoding)){
 			return new ArrayList<JSONObject>();
 		}
-		String rinserSql = " select case when exists (select wr.id from "
+		String sql = " select status,dateStr,name from (select 1 orderNum,case when exists (select wr.id from "
 				+ WashAndDisinfectRecord.class.getSimpleName() 
 				+" wr where wr.rinserId=r.id and wr.washStatus='"
 				+ WashAndDisinfectRecord.STATUS_WASHING
@@ -29534,8 +29534,7 @@
 				+ handleDepartCoding 
 				+"' and r.useStatus='"
 				+ Rinser.USESTATUS_IN_USE
-				+"' order by r.name ";
-		String sterilizerSql = " select case when exists (select id from "
+				+"' union all select 2 orderNum,case when exists (select id from "
 				+ SterilizationRecord.class.getSimpleName() 
 				+" sr where sr.sterilizer_id=s.id and sr.status='"
 				+ SterilizationRecord.STERILIZATION_STATUS_BEGIN
@@ -29549,10 +29548,9 @@
 				+ handleDepartCoding 
 				+"' and s.useStatus='"
 				+ Sterilizer.USESTATUS_IN_USE
-				+"' order by s.name";
+				+"' ) t order by orderNum, name ";
 		List<JSONObject> arr = new ArrayList<JSONObject>();
-		setEquipmentData(arr, rinserSql);
-		setEquipmentData(arr, sterilizerSql);
+		setEquipmentData(arr, sql);
 		return arr;
 	}
 	/**