Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/CustomReportsOfDgsfy.java
===================================================================
diff -u -r30697 -r33526
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/CustomReportsOfDgsfy.java	(.../CustomReportsOfDgsfy.java)	(revision 30697)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/CustomReportsOfDgsfy.java	(.../CustomReportsOfDgsfy.java)	(revision 33526)
@@ -277,7 +277,7 @@
 		//数据库计算字符串长度的函数名
 		String sqlLengthFunctionName = DatabaseUtil.getSqlLengthFunctionName(dbConnection);
 		
-		ReportQueryParams reportParams = new ReportQueryParams();
+		ReportQueryParams reportParams = new ReportQueryParams(objectDao);
 		reportParams.betweenSql = betweenSql;
 		reportParams.querySupplyRoom = querySupplyRoom;
 		reportParams.isDisableIDCardSqlWithAliasOfTousseDefinitionIsTd = "";
@@ -547,7 +547,7 @@
 		//数据库计算字符串长度的函数名
 		String sqlLengthFunctionName = DatabaseUtil.getSqlLengthFunctionName(dbConnection);
 		
-		ReportQueryParams reportParams = new ReportQueryParams();
+		ReportQueryParams reportParams = new ReportQueryParams(objectDao);
 		reportParams.betweenSql = betweenSql;
 		reportParams.querySupplyRoom = querySupplyRoom;
 		reportParams.isDisableIDCardSqlWithAliasOfTousseDefinitionIsTd = "";
@@ -1050,7 +1050,7 @@
 //						   + dateQueryAdapter.dateAdapter(startDate) + " and " + dateQueryAdapter.dateAdapter(endDate)+" and t.orgUnitCoding='" 
 //						   + deptCode + "' group by d.tousseType";
 				
-				ReportQueryParams params = new ReportQueryParams();
+				ReportQueryParams params = new ReportQueryParams(objectDao);
 				params.betweenSql = String.format(" between %s and %s ",
 						dateQueryAdapter.dateAdapter(startDate),
 						dateQueryAdapter.dateAdapter(endDate));
Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/CustomReportsOfZsyy.java
===================================================================
diff -u -r33303 -r33526
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/CustomReportsOfZsyy.java	(.../CustomReportsOfZsyy.java)	(revision 33303)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/CustomReportsOfZsyy.java	(.../CustomReportsOfZsyy.java)	(revision 33526)
@@ -599,7 +599,7 @@
 		addWorkQualityCollectionBean(list,titleName,sql,totalmap);
 		// 专科器械清洗不合格率 	
 		// 总数量 按照器械包定义的器械包分组等于“专科” 的器械材料清洗总件数
-		ReportQueryParams params = new ReportQueryParams();
+		ReportQueryParams params = new ReportQueryParams(objectDao);
 		String betweenSql = String.format(" between %s and %s ", dateQueryAdapter.dateAdapter(queryYear),dateQueryAdapter.dateAdapter(nextYear));
 		params.betweenSql = betweenSql;
 		params.querySupplyRoom = querySupplyRoom;
@@ -1031,7 +1031,7 @@
 		//数据库计算字符串长度的函数名
 		String sqlLengthFunctionName = DatabaseUtil.getSqlLengthFunctionName(dbConnection);
 		
-		ReportQueryParams reportParams = new ReportQueryParams();
+		ReportQueryParams reportParams = new ReportQueryParams(objectDao);
 		reportParams.betweenSql = betweenSql;
 		reportParams.querySupplyRoom = querySupplyRoom;
 		reportParams.isDisableIDCardSqlWithAliasOfTousseDefinitionIsTd = "";
Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/CustomReportsOfXjjqzyy.java
===================================================================
diff -u -r31700 -r33526
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/CustomReportsOfXjjqzyy.java	(.../CustomReportsOfXjjqzyy.java)	(revision 31700)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/CustomReportsOfXjjqzyy.java	(.../CustomReportsOfXjjqzyy.java)	(revision 33526)
@@ -289,7 +289,7 @@
 		String endDay = null;
 		String sql = null;
 		String totalSql = null;
