Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
===================================================================
diff -u -r31219 -r31220
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java	(.../JasperReportManagerImpl.java)	(revision 31219)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java	(.../JasperReportManagerImpl.java)	(revision 31220)
@@ -15143,7 +15143,7 @@
 		boolean showSterilizationInfo = false;//是否查询灭菌炉和炉次
 		String qmdOrderNumberBySql = "";
 		String tempOrderBySql = "";
-		boolean washScope = false;
+		boolean materialAndTousse = false;
 		if(FORMNAMEOFADJ.equals(formName)){//从关联的灭菌记录获取
 			showSterilizationInfo = true;
 			requestParameters.put("dataType", FORMNAMEOFADJ);
@@ -15159,7 +15159,7 @@
 			qmdOrderNumberBySql = " order by qmi.id desc,qmd.orderNumber asc";
 			tempOrderBySql = "order by temp.id desc,temp.orderNumber asc";
 			requestParameters.put("dataType", "监测范围为材料和器械包的质量监测数据");
-			washScope = true;
+			materialAndTousse = true;
 		}
 		if (StringUtils.isNotBlank(startDate) && StringUtils.isNotBlank(endDate)
 				&& StringUtils.isNotBlank(formName)) {
@@ -15212,7 +15212,7 @@
 					+ " and fiov.definitionItemOption_id=fdio.id "
 					+ " where fdi.isReportDisplay='是' and (fdi.type = '" + FormDefinitionItem.TYPE_RADIO  + "' or fdi.type ='" + FormDefinitionItem.TYPE_CHECK  + "')" + " and " + whereSql + tousseNameSql
 					+ "))temp " + tempOrderBySql;
-			addMonitoringItemBeanOptionRadioAndCHeck(list,sql,showSterilizationInfo, washScope);
+			addMonitoringItemBeanOptionRadioAndCHeck(list,sql,showSterilizationInfo, materialAndTousse);
 			// 没有录入材料和包，有配了多选的细则的项
 			sql =  " select " + dataSql + " dateStr,"
 					+ " qmi.id qmiId,qmi.positionMsg positionMsg,"
@@ -15259,7 +15259,7 @@
 				  + " join QualityMonitoringGoods qmd on qmi.id=qmd.qualityMonitoringInstance_id "
 				  + extraJoin
 				  + " where "+ answerWhereSql +" (fdi.type != '" + FormDefinitionItem.TYPE_RADIO  + "' and fdi.isReportDisplay='是' and fdi.type!='" + FormDefinitionItem.TYPE_CHECK + "')" + " and " + whereSql + tousseNameSql + qmdOrderNumberBySql;
-			addMonitoringItemBeanOptionSingleResult(list,sql,showSterilizationInfo, washScope);
+			addMonitoringItemBeanOptionSingleResult(list,sql,showSterilizationInfo, materialAndTousse);
 			// 没有录入材料和包，单一的结果
 			sql = " select " + dataSql + " dateStr,"
 					  + " qmi.id qmiId,qmi.positionMsg positionMsg,"
@@ -15283,7 +15283,7 @@
 						+ " where qmi.id not in (select formInstance_id from FormInstanceItem) " 
 						+ " and qmi.type = '" + FormDefinition.FOMRTYPE_QUALITYMONITORING + "' "
 						+ " and " + whereSql + tousseNameSql + qmdOrderNumberBySql;
-				addMonitoringItemBeanQualityMonitoring(list,sql,showSterilizationInfo, washScope);
+				addMonitoringItemBeanQualityMonitoring(list,sql,showSterilizationInfo, materialAndTousse);
 			}
 			//是否无菌包质量抽查登记表,是则隐藏监测结果列
 			Map<String, Integer> isQualifiedAmount = new HashMap<String, Integer>();
@@ -15301,7 +15301,7 @@
 			Integer qmCount = 0;
 			// 材料或者包数量和
 			Integer qmTousseAndMaterialAmount = 0;
-			if(washScope){
+			if(materialAndTousse){
 				sql =  " select sum(t.aAmount) count,sum(t.aAmount) total from QualityMonitoringInstance qmi join FormInstance fi on qmi.id=fi.id join FormDefinition fd on fi.formDefinition_id=fd.id "
 						+ " join QualityMonitoringDefinition qmdf on qmdf.id=fd.id join ( select qmi.id qid,sum(qmd.amount) aAmount from QualityMonitoringInstance qmi,QualityMonitoringGoods qmd where qmi.id=qmd.qualityMonitoringInstance_id and qmd.material is not null "
 						+ tousseNameSql