Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/util/MaterialWashUnqualifiedReportHelper.java
===================================================================
diff -u -r35875 -r36623
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/util/MaterialWashUnqualifiedReportHelper.java	(.../MaterialWashUnqualifiedReportHelper.java)	(revision 35875)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/util/MaterialWashUnqualifiedReportHelper.java	(.../MaterialWashUnqualifiedReportHelper.java)	(revision 36623)
@@ -18,6 +18,7 @@
 import org.springframework.stereotype.Component;
 import com.forgon.databaseadapter.service.DateQueryAdapter;
 import com.forgon.disinfectsystem.common.CssdUtils;
+import com.forgon.disinfectsystem.entity.basedatamanager.reportoption.GoodsOption;
 import com.forgon.disinfectsystem.jasperreports.javabeansource.MaterialWashUnqualifiedPosition;
 import com.forgon.disinfectsystem.jasperreports.javabeansource.WashFractionDefectiveChartBean;
 import com.forgon.disinfectsystem.jasperreports.javabeansource.WashUnUnqualifiedBean;
@@ -45,6 +46,8 @@
 	private MaterialDefinitionManager materialDefinitionManager;
 	@Autowired
 	private DataIndex dataIndex;
+	@Autowired
+	private FormDefinitionHelper formDefinitionHelper;
 	/**
 	 * 获取清洗不合格率评估方法数量统计
 	 * 
@@ -374,16 +377,7 @@
 			
 			
 			reportParams.monthlyStr = dateQueryAdapter.dateConverAdapter3("qi.dateTime","mm");
-			
-			String qualityMonitoringSql = DataIndex.getQualityMonitorAmountSQL("器械清洗不合格的数量",
-							reportParams);
-
 			ResultSet washRecordResult = objectDao.executeSql(washRecordSql);
-			ResultSet monitoringResult = objectDao
-					.executeSql(qualityMonitoringSql);
-			
-			
-			
 			Map<String, Integer> washRecordMap = new HashMap<String, Integer>();
 			try {
 				while (washRecordResult.next()) {
@@ -401,10 +395,15 @@
 				DatabaseUtil.closeResultSetAndStatement(washRecordResult);
 			}
 			
-			
+			ResultSet monitoringResult = null;
 			Map<String, Double> map = new HashMap<String, Double>();
 			
 			try {
+				//查询不合格
+				String[] washSumUnqualifiedSource = formDefinitionHelper.getModelSources(GoodsOption.MODEL_WASHUNQUALIFIEDSOURCE, null);
+				String qualityMonitoringSql = DataIndex.getQMAmountSqlByFormNames(washSumUnqualifiedSource, reportParams, true);
+				
+				monitoringResult = objectDao.executeSql(qualityMonitoringSql);
 				Map<String, Integer> monitoringMap = new HashMap<String, Integer>();
 				if(monitoringResult != null){
 					while (monitoringResult.next()) {