-		ReportQueryParams params = new ReportQueryParams();
+		ReportQueryParams params = new ReportQueryParams(objectDao);
 		//数据库计算字符串长度的函数名
 		String sqlLengthFunctionName = DatabaseUtil.getSqlLengthFunctionName(dbConnection);
 		params.sqlLengthFunctionName = sqlLengthFunctionName;
@@ -862,7 +862,7 @@
 		//数据库计算字符串长度的函数名
 		String sqlLengthFunctionName = DatabaseUtil.getSqlLengthFunctionName(dbConnection);
 		
-		ReportQueryParams reportParams = new ReportQueryParams();
+		ReportQueryParams reportParams = new ReportQueryParams(objectDao);
 		reportParams.betweenSql = betweenSql;
 		reportParams.querySupplyRoom = querySupplyRoom;
 		reportParams.isDisableIDCardSqlWithAliasOfTousseDefinitionIsTd = "";
Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/dataindex/WorkQualityCollectionDataIndex.java
===================================================================
diff -u -r33216 -r33526
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/dataindex/WorkQualityCollectionDataIndex.java	(.../WorkQualityCollectionDataIndex.java)	(revision 33216)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/dataindex/WorkQualityCollectionDataIndex.java	(.../WorkQualityCollectionDataIndex.java)	(revision 33526)
@@ -365,7 +365,7 @@
 				endDay = innerMap.get(keyOfInnerMap);
 			}
 			
-			ReportQueryParams params = new ReportQueryParams();
+			ReportQueryParams params = new ReportQueryParams(objectDao);
 			params.betweenSql = String.format(" between %s and %s ",
 					dateQueryAdapter.dateAdapter(startDay),
 					dateQueryAdapter.dateAdapter(endDay));
@@ -565,7 +565,7 @@
 				startDay = keyOfInnerMap;
 				endDay = innerMap.get(keyOfInnerMap);
 			}
-			ReportQueryParams params = new ReportQueryParams();
+			ReportQueryParams params = new ReportQueryParams(objectDao);
 			params.betweenSql = String.format(" between %s and %s ",
 					dateQueryAdapter.dateAdapter(startDay),
 					dateQueryAdapter.dateAdapter(endDay));
@@ -661,7 +661,7 @@
 				startDay = keyOfInnerMap;
 				endDay = innerMap.get(keyOfInnerMap);
 			}
-			ReportQueryParams params = new ReportQueryParams();
+			ReportQueryParams params = new ReportQueryParams(objectDao);
 			params.betweenSql = String.format(" between %s and %s ",
 					dateQueryAdapter.dateAdapter(startDay),
 					dateQueryAdapter.dateAdapter(endDay));
@@ -760,7 +760,7 @@
 				startDay = keyOfInnerMap;
 				endDay = innerMap.get(keyOfInnerMap);
 			}
-			ReportQueryParams params = new ReportQueryParams();
+			ReportQueryParams params = new ReportQueryParams(objectDao);
 			params.betweenSql = String.format(" between %s and %s ",
 					dateQueryAdapter.dateAdapter(startDay),
 					dateQueryAdapter.dateAdapter(endDay));
@@ -966,7 +966,7 @@
 				startDay = keyOfInnerMap;
 				endDay = innerMap.get(keyOfInnerMap);
 			}
-			ReportQueryParams reportParams = new ReportQueryParams();
+			ReportQueryParams reportParams = new ReportQueryParams(objectDao);
 			//数据库计算字符串长度的函数名
 			String sqlLengthFunctionName = DatabaseUtil.getSqlLengthFunctionName(dbConnection);
 			reportParams.extraQuery = " and ti.proxyDisinfection_id is null ";
