Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/CustomReportsOfDgsfy.java
===================================================================
diff -u -r30316 -r30697
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/CustomReportsOfDgsfy.java	(.../CustomReportsOfDgsfy.java)	(revision 30316)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/CustomReportsOfDgsfy.java	(.../CustomReportsOfDgsfy.java)	(revision 30697)
@@ -288,7 +288,7 @@
 		
 		int dataSoureOfMaterialsCountOfToussesInReports = CssdUtils.getSystemSetConfigByNameInt("dataSoureOfMaterialsCountOfToussesInReports", 3);
 		// 回收总数的Map
-		Map<String,Integer> recAmountMap = workQualityCollectionDataIndex.getRecyclingAmountMap(reportParams,dataSoureOfMaterialsCountOfToussesInReports);
+		//Map<String,Integer> recAmountMap = workQualityCollectionDataIndex.getRecyclingAmountMap(reportParams,dataSoureOfMaterialsCountOfToussesInReports);
 		// 清洗总数的Map
 		Map<String,Integer> washAmountMap = workQualityCollectionDataIndex.getWashAmountByMaterialMap(reportParams,dataSoureOfMaterialsCountOfToussesInReports);
 		// 装配总数的Map
@@ -531,7 +531,6 @@
 		WorkQualityCollection tousseBean = new WorkQualityCollection();
 		WorkQualityCollection proxyTousseBean = new WorkQualityCollection();
 		WorkQualityCollection foreignTousseBean = new WorkQualityCollection();
-		WorkQualityCollection bean = new WorkQualityCollection();
 		String queryYear = year + "-01-01 00:00:00";
 		String nextYear = dataIndex.getNextYear(year) + " 00:00:00";
 
@@ -663,9 +662,6 @@
 		sourceSortMap.put("外来器械包", sortIndex++);
 		sourceSortMap.put("外院灭菌包", sortIndex++);
 		if (StringUtils.isNotBlank(month)) {
-			List<String> dateOfMonth = DisinfectionFractionDefectiveBean
-					.getDateOfMonth(month);
-			
 			 String startDay = month + "-01";
 			 
 			 String[] yearMonth = month.split("-");
@@ -962,42 +958,6 @@
 //				bean.setPercentage(fractionDefective);
 				returnList.add(tousseBean);
 			}
-			
-			for (String queryDate : dateOfMonth) {
-				String startDate = queryDate + " 00:00:00";
-				String endDate = queryDate + " 23:59:59";
-
-
-				// 数量
-				Map<String, Integer> sourceMap = new HashMap<String, Integer>();
-
-				Iterator<String> iterator = sourceMap.keySet().iterator();
-				
-				Date date = DateTools.coverStrToDate(queryDate, DateTools.COMMON_DATE_ONLY);
-				Calendar cal = Calendar.getInstance();
-				cal.setTime(date);
-				int day = cal.get(Calendar.DAY_OF_MONTH);
-				Integer amount = totalSterileToussesAmountMap.get("" + day);
-				
-				//质量监测不合格数列
-				double fractionDefective = jasperReportManager.addMonitoringDataToList(
-						departCoding, returnList, queryDate, startDate,endDate, amount);
-				
-				
-//				// 各类型包数量
-//				while (iterator.hasNext()) {
-//					String title = iterator.next();
-//					DisinfectionFractionDefectiveBean bean = new DisinfectionFractionDefectiveBean();
-//					bean.setDate(queryDate);
-//					bean.setResult(sourceMap.get(title));
-//					bean.setTitle(title);
-//					bean.setTitleSort(sourceSortMap.get(title));
-//					bean.setPercentage(fractionDefective);
-//					returnList.add(bean);
-//				}
-			}
-			
-			
 			// 月合计汇总行
 			Map<String, Integer> totalRowMap = new HashMap<String, Integer>();
 			Integer monthUnqualifiedAmount = 0; // 月不合格总数
@@ -1245,17 +1205,6 @@
 				bean.setTotalAmount(totalAmount);
 				bean.setUnqualifiedAmount(unqualifiedAmount);
 				returnList.add(bean);
-				
-				
-
-				
-				// 门诊手术腔镜器械包总数
-				PackingFractionDefectiveBean beanOutPatient = new PackingFractionDefectiveBean();
-				
-				// 外院包总数
-				PackingFractionDefectiveBean beanForeign = new PackingFractionDefectiveBean();
-				
-				
 			}
 		}
 		return returnList;