Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/CustomReportsOfXjjqzyy.java
===================================================================
diff -u -r30316 -r30698
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/CustomReportsOfXjjqzyy.java	(.../CustomReportsOfXjjqzyy.java)	(revision 30316)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/CustomReportsOfXjjqzyy.java	(.../CustomReportsOfXjjqzyy.java)	(revision 30698)
@@ -816,13 +816,6 @@
 		return sql;
 	}
 	int dataSoureOfMaterialsCountOfToussesInReports = CssdUtils.getSystemSetConfigByNameInt("dataSoureOfMaterialsCountOfToussesInReports", 3);
-	// 获取回收总数sql
-	private String getTotalRecSql(ReportQueryParams params){
-		String sql = "select sum(tl.amount) from ("
-				+ dataIndex.getWorkAmountByMaterialSQL("回收数量",
-						params,dataSoureOfMaterialsCountOfToussesInReports) + ") tl ";
-		return sql;
-	}
 
 	// 获取装配总数sql
 	private String getTotalPackingSql(ReportQueryParams params){
@@ -853,16 +846,6 @@
 						params,dataSoureOfMaterialsCountOfToussesInReports) + ") tl ";
 		return sql;
 	}
-	// 获取工作量持续收集不合格的数据sql  包含监测项名字
-	private String getWorkUnQualityAmountContainSql(String formName,String startDay,String endDay,String querySupplyRoom){
-		String sql =" select sum(qmd.amount) amount "
-				 + " from QualityMonitoringInstance qmi,FormInstance fi,FormDefinition fd,QualityMonitoringGoods qmd" 
-				 + " where qmi.id=fi.id and fi.formDefinition_id=fd.id and qmi.id = qmd.qualityMonitoringInstance_id "
-				 + SqlUtils.get_InSql_Extra("fd.orgUnitCoding", querySupplyRoom)
-				 + " and fd.formName like '%" + formName + "%'"
-				 + " and (qmi.dateTime between " +dateQueryAdapter.dateAdapter(startDay)+" and " + dateQueryAdapter.dateAdapter(endDay) + ")";	
-		return sql;
-	}
 	@Override
 	public List<WorkQualityCollection> getWorkQualityCollectionListAllyear(
 			String year, String querySupplyRoom, Map<String, String> params)
@@ -1344,33 +1327,6 @@
 		}
 		list.add(bean);
 	}
-	/**
-	 * 获取每个月数据的map,sql的查询结果第一个必须是字符串，第二个是数量
-	 * @param sql
-	 * @return
-	 */
-	private Map<String,Integer> getMapBySql(String sql){
-		Map<String,Integer> map = new HashMap<String,Integer>();
-		if(StringUtils.isBlank(sql)){
-			return map;
-		}
-		ResultSet result2 = objectDao.executeSql(sql);
-		try{
-			while(result2.next()){
-				String key = result2.getString(1);
-				// 月份以0开头的，去掉0
-				if(key.length() > 1 && Integer.valueOf(key) < 10){
-					key = Integer.valueOf(key).toString();
-				}
-				map.put(key, result2.getInt(2));
-			}
-		}catch(SQLException e){
-			e.printStackTrace();
-		}finally{
-			DatabaseUtil.closeResultSetAndStatement(result2);
-		}
-		return map;
-	}
 	private void setBetweenSql(ReportQueryParams params, String startDay, String endDay){
 		String betweenSql = String.format(" between %s and %s ", dateQueryAdapter.dateAdapter(startDay),dateQueryAdapter.dateAdapter(endDay));
 		params.betweenSql = betweenSql;