Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
===================================================================
diff -u -r33812 -r33813
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java	(.../JasperReportManagerImpl.java)	(revision 33812)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java	(.../JasperReportManagerImpl.java)	(revision 33813)
@@ -22890,39 +22890,39 @@
 		Map<String, Object> recyclingTousseErrorAmount = null;
 		if(dataIndexSources.contains(SupplyRoomQualityQuota.DATAINDEXSOURCE_RECYCLING_TOUSSEERROR)){
 			String[] recyclingTousseErrorSource = goodsOptionManager.getGoodsOptionValue(GoodsOption.MODEL_RECYCLINGTOUSSEERROR, "");
-			recyclingTousseErrorAmount = getUnqualified(true, departmentCode, recyclingTousseErrorSource, year, SupplyRoomQualityQuota.MONTH, null, null , null);
+			recyclingTousseErrorAmount = getUnqualified(false, departmentCode, recyclingTousseErrorSource, year, SupplyRoomQualityQuota.MONTH, null, null , null);
 		}
 		/**
 		 * 8 包内器械缺失件数
 		 */
 		Map<String, Object> missingInTousseAmount = null;
 		if(dataIndexSources.contains(SupplyRoomQualityQuota.DATAINDEXSOURCE_MISSING_IN_TOUSSE)){
 			String[] missingInTousseSource = goodsOptionManager.getGoodsOptionValue(GoodsOption.MODEL_MISSING_INTOUSSE, "");
-			missingInTousseAmount = getUnqualified(true, departmentCode, missingInTousseSource, year, SupplyRoomQualityQuota.MONTH, null, null , null);
+			missingInTousseAmount = getUnqualified(false, departmentCode, missingInTousseSource, year, SupplyRoomQualityQuota.MONTH, null, null , null);
 		}
 		/**
 		 * 9 包内器械功能不全
 		 */
 		Map<String, Object> insufficiencyInTousseAmount = null;
 		if(dataIndexSources.contains(SupplyRoomQualityQuota.DATAINDEXSOURCE_INSUFFICIENCY_IN_TOUSSE)){
 			String[] insufficiencyInTousseSource = goodsOptionManager.getGoodsOptionValue(GoodsOption.MODEL_INSUFFICIENCY_INTOUSSE, "");
-			insufficiencyInTousseAmount = getUnqualified(true, departmentCode, insufficiencyInTousseSource, year, SupplyRoomQualityQuota.MONTH, null, null , null);
+			insufficiencyInTousseAmount = getUnqualified(false, departmentCode, insufficiencyInTousseSource, year, SupplyRoomQualityQuota.MONTH, null, null , null);
 		}
 		/**
 		 * 10 包内器械种类错误
 		 */
 		Map<String, Object> typEerrorInTousseAmount = null;
 		if(dataIndexSources.contains(SupplyRoomQualityQuota.DATAINDEXSOURCE_TYPE_ERROR_IN_TOUSSE)){
 			String[] typEerrorInTousseSource = goodsOptionManager.getGoodsOptionValue(GoodsOption.MODEL_TYPEERROR_INTOUSSE, "");
-			typEerrorInTousseAmount = getUnqualified(true, departmentCode, typEerrorInTousseSource, year, SupplyRoomQualityQuota.MONTH, null, null , null);
+			typEerrorInTousseAmount = getUnqualified(false, departmentCode, typEerrorInTousseSource, year, SupplyRoomQualityQuota.MONTH, null, null , null);
 		}
 		/**
 		 * 11 包内化学指示卡不合格
 		 */
 		Map<String, Object> model_chemicalindicatorcard_intousse_unqualifiedAmount = null;
 		if(dataIndexSources.contains(SupplyRoomQualityQuota.DATAINDEXSOURCE_CHEMICALINDICATORCARD_INTOUSSE_UNQUALIFIED)){
 			String[] model_chemicalindicatorcard_intousse_unqualifiedSource = goodsOptionManager.getGoodsOptionValue(GoodsOption.MODEL_CHEMICALINDICATORCARD_INTOUSSE_UNQUALIFIED, "");
-			model_chemicalindicatorcard_intousse_unqualifiedAmount = getUnqualified(true, departmentCode, model_chemicalindicatorcard_intousse_unqualifiedSource, year, SupplyRoomQualityQuota.MONTH, null, null , null);
+			model_chemicalindicatorcard_intousse_unqualifiedAmount = getUnqualified(false, departmentCode, model_chemicalindicatorcard_intousse_unqualifiedSource, year, SupplyRoomQualityQuota.MONTH, null, null , null);
 		}
 		/**
 		 * 12 物品标识不正确
@@ -23206,39 +23206,39 @@
 		Map<String, Object> recyclingTousseErrorAmount = null;
 		if(dataIndexSources.contains(SupplyRoomQualityQuota.DATAINDEXSOURCE_RECYCLING_TOUSSEERROR)){
 			String[] recyclingTousseErrorSource = goodsOptionManager.getGoodsOptionValue(GoodsOption.MODEL_RECYCLINGTOUSSEERROR, "");
-			recyclingTousseErrorAmount = getUnqualified(true, departmentCode, recyclingTousseErrorSource, month, SupplyRoomQualityQuota.DAY, startTime, endTime , firstDayToLastDay);
+			recyclingTousseErrorAmount = getUnqualified(false, departmentCode, recyclingTousseErrorSource, month, SupplyRoomQualityQuota.DAY, startTime, endTime , firstDayToLastDay);
 		}
 		/**
 		 * 8 包内器械缺失件数
 		 */
 		Map<String, Object> missingInTousseAmount = null;
 		if(dataIndexSources.contains(SupplyRoomQualityQuota.DATAINDEXSOURCE_MISSING_IN_TOUSSE)){
 			String[] missingInTousseSource = goodsOptionManager.getGoodsOptionValue(GoodsOption.MODEL_MISSING_INTOUSSE, "");
-			missingInTousseAmount = getUnqualified(true, departmentCode, missingInTousseSource, month, SupplyRoomQualityQuota.DAY, startTime, endTime , firstDayToLastDay);
+			missingInTousseAmount = getUnqualified(false, departmentCode, missingInTousseSource, month, SupplyRoomQualityQuota.DAY, startTime, endTime , firstDayToLastDay);
 		}
 		/**
 		 * 9 包内器械功能不全
 		 */
 		Map<String, Object> insufficiencyInTousseAmount = null;
 		if(dataIndexSources.contains(SupplyRoomQualityQuota.DATAINDEXSOURCE_INSUFFICIENCY_IN_TOUSSE)){
 			String[] insufficiencyInTousseSource = goodsOptionManager.getGoodsOptionValue(GoodsOption.MODEL_INSUFFICIENCY_INTOUSSE, "");
-			insufficiencyInTousseAmount = getUnqualified(true, departmentCode, insufficiencyInTousseSource, month, SupplyRoomQualityQuota.DAY, startTime, endTime , firstDayToLastDay);
+			insufficiencyInTousseAmount = getUnqualified(false, departmentCode, insufficiencyInTousseSource, month, SupplyRoomQualityQuota.DAY, startTime, endTime , firstDayToLastDay);
 		}
 		/**
 		 * 10 包内器械种类错误
 		 */
 		Map<String, Object> typEerrorInTousseAmount = null;
 		if(dataIndexSources.contains(SupplyRoomQualityQuota.DATAINDEXSOURCE_TYPE_ERROR_IN_TOUSSE)){
 			String[] typEerrorInTousseSource = goodsOptionManager.getGoodsOptionValue(GoodsOption.MODEL_TYPEERROR_INTOUSSE, "");
-			typEerrorInTousseAmount = getUnqualified(true, departmentCode, typEerrorInTousseSource, month, SupplyRoomQualityQuota.DAY, startTime, endTime , firstDayToLastDay);
+			typEerrorInTousseAmount = getUnqualified(false, departmentCode, typEerrorInTousseSource, month, SupplyRoomQualityQuota.DAY, startTime, endTime , firstDayToLastDay);
 		}
 		/**
 		 * 11 包内化学指示卡不合格
 		 */
 		Map<String, Object> model_chemicalindicatorcard_intousse_unqualifiedAmount = null;
 		if(dataIndexSources.contains(SupplyRoomQualityQuota.DATAINDEXSOURCE_CHEMICALINDICATORCARD_INTOUSSE_UNQUALIFIED)){
 			String[] model_chemicalindicatorcard_intousse_unqualifiedSource = goodsOptionManager.getGoodsOptionValue(GoodsOption.MODEL_CHEMICALINDICATORCARD_INTOUSSE_UNQUALIFIED, "");
-			model_chemicalindicatorcard_intousse_unqualifiedAmount = getUnqualified(true, departmentCode, model_chemicalindicatorcard_intousse_unqualifiedSource, month, SupplyRoomQualityQuota.DAY, startTime, endTime , firstDayToLastDay);
+			model_chemicalindicatorcard_intousse_unqualifiedAmount = getUnqualified(false, departmentCode, model_chemicalindicatorcard_intousse_unqualifiedSource, month, SupplyRoomQualityQuota.DAY, startTime, endTime , firstDayToLastDay);
 		}
 		/**
 		 * 12 物品标识不正确