Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
===================================================================
diff -u -r14458 -r14460
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java	(.../JasperReportManagerImpl.java)	(revision 14458)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java	(.../JasperReportManagerImpl.java)	(revision 14460)
@@ -432,18 +432,18 @@
 					+ " and w.orgUnitCoding = '"+departCoding+"'"
 					+ " group by "+dateQueryAdapter.dateConverAdapter3("w.enddate","mm")+" order by "+dateQueryAdapter.dateConverAdapter3("w.enddate","mm");
 
-			String qualityMonitoringSql = "select "+dateQueryAdapter.dateConverAdapter3("q.dateTime","mm")+" as createTime,sum(q.amount),q.toussename "
-					+ "from QualityMonitoring q where q.inspectitem like '%器械清洗不合格%' and q.toussename is not null "
+			String qualityMonitoringSql = "select "+dateQueryAdapter.dateConverAdapter3("q.dateTime","mm")+" as createTime,sum(q.amount) "
+					+ "from QualityMonitoring q where q.inspectitem like '%消毒物品不合格%' and q.toussename is not null "
 					+ "and q.datetime between "+dateQueryAdapter.dateAdapter(queryYear)
 					+ " and "+dateQueryAdapter.dateAdapter(nextYear)
 					+ " and q.orgUnitCoding = '"+departCoding+"'"
-					+ " group by "+dateQueryAdapter.dateConverAdapter3("q.dateTime","mm")+",q.toussename";
+					+ " group by "+dateQueryAdapter.dateConverAdapter3("q.dateTime","mm");
 
 			ResultSet washRecordResult = objectDao.executeSql(washRecordSql);
 			ResultSet monitoringResult = objectDao
 					.executeSql(qualityMonitoringSql);
 			return getFractionDefective(washRecordResult, monitoringResult,
-					"消毒物品不合格率", true);
+					"消毒物品不合格率", false);
 		}
 		return null;
 	}
@@ -485,17 +485,18 @@
 					int amount = resultSet2.getInt(2);
 					if (isDisinfectTousse) {
 						String tousseName = resultSet2.getString(3);
-						TousseDefinition td = tousseDefinitionManager
-								.getTousseDefinitionByName(tousseName);
-						// 是否是消毒器械包
-						if (td != null
-								&& TousseDefinition.PACKAGE_TYPE_DISINFECTION
-										.equals(td.getTousseType())) {
-							if (monitoringMap.get(month) != null) {
-								monitoringMap.put(month,
-										(monitoringMap.get(month) + amount));
-							} else {
-								monitoringMap.put(month, amount);
+						if(StringUtils.isNotBlank(tousseName)){
+							TousseDefinition td = tousseDefinitionManager
+									.getTousseDefinitionByName(tousseName);
+							// 是否是消毒器械包
+							if (td != null
+									&& TousseDefinition.PACKAGE_TYPE_DISINFECTION
+											.equals(td.getTousseType())) {
+								if (monitoringMap.get(month) != null) {
+									monitoringMap.put(month,(monitoringMap.get(month) + amount));
+								} else {
+									monitoringMap.put(month, amount);
+								}
 							}
 						}
 						continue;