Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
===================================================================
diff -u -r29910 -r29912
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java	(.../JasperReportManagerImpl.java)	(revision 29910)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java	(.../JasperReportManagerImpl.java)	(revision 29912)
@@ -2920,11 +2920,6 @@
 		//SupplyRoomConfig firstSupplyRoomConfig =  supplyRoomConfigManager.getFirstSupplyRoomConfig();
 		//当前用户是否为供应室(包含一二级供应室)用户
 		boolean isSupplyRoomUser = supplyRoomConfigManager.isSupplyRoomUser();
-		//当前用户是否为高值耗材供应处理科室的用户
-		boolean isExpensiveGoodsSupplyRoomUser = supplyRoomConfigManager.isExpensiveGoodsSupplyRoomUser();
-		if(!isSupplyRoomUser && !isExpensiveGoodsSupplyRoomUser){
-			department = AcegiHelper.getCurrentOrgUnitName();
-		}
 		List<MonthReportBean> list = new ArrayList<MonthReportBean>();
 		String invoiceWheresql = "" ;
 		//高值耗材(新)过滤条件
@@ -3045,13 +3040,13 @@
 					leftJoinSqlForReturnSql = " left join " + tousseDefinitionIdMaterialAmountSql + " tdm on tdm.id = i.tousseDefinition_id ";
 				}
 				//退货统计(器械包或一次性物品)
-				String returnSql = "select r.type,(-i.settlementPrice),-i.amount,r.departCoding,r.depart,"
+				String returnSql = "select r.type,(-i.settlementPrice),-i.amount,r.settleAccountsDepartCoding,r.settleAccountsDepart,"
 								 + queryColumnSql
 							     + " from ReturnGoodsRecord r join ReturnGoodsItem i on r.id = i.returnGoodsRecord_ID " 
 							     + leftJoinSqlForReturnSql
 							     + " where "+returnGoodsItemPredicate+ tousseTypeReturnSql + " and  "+getHandleDeptCodeSql("r.handleDepartCode")+" and r.returnTime " + betweenSql;
 				if(StringUtils.isNotBlank(department)){
-					returnSql += " and r.depart = '" + department + "'";
+					returnSql += " and r.settleAccountsDepart = '" + department + "'";
 				}
 				ResultSet rs5 = objectDao.executeSql(returnSql);
 				try {