Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManager.java
===================================================================
diff -u -r35936 -r35938
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManager.java	(.../JasperReportManager.java)	(revision 35936)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManager.java	(.../JasperReportManager.java)	(revision 35938)
@@ -959,8 +959,6 @@
 			List<DisinfectionFractionDefectiveBean> returnList,
 			String queryDate, String startDate, String endDate, Integer amount);
 	
-	public Integer getQualityMonitoringSourceForPacking(String sql,
-			String date, List<PackingFractionDefectiveBean> list,boolean isHideDisinfection);
 	/**
 	 * 获取生物监测统计报表数据
 	 * @param startDay 开始时间
Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
===================================================================
diff -u -r35936 -r35938
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java	(.../JasperReportManagerImpl.java)	(revision 35936)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java	(.../JasperReportManagerImpl.java)	(revision 35938)
@@ -455,38 +455,7 @@
 	public List<PackingFractionDefectiveBean> getPackingFDSource(String startTime, String endTime,String querySupplyRoom,boolean isHideDisinfection, String taskGroup, String queryDateType) {
 		return packingUnqualifieReportHelper.getPackingFDSource(startTime, endTime, querySupplyRoom, isHideDisinfection, taskGroup, queryDateType);
 	}
-
-
 	@Override
-	public Integer getQualityMonitoringSourceForPacking(String sql,
-			String date, List<PackingFractionDefectiveBean> list,boolean isHideDisinfection) {
-		ResultSet rs = objectDao.executeSql(sql);
-		Integer totalAmount = 0;
-		try {
-			while (rs.next()) {
-				String name = rs.getString(1);
-				if(isHideDisinfection == true && "消毒物品不合格".equals(name)){
-					continue;
-				}
-				Integer amount = rs.getInt(2);
-				totalAmount += amount;
-				PackingFractionDefectiveBean bean = new PackingFractionDefectiveBean();
-				bean.setDate(date);
-				bean.setResult(amount);
-				bean.setTitle(name);
-				bean.setTitleSort(10);
-				if(StringUtils.isNotBlank(name)){
-					list.add(bean);
-				}
-			}
-		} catch (Exception e) {
-			e.printStackTrace();
-		}finally {
-			DatabaseUtil.closeResultSetAndStatement(rs);
-		}
-		return totalAmount;
-	}
-	@Override
 	public List<DisinfectionFractionDefectiveBean> getDisinfectionFDSource(
 			String startTime,String endTime, String querySupplyRoom, String queryDateType) {
 		return sterilizationWorkloadReportHelper.getDisinfectionFDSource(startTime, endTime, querySupplyRoom, queryDateType);
Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/CustomReportsOfDgsfy.java
===================================================================
diff -u -r35582 -r35938
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/CustomReportsOfDgsfy.java	(.../CustomReportsOfDgsfy.java)	(revision 35582)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/CustomReportsOfDgsfy.java	(.../CustomReportsOfDgsfy.java)	(revision 35938)
@@ -1199,7 +1199,7 @@
 						+ " and "
 						+ dateQueryAdapter.dateAdapter(endDate)
 						+ " group by fd.formName";
-				Integer unqualifiedAmount = jasperReportManager.getQualityMonitoringSourceForPacking(
+				Integer unqualifiedAmount = getQualityMonitoringSourceForPacking(
 						monitoringSql, queryDate, returnList,isHideDisinfection);
 				bean.setTotalAmount(totalAmount);
 				bean.setUnqualifiedAmount(unqualifiedAmount);
@@ -1208,7 +1208,34 @@
 		}
 		return returnList;
 	}
-
+	private Integer getQualityMonitoringSourceForPacking(String sql,
+			String date, List<PackingFractionDefectiveBean> list,boolean isHideDisinfection) {
+		ResultSet rs = objectDao.executeSql(sql);
+		Integer totalAmount = 0;
+		try {
+			while (rs.next()) {
+				String name = rs.getString(1);
+				if(isHideDisinfection == true && "消毒物品不合格".equals(name)){
+					continue;
+				}
+				Integer amount = rs.getInt(2);
+				totalAmount += amount;
+				PackingFractionDefectiveBean bean = new PackingFractionDefectiveBean();
+				bean.setDate(date);
+				bean.setResult(amount);
+				bean.setTitle(name);
+				bean.setTitleSort(10);
+				if(StringUtils.isNotBlank(name)){
+					list.add(bean);
+				}
+			}
+		} catch (Exception e) {
+			e.printStackTrace();
+		}finally {
+			DatabaseUtil.closeResultSetAndStatement(rs);
+		}
+		return totalAmount;
+	}
 	/**
 	 * 获取数据  清洗区工作量及不合格率月报
 	 */