Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
===================================================================
diff -u -r19203 -r19208
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java	(.../JasperReportManagerImpl.java)	(revision 19203)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java	(.../JasperReportManagerImpl.java)	(revision 19208)
@@ -16549,8 +16549,8 @@
 		String dateRsSql = dateQueryAdapter.dateToVarchar4("qmi.dateTime");
 		String sql = "select qmi.id,qmd.material,qmd.amount," + dateRsSql + ",fdi.name,fit.answer from QualityMonitoringInstance qmi,FormInstance fi,FormDefinition fd,formInstanceItem fit,FormDefinitionItem fdi,QualityMonitoringGoods qmd " 
 			+ "where qmi.id=fi.id and fi.formDefinition_id=fd.id and fi.id=fit.formInstance_id and fit.formDefinitionItem_id=fdi.id and qmi.id = qmd.qualityMonitoringInstance_id"
-			+ " and fd.formName='器械清洗不合格' and (fdi.name='器械清洗不合格部位'  or fdi.name='不清洁原因')"
-			+ " and fdi.type = '" + FormDefinitionItem.TYPE_CHECK + "'"
+			+ " and fd.formName='器械清洗不合格' "
+//			+ " and fdi.type = '" + FormDefinitionItem.TYPE_CHECK + "'"
 			+ "and (qmi.dateTime between " +dateQueryAdapter.dateAdapter(startTime)+" and " + dateQueryAdapter.dateAdapter(endTime) + ")";
 		Map<String,String> msMap = materialDefinitionManager.getMaterialAndTypeMap();
 		Map<String,WashUnUnqualifiedBean> beanMap = new HashMap<String,WashUnUnqualifiedBean>();