Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/dataindex/DataIndex.java
===================================================================
diff -u -r38741 -r38753
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/dataindex/DataIndex.java	(.../DataIndex.java)	(revision 38741)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/dataindex/DataIndex.java	(.../DataIndex.java)	(revision 38753)
@@ -793,42 +793,32 @@
 			}
 
 			if(!obj.getIsOnlyQueryComboTousse()){
-				amountSql = String
-						.format("select " + obj.monthlyStr + " monthstr, sum(%s) amount "
+				amountSql = "select " + obj.monthlyStr + " monthstr, sum("+ amountColumnSql +") amount "
 								+ "from TousseInstance ti inner join TousseDefinition td on ti.tousseDefinition_id = td.id join TousseDefinition tdc on tdc.id=td.ancestorID "
-								+ " %s where %s and ti.operationTime %s %s "
-								+ "%s %s %s %s "
+								+ joinMaterialInstanceSql+ " where "+ (obj.haveCombo?"ti.comboTousseInstanceId is null and ti.comboTousseDefinitionId is null":"1=1") +" and ti.operationTime "+ obj.betweenSql
+								+ SqlUtils.get_InSql_Extra("ti.orgUnitCoding", obj.querySupplyRoom)
+								+ obj.isDisableIDCardSqlWithAliasOfTousseDefinitionIsTd
+								+ obj.taskGroupSqlWithAliasOfTousseDefinitionIsTd
+								+ obj.tousseGroupSqlWithAliasOfTousseDefinitionIsTd
+								+ obj.tousseTypeAndPackageSizeSql
 								+ "group by " 
-								+ obj.monthlyStr,
-								amountColumnSql,
-								joinMaterialInstanceSql,
-								obj.haveCombo?"ti.comboTousseInstanceId is null and ti.comboTousseDefinitionId is null":"1=1",
-								obj.betweenSql,
-								SqlUtils.get_InSql_Extra("ti.orgUnitCoding", obj.querySupplyRoom),
-								obj.isDisableIDCardSqlWithAliasOfTousseDefinitionIsTd,
-								obj.taskGroupSqlWithAliasOfTousseDefinitionIsTd,
-								obj.tousseGroupSqlWithAliasOfTousseDefinitionIsTd,
-								obj.tousseTypeAndPackageSizeSql);
+								+ obj.monthlyStr;
 			}
 			if(obj.getIsQueryCom()){
 				if(!obj.getIsOnlyQueryComboTousse()){
 					amountSql += " union all ";
 				}
-				amountSql += String
-						.format("select " + obj.monthlyStr + " monthstr, sum(%s) amount "
+				amountSql += "select " + obj.monthlyStr + " monthstr, sum("+ amountColumnSql +") amount "
 								+ "from TousseInstance ti inner join TousseDefinition td on ti.tousseDefinition_id = td.id join TousseDefinition tdc on tdc.id=td.ancestorID "
-								+ " %s where ti.comboTousseDefinitionId is not null and ti.comboTousseInstanceId is not null and ti.operationTime %s %s "
-								+ "%s %s %s %s "
+								+ joinMaterialInstanceSql + " where ti.comboTousseDefinitionId is not null and ti.comboTousseInstanceId is not null and ti.operationTime "
+								+ obj.betweenSql
+								+ SqlUtils.get_InSql_Extra("ti.orgUnitCoding", obj.querySupplyRoom)
+								+ obj.isDisableIDCardSqlWithAliasOfTousseDefinitionIsTd
+								+ obj.taskGroupSqlWithAliasOfTousseDefinitionIsTd
+								+ obj.tousseGroupSqlWithAliasOfTousseDefinitionIsTd
+								+ obj.tousseTypeAndPackageSizeSql
 								+ "group by " 
-								+ obj.monthlyStr,
-								amountColumnSql,
-								joinMaterialInstanceSql,
-								obj.betweenSql,
-								SqlUtils.get_InSql_Extra("ti.orgUnitCoding", obj.querySupplyRoom),
-								obj.isDisableIDCardSqlWithAliasOfTousseDefinitionIsTd,
-								obj.taskGroupSqlWithAliasOfTousseDefinitionIsTd,
-								obj.tousseGroupSqlWithAliasOfTousseDefinitionIsTd,
-								obj.tousseTypeAndPackageSizeSql);
+								+ obj.monthlyStr;
 			}
 			break;
 		case "检查数量":
