Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/util/YearWorkloadReportHelper.java
===================================================================
diff -u -r38737 -r38754
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/util/YearWorkloadReportHelper.java	(.../YearWorkloadReportHelper.java)	(revision 38737)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/util/YearWorkloadReportHelper.java	(.../YearWorkloadReportHelper.java)	(revision 38754)
@@ -735,9 +735,9 @@
 		String sql = null;
 		if(dataIndexSources.contains("处理器械总件数")){
 			// 处理器械总件数
-		    sql = String.format("select sum(tl.amount) amount, monthstr  from ("
+		    sql = "select sum(tl.amount) amount, monthstr  from ("
 					+dataIndex.getWorkAmountByMaterialSQL("清洗数量", params, dataSoureOfMaterialsCountOfToussesInReports)
-					+ ") tl group by monthstr ");
+					+ ") tl group by monthstr ";
 		    ResultSet totalTousseRs = null;
 			try {
 				logger.debug("消毒供应中心年度工作量统计报表处理器械总件数查询:"+sql);
@@ -756,9 +756,9 @@
 		if(dataIndexSources.contains("器械手工清洗件数")){
 			// 处理器械总件数
 			params.extraQuery= " and wr.rinserId in (select id from Rinser where isManualClean='是') ";
-		    sql = String.format("select sum(tl.amount) amount, monthstr  from ("
+		    sql = "select sum(tl.amount) amount, monthstr  from ("
 					+dataIndex.getWorkAmountByMaterialSQL("清洗数量", params, dataSoureOfMaterialsCountOfToussesInReports)
-					+ ") tl group by monthstr ");
+					+ ") tl group by monthstr ";
 		    ResultSet totalTousseRs = null;
 			try {
 				logger.debug("消毒供应中心年度工作量统计报表器械手工清洗总件数查询:"+sql);
@@ -779,9 +779,9 @@
 	    params.tousseTypes = TousseDefinition.PACKAGE_TYPE_FOREIGN;
 	    params.tousseTypeAndPackageSizeSql = DataIndex.getTousseTypesAndPackageSizesFilterSQL(TousseDefinition.PACKAGE_TYPE_FOREIGN, null);
 	    if(dataIndexSources.contains("处理外来手术器械总件数")){
-	    	sql = String.format("select sum(tl.amount) amount, monthstr from ("
+	    	sql = "select sum(tl.amount) amount, monthstr from ("
 					+dataIndex.getWorkAmountByMaterialSQL("清洗数量", params, dataSoureOfMaterialsCountOfToussesInReports)
-					+ ") tl group by monthstr ");
+					+ ") tl group by monthstr ";
 		    ResultSet totalForeignTousseRs = null;
 			try {
 				logger.debug("消毒供应中心年度工作量统计报表处理外来器械总件数查询:"+sql);
@@ -813,51 +813,51 @@
 	    	params.extraSelectColumns = "," + monthlyStr + "monthstr";
 			params.extraGroupBy = "";
 			params.groupBySql = " group by " + monthlyStr;
-			disinfectionSql = String.format("select sum(tl.amount) amount,monthstr from ("
+			disinfectionSql = "select sum(tl.amount) amount,monthstr from ("
 					+dataIndex.getWorkAmountByMaterialSQL("发货数量", params, dataSoureOfMaterialsCountOfToussesInReports)
-					+ ") tl group by monthstr");
+					+ ") tl group by monthstr";
 	    }else if(statisticSourceOfDisinfectGoodsAmount == 3){
 	    	monthlyStr = dateQueryAdapter.dateConverAdapter3("ti.operationTime",mmOrdd);
 			params.extraGroupBy = "";
 			params.extraSelectColumns = "";
 			params.monthlyStr = monthlyStr;
-			disinfectionSql = String.format("select sum(tl.amount) amount,monthstr from ("
+			disinfectionSql = "select sum(tl.amount) amount,monthstr from ("
 					+ dataIndex.getWorkAmountByPackageSQL("配包数量", params)
-					+ ") tl group by monthstr");
+					+ ") tl group by monthstr";
 	    }else if(statisticSourceOfDisinfectGoodsAmount == 4){
 	    	monthlyStr = dateQueryAdapter.dateConverAdapter3("ti.operationTime",mmOrdd);
 	    	params.extraSelectColumns = "," + monthlyStr + "monthstr";
 			params.extraGroupBy = monthlyStr;
-			disinfectionSql = String.format("select sum(tl.amount) amount,monthstr from ("
+			disinfectionSql = "select sum(tl.amount) amount,monthstr from ("
 					+dataIndex.getWorkAmountByMaterialSQL("配包数量", params, dataSoureOfMaterialsCountOfToussesInReports)
-					+ ") tl group by monthstr");
+					+ ") tl group by monthstr";
 	    }else if(statisticSourceOfDisinfectGoodsAmount == 5){//清洗包数
 	    	monthlyStr = dateQueryAdapter.dateConverAdapter3("wdr.endDate",mmOrdd);
 	    	params.extraGroupBy = "";
 			params.extraSelectColumns = "," + monthlyStr + "monthstr";
 			params.monthlyStr = monthlyStr;
 			params.groupBySql = " group by " + monthlyStr;
-			disinfectionSql = String.format("select sum(tl.amount) amount, monthstr  from ("
+			disinfectionSql = "select sum(tl.amount) amount, monthstr  from ("
 					+dataIndex.getWorkAmountByPackageSQL("清洗数量", params)
-					+ ") tl group by monthstr ");
+					+ ") tl group by monthstr ";
 	    }else if(statisticSourceOfDisinfectGoodsAmount == 6){//清洗件数
 	    	// 处理器械总件数
 	    	monthlyStr = dateQueryAdapter.dateConverAdapter3("wr.endDate",mmOrdd);
 	    	params.extraGroupBy = "";
 			params.extraSelectColumns = "";
 			params.monthlyStr = monthlyStr;
 			params.groupBySql = "";
-	    	disinfectionSql = String.format("select sum(tl.amount) amount, monthstr  from ("
+	    	disinfectionSql = "select sum(tl.amount) amount, monthstr  from ("
 					+dataIndex.getWorkAmountByMaterialSQL("清洗数量", params, dataSoureOfMaterialsCountOfToussesInReports)
-					+ ") tl group by monthstr ");
+					+ ") tl group by monthstr ";
 	    }else{
 	    	monthlyStr = dateQueryAdapter.dateConverAdapter3("i.sendTime",mmOrdd);
 	    	params.extraSelectColumns = "," + monthlyStr + "monthstr";
 			params.groupBySql = " group by " + monthlyStr;
 			params.extraGroupBy = monthlyStr;
-			disinfectionSql = String.format("select sum(tl.amount) amount,monthstr from ("
+			disinfectionSql = "select sum(tl.amount) amount,monthstr from ("
 					+dataIndex.getWorkAmountByPackageSQL("发货数量", params)
-					+ ") tl group by monthstr");
+					+ ") tl group by monthstr";
 	    }
 	    if(dataIndexSources.contains("消毒物品数量")){
 	    	ResultSet disinfectionRs = null;
@@ -882,9 +882,9 @@
 		params.extraGroupBy = "";
 		params.monthlyStr = dateQueryAdapter.dateConverAdapter3("ti.operationTime",mmOrdd);
 		if(dataIndexSources.contains("装配数量")){
-			String packingAmountSql = String.format("select sum(tl.amount) amount,monthstr from ("
+			String packingAmountSql = "select sum(tl.amount) amount,monthstr from ("
 					+ dataIndex.getWorkAmountByPackageSQL("配包数量", params)
-					+ ") tl group by monthstr");
+					+ ") tl group by monthstr";
 			ResultSet rs = null;
 			try {
 				logger.debug("消毒供应中心年度工作量统计报表装配数量查询:"+packingAmountSql);
@@ -905,9 +905,9 @@
 			params.tousseTypeAndPackageSizeSql = DataIndex
 					.getTousseTypesAndPackageSizesFilterSQL(
 							TousseDefinition.PACKAGE_TYPE_DISINFECTION, null);
-			String disinfectionPackAmountSql = String.format("select sum(tl.amount) amount,monthstr from ("
+			String disinfectionPackAmountSql = "select sum(tl.amount) amount,monthstr from ("
 					+ dataIndex.getWorkAmountByPackageSQL("配包数量", params)
-					+ ") tl group by monthstr");
+					+ ") tl group by monthstr";
 			ResultSet rs = null;
 			try {
 				logger.debug("消毒供应中心年度工作量统计报表消毒物品装配数量查询:"+disinfectionPackAmountSql);
@@ -928,9 +928,9 @@
 			params.tousseTypeAndPackageSizeSql = DataIndex
 					.getTousseTypesAndPackageSizesFilterSQL(
 							TousseDefinition.PACKAGE_TYPE_DRESSING, null);
-			String dressingPackAmountSql = String.format("select sum(tl.amount) amount,monthstr from ("
+			String dressingPackAmountSql = "select sum(tl.amount) amount,monthstr from ("
 					+ dataIndex.getWorkAmountByPackageSQL("配包数量", params)
-					+ ") tl group by monthstr");
+					+ ") tl group by monthstr";
 			ResultSet rs = null;
 			try {
 				logger.debug("消毒供应中心年度工作量统计报表消毒敷料包装配数量查询:"+dressingPackAmountSql);
@@ -951,9 +951,9 @@
 		// 灭菌无菌包数
 		params.monthlyStr = tiSterileEndTime;
 		if(dataIndexSources.contains("复用性灭菌物品总件数")){
-			String sterileSql = String.format("select sum(tl.amount) amount,monthstr from ("
+			String sterileSql = "select sum(tl.amount) amount,monthstr from ("
 					+dataIndex.getWorkAmountByPackageSQL("灭菌数量", params)
-					+ ") tl group by monthstr");
+					+ ") tl group by monthstr";
 		    ResultSet sterileRs = null;
 			try {
 				logger.debug("消毒供应中心年度工作量统计报表灭菌无菌包数查询:"+sterileSql);
@@ -978,9 +978,9 @@
 		if(dataIndexSources.contains("灭菌外来手术器械包数")){
 			ResultSet sterileForeignRs = null;
 			try {
-				String sterileForeignSql = String.format("select sum(tl.amount) amount,monthstr from ("
+				String sterileForeignSql = "select sum(tl.amount) amount,monthstr from ("
 						+dataIndex.getWorkAmountByPackageSQL("灭菌数量", params)
-						+ ") tl group by monthstr");
+						+ ") tl group by monthstr";
 				logger.debug("消毒供应中心年度工作量统计报表灭菌外来手术器械包数查询:"+sterileForeignSql);
 				sterileForeignRs = objectDao.executeSql(sterileForeignSql);
 				while (sterileForeignRs.next()) {
@@ -1061,9 +1061,9 @@
 		params.isGroup = true;
 		params.extraGroupBy = monthlyStr;
 		if(dataIndexSources.contains("复用性物品发货数量")){
-			String tousseSendSql = String.format("select sum(tl.amount) amount,monthStr from ("
+			String tousseSendSql = "select sum(tl.amount) amount,monthStr from ("
 					+dataIndex.getWorkAmountByPackageSQL("发货数量", params)
-					+ ") tl group by monthStr");
+					+ ") tl group by monthStr";
 			ResultSet tousseInvoiceSendRs = null;
 			try {
 				logger.debug("消毒供应中心年度工作量统计报表器械包发放数量查询:"+tousseSendSql);
@@ -1104,9 +1104,9 @@
 			params.includeTousses = false;
 			params.includeDisposableGoods = true;
 
-		    String disposableGoodsSendSql = String.format("select sum(tl.amount) amount,monthStr from ("
+		    String disposableGoodsSendSql = "select sum(tl.amount) amount,monthStr from ("
 					+dataIndex.getWorkAmountByPackageSQL("发货数量", params)
-					+ ") tl group by monthStr");
+					+ ") tl group by monthStr";
 		    ResultSet disposableGoodsSendRs = null;
 			try {
 				logger.debug("消毒供应中心年度工作量统计报表一次性物品发放数量查询:"+disposableGoodsSendSql);