Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/dataindex/WorkQualityCollectionDataIndex.java
===================================================================
diff -u -r25293 -r25294
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/dataindex/WorkQualityCollectionDataIndex.java	(.../WorkQualityCollectionDataIndex.java)	(revision 25293)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/dataindex/WorkQualityCollectionDataIndex.java	(.../WorkQualityCollectionDataIndex.java)	(revision 25294)
@@ -1147,17 +1147,19 @@
 		String queryYear = year + "-01-01 00:00:00";
 		String nextYear = dataIndex.getNextYear(year) + " 00:00:00";
 		// 清洗不合格量
-		String sql = "select " + dateQueryAdapter.dateConverAdapter3("qi.dateTime","mm")
+		String sql = "select "
+				+ dateQueryAdapter.dateConverAdapter3("qi.dateTime", "mm")
 				+ " monthstr, sum(qmd.amount) from QualityMonitoringInstance qi ,FormInstance fi,FormDefinition fd,QualityMonitoringGoods qmd "
-				+ "where qi.id = fi.id and fi.formDefinition_id = fd.id " 
-				+ " and qi.id=qmd.qualityMonitoringInstance_id and fd.formName like '%器械清洗不合格%' " 
+				+ "where qi.id = fi.id and fi.formDefinition_id = fd.id "
+				+ " and qi.id=qmd.qualityMonitoringInstance_id "
+				+ SqlUtils.get_LikeSql("fd.formName", new String[] { "清洗不合格",
+						"清洗不及格" })
 				+ SqlUtils.get_InSql_Extra("fi.orgUnitCoding", querySupplyRoom)
-				+ " and fd.formType = '质量监测' "
-				+ " and qi.dateTime >= "
+				+ " and fd.formType = '质量监测' " + " and qi.dateTime >= "
 				+ dateQueryAdapter.dateAdapter(queryYear)
 				+ " and qi.dateTime <= "
-				+ dateQueryAdapter.dateAdapter(nextYear)
-				+ " group by " + dateQueryAdapter.dateConverAdapter3("qi.dateTime","mm");
+				+ dateQueryAdapter.dateAdapter(nextYear) + " group by "
+				+ dateQueryAdapter.dateConverAdapter3("qi.dateTime", "mm");
 		
 		ResultSet result = objectDao.executeSql(sql);
 		bean.setRowNum(list.size()+1);
Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
===================================================================
diff -u -r25293 -r25294
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java	(.../JasperReportManagerImpl.java)	(revision 25293)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java	(.../JasperReportManagerImpl.java)	(revision 25294)
@@ -6480,9 +6480,8 @@
 				+ " group by rs.type,rs.orgUnitName,rs.isSencondWashForForeignTousse";
 
 		Map<String,Integer> amountMap = getWashWorkloadAmountMap(sql);
-		// 质量监测不合格数量
-		String unQualitySql = "select sum(qmd.amount) as amount "
-				+ dataIndex.getUnQualifiedMonitorAmountSql("清洗消毒", "", params);
+		// 清洗不合格数量
+		String unQualitySql = DataIndex.getQMAmountSqlByFormNames(new String[]{"清洗不合格","清洗不及格"}, params);
 		
 		Integer unQualityAmount = dataIndex.getAmountBySql(unQualitySql);