Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
===================================================================
diff -u -r35896 -r35897
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java	(.../JasperReportManagerImpl.java)	(revision 35896)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java	(.../JasperReportManagerImpl.java)	(revision 35897)
@@ -221,7 +221,6 @@
 import com.forgon.disinfectsystem.tousse.materialmanager.service.MaterialEntryItemManager;
 import com.forgon.disinfectsystem.tousse.toussedefinition.service.TousseDefinitionManager;
 import com.forgon.disinfectsystem.tousse.toussedefinition.service.TousseInstanceManager;
-import com.forgon.disinfectsystem.useRecord.service.UseRecordManager;
 import com.forgon.disinfectsystem.vo.SupplyRoomMaterialStocktaking;
 import com.forgon.disinfectsystem.vo.TousseOperate;
 import com.forgon.exception.SystemException;
@@ -280,8 +279,6 @@
 	@Autowired
 	private MaterialDefinitionManager materialDefinitionManager;
 	@Autowired
-	private UseRecordManager useRecordManager;
-	@Autowired
 	private TousseInstanceManager tousseInstanceManager;
 	@Autowired
 	private HttpOptionManager httpOptionManager;
@@ -1458,58 +1455,6 @@
 		}
 		return map;
 	}
-
-	/**
-	 * 计算某段时间某部门每个用户(或者某个用户)录入的使用记录条数、器械包个数、一次性物品个数.
-	 * @param name		科室名称
-	 * @param operator	录入人名字，如果没有指定则查此科室的全部人员
-	 * @param coding	科室编码
-	 * @param startDate	开始日期
-	 * @param endDate	结束日期
-	 * @return List<UseRecordItemBean>
-	 */
-	private List<UseRecordItemBean> getUserAndRecordAmount(String name, String operator, String coding,
-			String startDate, String endDate) {
-		String operatorSql = "";
-		if (StringTools.isNotBlank(operator)) {
-			operatorSql = String.format(" and operator='%s' ", operator);
-		}
-		String sql = String.format("select u.operator,count(operator) amount from userecord u where depart='%s' %s "
-				+ "and u.enteringDate between %s and %s group by operator",
-				name, operatorSql, dateQueryAdapter.dateAdapter(startDate), dateQueryAdapter.dateAdapter(endDate));
-		
-		List<UseRecordItemBean> itemBeans = new ArrayList<UseRecordItemBean>();
-		ResultSet rs = objectDao.executeSql(sql);
-		try {
-			while (rs.next()) {
-				String operator2 = rs.getString("operator");  //录入人
-				int amount = rs.getInt("amount");  //录入的使用记录条数
-				
-				int tousseAmount = useRecordManager.getTousseAmountByDepartAndUserName(coding, operator2, startDate, endDate);
-				int disposableGoodsAmount = useRecordManager.getDisposableGoodsAmount(coding, operator2, startDate, endDate);
-				
-				
-				UseRecordItemBean itemBean = new UseRecordItemBean();
-				itemBean.setUserName(operator2);
-				itemBean.setRecordAmount(amount);
-				itemBean.setTousseAmount(tousseAmount);
-				itemBean.setDisposableGoodsAmount(disposableGoodsAmount);
-				
-				//新的高值耗材
-				if (CssdUtils.getSystemSetConfigByNameBool("enableExpensiveGoods", false)) {
-					int expensiveGoodsAmount= useRecordManager.getExpensiveGoodsAmount(coding, operator2, startDate, endDate);
-					itemBean.setExpensiveGoodsAmount(expensiveGoodsAmount);
-				}
-				
-				itemBeans.add(itemBean);
-			}
-		} catch (Exception e) {
-			e.printStackTrace();
-		} finally {
-			DatabaseUtil.closeResultSetAndStatement(rs);
-		}
-		return itemBeans;
-	}
 	
 	@Override
 	public List<UseRecordBean> getUseRecordDataSource2(String departmentName, String operator,