@@ -1039,7 +1039,7 @@
 		//数据库计算字符串长度的函数名
 		String sqlLengthFunctionName = DatabaseUtil.getSqlLengthFunctionName(dbConnection);
 		
-		ReportQueryParams reportParams = new ReportQueryParams();
+		ReportQueryParams reportParams = new ReportQueryParams(objectDao);
 		reportParams.betweenSql = betweenSql;
 		reportParams.querySupplyRoom = querySupplyRoom;
 		reportParams.isDisableIDCardSqlWithAliasOfTousseDefinitionIsTd = "";
@@ -1104,7 +1104,7 @@
 				endDay = innerMap.get(keyOfInnerMap);
 			}
 			
-			ReportQueryParams params = new ReportQueryParams();
+			ReportQueryParams params = new ReportQueryParams(objectDao);
 			params.betweenSql = String.format(" between %s and %s ",
 					dateQueryAdapter.dateAdapter(startDay),
 					dateQueryAdapter.dateAdapter(endDay));
@@ -1203,7 +1203,7 @@
 				startDay = keyOfInnerMap;
 				endDay = innerMap.get(keyOfInnerMap);
 			}
-			ReportQueryParams params = new ReportQueryParams();
+			ReportQueryParams params = new ReportQueryParams(objectDao);
 			params.betweenSql = String.format(" between %s and %s ",
 					dateQueryAdapter.dateAdapter(startDay),
 					dateQueryAdapter.dateAdapter(endDay));
@@ -1412,7 +1412,7 @@
 		//数据库计算字符串长度的函数名
 		String sqlLengthFunctionName = DatabaseUtil.getSqlLengthFunctionName(dbConnection);
 		
-		ReportQueryParams reportParams = new ReportQueryParams();
+		ReportQueryParams reportParams = new ReportQueryParams(objectDao);
 		reportParams.extraQuery =" and ti.proxyDisinfection_id is null ";
 		reportParams.betweenSql = betweenSql;
 		reportParams.querySupplyRoom = querySupplyRoom;
Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/WorkQualityCollectionReportImpl.java
===================================================================
diff -u -r30701 -r33526
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/WorkQualityCollectionReportImpl.java	(.../WorkQualityCollectionReportImpl.java)	(revision 30701)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/WorkQualityCollectionReportImpl.java	(.../WorkQualityCollectionReportImpl.java)	(revision 33526)
@@ -234,7 +234,7 @@
 		//数据库计算字符串长度的函数名
 		String sqlLengthFunctionName = DatabaseUtil.getSqlLengthFunctionName(dbConnection);
 		
-		ReportQueryParams reportParams = new ReportQueryParams();
+		ReportQueryParams reportParams = new ReportQueryParams(objectDao);
 		reportParams.betweenSql = betweenSql;
 		reportParams.querySupplyRoom = querySupplyRoom;
 		reportParams.isDisableIDCardSqlWithAliasOfTousseDefinitionIsTd = "";
Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/reportforms/service/ReportManagerImpl.java
===================================================================
diff -u -r33139 -r33526
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/reportforms/service/ReportManagerImpl.java	(.../ReportManagerImpl.java)	(revision 33139)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/reportforms/service/ReportManagerImpl.java	(.../ReportManagerImpl.java)	(revision 33526)
@@ -223,7 +223,7 @@
 			Map<String,Map<String,Object>> result = null;
 			// 处理器械总件数
 			String betweenSql = " between " + queryBeginDateExpress + " and " + queryEndDateExpress + " ";
-			ReportQueryParams params = new ReportQueryParams();
+			ReportQueryParams params = new ReportQueryParams(objectDao);
 			//数据库计算字符串长度的函数名
 			int dataSoureOfMaterialsCountOfToussesInReports = CssdUtils.getSystemSetConfigByNameInt("dataSoureOfMaterialsCountOfToussesInReports", 3);
 			String sqlLengthFunctionName = DatabaseUtil.getSqlLengthFunctionName(dbConnection);