Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
===================================================================
diff -u -r35810 -r35811
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java	(.../JasperReportManagerImpl.java)	(revision 35810)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java	(.../JasperReportManagerImpl.java)	(revision 35811)
@@ -1880,53 +1880,6 @@
 			String endDate, String tousseName, String orgUnit,String tousseType, String tousseGroupName, String sterilizationMode){
 		return informationOfDepartmentOperationMonitoringHelper.getSummaryInformationOfDepartmentOperationMonitoring(startDate, endDate, tousseName, orgUnit, tousseType, tousseGroupName, sterilizationMode);
 	}
-	/**
-	 * 获取已装配数量
-	 * @param startTime
-	 * @param endTime
-	 * @param tousseName
-	 */
-	private Map<String,TousseOperate> getPackedAmount(String startTime, String endTime,
-			String tousseName,Map<String,TousseOperate> toMap) {
-		
-		String sql = "select ti.tousseName,count(*) from tousseinstance ti,toussedefinition tf" 
-						+" where ti.tousseName = tf.name"
-						+" and tf.tousseType = '器械包'"
-						+" and ti.operationTime between "+ dateQueryAdapter.dateAdapter(startTime)
-						+ " and "+ dateQueryAdapter.dateAdapter(endTime);
-		
-		if(tousseName!=null && !"".equals(tousseName)){
-			sql += "and ti.tousseName = '"+tousseName+"'";
-		}
-		sql +=" group by ti.tousseName";
-		ResultSet rs = objectDao.executeSql(sql);
-		if(rs!=null){
-			try {
-				while(rs.next()){
-					String name = rs.getString(1);
-					String amount = rs.getString(2);
-					TousseOperate to = null;
-					if(toMap.size()>0 && toMap.get(name) != null){
-						to = toMap.get(name);
-						to.setPackedAmount(amount);
-					}else{
-						to = new TousseOperate();
-						to.setTousseName(name);
-						to.setApplyAmount("0");
-//						to.setRecyclingAmount(0);
-						to.setPackedAmount(amount);
-						to.setUnPackAmount("0");
-						toMap.put(name, to);
-					}
-				}
-			} catch (SQLException e) {
-				e.printStackTrace();
-			}finally {
-				DatabaseUtil.closeResultSetAndStatement(rs);
-			}
-		}
-		return toMap;
-	}
 
 	/**
 	 * 根据年度或季度或月份获取查询时间