@@ -2237,17 +2227,13 @@
 			break;
 			
 		case "灭菌方式选择不正确发生次数（按月分组统计）":
-			amountSql = String
-					.format("select " + obj.monthlyStr + " monthstr,count(*) amount "
+			amountSql = "select " + obj.monthlyStr + " monthstr,count(*) amount "
 							+ "from QualityMonitoringInstance qi,FormInstance fi,FormDefinition fd,QualityMonitoringDefinition qmdf,FormInstanceItem fii,FormDefinitionItem fdi "
 							+ "where qmdf.id=fd.id and qi.id = fi.id and fi.formDefinition_id = fd.id and fi.id = fii.formInstance_id and fii.formDefinitionItem_id = fdi.id "
 							+ "and fdi.name = '灭菌方式选择不正确' and fii.answer is not null "+getIsQualifiedSql("qi")
-							+ "and qi.datetime %s %s and fd.formType = '质量监测' "
+							+ "and qi.datetime "+ obj.betweenSql + SqlUtils.getHandleDepartCodingOfQualityMonitoringDefinitionSql(obj.querySupplyRoom) + " and fd.formType = '质量监测' "
 							+ "group by "
-							+ obj.monthlyStr,
-							obj.betweenSql,
-							SqlUtils.getHandleDepartCodingOfQualityMonitoringDefinitionSql(obj.querySupplyRoom)
-							);
+							+ obj.monthlyStr;
 
 			break;
 		}
@@ -2360,17 +2346,14 @@
 		}else{
 			tousseSql = "";
 		}
-		String sql = String
-				.format("select " + obj.monthlyStr + " monthstr,sum(qmd.amount) amount "
+		String sql = "select " + obj.monthlyStr + " monthstr,sum(qmd.amount) amount "
 						+ "from QualityMonitoringInstance qi inner join FormInstance fi on qi.id = fi.id inner join FormDefinition fd "
 						+ "on fi.formDefinition_id = fd.id join QualityMonitoringDefinition qmdf on qmdf.id=fd.id inner join QualityMonitoringGoods qmd on qi.id=qmd.qualityMonitoringInstance_id "
 						+ "where fd.formName like '%%" + inspectItemName + "%%' " + getIsQualifiedSql("qi")
-						+ tousseSql +" and qi.datetime %s %s "
-						+ "group by "
-						+ obj.monthlyStr,
-						obj.betweenSql,
-						SqlUtils.getHandleDepartCodingOfQualityMonitoringDefinitionSql(obj.querySupplyRoom)
-						);
+						+ tousseSql +" and qi.datetime "+ obj.betweenSql 
+						+ SqlUtils.getHandleDepartCodingOfQualityMonitoringDefinitionSql(obj.querySupplyRoom)
+						+ " group by "
+						+ obj.monthlyStr;
 		
 		return sql;
 	}
@@ -2383,17 +2366,13 @@
 	 */
 	public static String getQualityMonitoringAmountSql(String likeValue, ReportQueryParams obj) {
 		
-		String sql = String
-				.format("select " + obj.monthlyStr + " monthstr,sum(qmd.amount) amount "
+		String sql = "select " + obj.monthlyStr + " monthstr,sum(qmd.amount) amount "
 						+ "from QualityMonitoringInstance qi inner join FormInstance fi on qi.id = fi.id inner join FormDefinition fd "
 						+ "on fi.formDefinition_id = fd.id join QualityMonitoringDefinition qmdf on qmdf.id=fd.id inner join QualityMonitoringGoods qmd on qi.id=qmd.qualityMonitoringInstance_id "
 						+ "where fd.formName like '%%" + likeValue + "%%' "
-						+ "and qi.datetime %s %s and fd.formType = '质量监测' " + getIsQualifiedSql("qi")
+						+ "and qi.datetime "+ obj.betweenSql + SqlUtils.getHandleDepartCodingOfQualityMonitoringDefinitionSql(obj.querySupplyRoom) +"  and fd.formType = '质量监测' " + getIsQualifiedSql("qi")
 						+ "group by "
-						+ obj.monthlyStr,
-						obj.betweenSql,
-						SqlUtils.getHandleDepartCodingOfQualityMonitoringDefinitionSql(obj.querySupplyRoom)
-						);
+						+ obj.monthlyStr;
 		
 		return sql;
 	}