Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
===================================================================
diff -u -r35080 -r35081
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java	(.../JasperReportManagerImpl.java)	(revision 35080)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java	(.../JasperReportManagerImpl.java)	(revision 35081)
@@ -29340,13 +29340,15 @@
 		String handleDepartCoding = supplyRoomConfigManager.getFirstSupplyRoomConfig().getOrgUnitCoding();
 		String tousseType = "外来器械包,外来器械拆分小包";
 		String tousseTypesql = SqlUtils.getWhereSqlByfilterFieldAndStringValueAndSeparator("td.tousseType", tousseType, ",");
-		ReportQueryParams foreignParams = new ReportQueryParams(objectDao);
+		ReportQueryParams foreignParams = new ReportQueryParams();
+		foreignParams.haveCombo = false;
 		foreignParams.betweenSql = betweenSql;
 		foreignParams.querySupplyRoom = handleDepartCoding;
 		foreignParams.tousseTypes = tousseType;
 		foreignParams.tousseTypeAndPackageSizeSql = tousseTypesql;
 		
-		ReportQueryParams params = new ReportQueryParams(objectDao);
+		ReportQueryParams params = new ReportQueryParams();
+		params.haveCombo = false;
 		params.betweenSql = betweenSql;
 		params.querySupplyRoom = handleDepartCoding;
 		String sql = "";
@@ -29516,10 +29518,6 @@
 	}
 	@Override
 	public List<JSONObject> getEquipmentData() {
-		String handleDepartCoding = supplyRoomConfigManager.getFirstSupplyRoomConfig().getOrgUnitCoding();
-		if(StringUtils.isBlank(handleDepartCoding)){
-			return new ArrayList<JSONObject>();
-		}
 		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='"
@@ -29530,11 +29528,12 @@
 				+ WashAndDisinfectRecord.STATUS_WASHING
 				+"') dateStr,r.name from "
 				+ Rinser.class.getSimpleName() 
-				+" r where r.orgUnitCoding='"
-				+ handleDepartCoding 
-				+"' and r.useStatus='"
+				+" r where  r.useStatus='"
 				+ Rinser.USESTATUS_IN_USE
-				+"' union all select 2 orderNum,case when exists (select id from "
+				+"' and r.orgUnitCoding in (select max(orgUnitCoding) from "
+				+ SupplyRoomConfig.class.getSimpleName() 
+				+" where supplyRoomType=1) "
+				+ "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
@@ -29544,11 +29543,12 @@
 				+ SterilizationRecord.STERILIZATION_STATUS_BEGIN
 				+"') dateStr,s.name from "
 				+ Sterilizer.class.getSimpleName() 
-				+" s where s.orgUnitCoding='"
-				+ handleDepartCoding 
-				+"' and s.useStatus='"
+				+" s where s.useStatus='"
 				+ Sterilizer.USESTATUS_IN_USE
-				+"' ) t order by orderNum, name ";
+				+"' and s.orgUnitCoding in (select max(orgUnitCoding) from "
+				+ SupplyRoomConfig.class.getSimpleName() 
+				+" where supplyRoomType=1) "
+				+ ") t order by orderNum, name ";
 		List<JSONObject> arr = new ArrayList<JSONObject>();
 		setEquipmentData(arr, sql);
 		return arr;