Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
===================================================================
diff -u -r35901 -r35902
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java	(.../JasperReportManagerImpl.java)	(revision 35901)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java	(.../JasperReportManagerImpl.java)	(revision 35902)
@@ -843,43 +843,7 @@
 			String startMonth, String endMonth, String departCoding, String goodsName) {
 		return amountContrastReportHelper.getAmountContrastBeanList(startMonth, endMonth, departCoding, goodsName);
 	}
-	
 	/**
-	 * 此方法多次调用时会多次查询数据库 不建议使用 建议使用getHandleDeptCodeSql(String, boolean , String)
-	 * @param field
-	 * @return
-	 */
-	@Deprecated
-	private String getHandleDeptCodeSql(String field) {
-		LoginUserData user = AcegiHelper.getLoginUser();
-		String handleDeptCodeSql = "";
-		if (supplyRoomConfigManager.isSupplyRoomUser() || supplyRoomConfigManager.isExpensiveGoodsSupplyRoomUser()) {
-			handleDeptCodeSql = String.format("%s='%s'", field,
-					user.getOrgUnitCodingFromSupplyRoomConfig());
-		} else {
-//			handleDeptCodeSql = String
-//					.format("%s='%s'", field, user.getCurrentOrgUnitCode());
-			handleDeptCodeSql = "1=1";
-		}
-		return handleDeptCodeSql;
-	}
-	/**
-	 * 明细核算月报和核算月报用的过滤供应室的语句
-	 * @param field 过滤的字段
-	 * @param isSupplyRoomUserOrIsExpensiveGoodsSupplyRoomUser 登录用户是否供应室用户 或者 是否是高值耗材处理科室用户 是才过滤供应室
-	 * @param orgUnitCoding 登录用户所属供应室编码
-	 * @return
-	 */
-	private String getHandleDeptCodeSql(String field, boolean isSupplyRoomUserOrIsExpensiveGoodsSupplyRoomUser, String orgUnitCoding){
-		String handleDeptCodeSql = null;
-		if (isSupplyRoomUserOrIsExpensiveGoodsSupplyRoomUser) {
-			handleDeptCodeSql = String.format(" %s='%s' ", field, orgUnitCoding);
-		} else {
-			handleDeptCodeSql = " 1=1 ";
-		}
-		return handleDeptCodeSql;
-	}
-	/**
 	 * 核算月报查询
 	 */
 	@Override