Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/dataindex/DataIndex.java
===================================================================
diff -u -r36624 -r36660
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/dataindex/DataIndex.java	(.../DataIndex.java)	(revision 36624)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/dataindex/DataIndex.java	(.../DataIndex.java)	(revision 36660)
@@ -2412,13 +2412,29 @@
 	 * @return
 	 */
 	public static String getQualityMonitoringAmountSqlIncludePeriodMonitoring(String inspectItemName, ReportQueryParams obj) {
-		
+		return getQualityMonitoringAmountSqlIncludePeriodMonitoring(null, inspectItemName, obj);
+	}
+	/**
+	 * 获取质量监测查询的sql，根据监测项的名称，查询登记的质量监测和定期监测记录中数量的总和
+	 * 本查询没有监测类型的限制，包括质量监测和定期监测
+	 * @param tousse ture:只查包 false:查材料 null都查
+	 * @param inspectItemName
+	 * @param obj
+	 * @return
+	 */
+	public static String getQualityMonitoringAmountSqlIncludePeriodMonitoring(Boolean tousse, String inspectItemName, ReportQueryParams obj) {
+		String tousseSql = null;
+		if(tousse != null){
+			tousseSql = " and " + (tousse ? " qmd.tousseName is not null " : " (qmd.tousseName is null or qmd.tousseName='') ");
+		}else{
+			tousseSql = "";
+		}
 		String sql = String
 				.format("select " + obj.monthlyStr + " monthstr,sum(qmd.amount) amount "
 						+ "from QualityMonitoringInstance qi inner join FormInstance fi on qi.id = fi.id inner join FormDefinition fd "
 						+ "on fi.formDefinition_id = fd.id join QualityMonitoringDefinition qmdf on qmdf.id=fd.id inner join QualityMonitoringGoods qmd on qi.id=qmd.qualityMonitoringInstance_id "
 						+ "where fd.formName like '%%" + inspectItemName + "%%' "
-						+ "and qi.datetime %s %s "
+						+ tousseSql +" and qi.datetime %s %s "
 						+ "group by "
 						+ obj.monthlyStr,
 						obj.betweenSql,
Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/util/EighteenQuotaBeanHelper.java
===================================================================
diff -u -r36140 -r36660
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/util/EighteenQuotaBeanHelper.java	(.../EighteenQuotaBeanHelper.java)	(revision 36140)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/util/EighteenQuotaBeanHelper.java	(.../EighteenQuotaBeanHelper.java)	(revision 36660)
@@ -349,7 +349,7 @@
 			reportParams.querySupplyRoom = departCoding;
 			reportParams.monthlyStr = dateQueryAdapter.dateConverAdapter3("qi.dateTime","mm");
 			
-			String sql = DataIndex.getQualityMonitoringAmountSqlIncludePeriodMonitoring("无菌物品发放错误发生数", reportParams);
+			String sql = DataIndex.getQualityMonitoringAmountSqlIncludePeriodMonitoring(true, "无菌物品发放错误发生数", reportParams);
 
 			Map<String,Integer> map = workQualityCollectionDataIndex.getMonthAmountMapBySql(sql);
 			return getEveryMonthAmount(map, dataIndexNameForDisplay);