Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
===================================================================
diff -u -r13100 -r13102
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java	(.../JasperReportManagerImpl.java)	(revision 13100)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java	(.../JasperReportManagerImpl.java)	(revision 13102)
@@ -69,6 +69,7 @@
 import com.forgon.disinfectsystem.entity.invoicemanager.DiposableGoodsItem;
 import com.forgon.disinfectsystem.entity.invoicemanager.Invoice;
 import com.forgon.disinfectsystem.entity.invoicemanager.InvoicePlan;
+import com.forgon.disinfectsystem.entity.invoicemanager.MaterialItem;
 import com.forgon.disinfectsystem.entity.materialmanager.MaterialCheck;
 import com.forgon.disinfectsystem.entity.materialmanager.MaterialEntry;
 import com.forgon.disinfectsystem.entity.materialmanager.MaterialEntryItem;
@@ -4440,13 +4441,13 @@
 		}
 		
 		String sql = " ";
-		String tousseSql = "select '器械包' as type,po.settleAccountsDepart,po.depart,do.barcode,bo.tousseName as name,bo.price,"
+		String tousseSql = "select '器械包' as type,po.orgUnitCoding,po.settleAccountsDepart,po.depart,do.barcode,bo.tousseName as name,bo.price,"
 				+ "bo.statisticsAmount as amount,po.sendTime,po.applicant,'' as batch,'' as externalCode from Invoice po,BarcodeDevice "
 				+ "do,TousseInstance bo where po.id = bo.invoice_id and bo.id = do.id ";
-		String diposableSql = "select '一次性物品' as type, po.settleAccountsDepart,po.depart,bo.barcode,bo.name,bo.price,bo.amount,"
+		String diposableSql = "select '一次性物品' as type,po.orgUnitCoding, po.settleAccountsDepart,po.depart,bo.barcode,bo.name,bo.price,bo.amount,"
 				+ "po.sendTime,po.applicant,bo.batch,dg.externalCode from Invoice po,DiposableGoodsItem bo,DisposableGoods dg "
 				+ "where po.id = bo.invoice_id and bo.disposableGoodsID = dg.id";
-		String materialSql = "select '材料' as type, po.settleAccountsDepart,po.depart,'' as barcode,bo.name as name,bo.price as price,bo.amount,"
+		String materialSql = "select '材料' as type,po.orgUnitCoding, po.settleAccountsDepart,po.depart,'' as barcode,bo.name as name,bo.price as price,bo.amount,"
 				+ "po.sendTime,'' as applicant,'' as batch,dg.externalCode from MaterialInvoice po inner join MaterialItem bo "
 				+ " on po.id = bo.materialInvoice_id " + " inner join goodsStock gs on gs.id = bo.goodsStockId" 
 				+ " inner join MaterialDefinition dg on gs.materialDefinitionId = dg.id "
@@ -4478,7 +4479,8 @@
 		if (StringUtils.isNotBlank(batchNumber)) {
 			sql += " and m.batch = '" + batchNumber + "'";
 		}
-		
+		String handleDeptCode = AcegiHelper.getLoginUser().getOrgUnitCodingFromSupplyRoomConfig();
+		sql += " and m.orgUnitCoding='" + handleDeptCode + "'";
 		sql += " order by m.settleAccountsDepart,m.externalCode desc ";
 
 		InvoiceQuerySummaryService summaryService = new InvoiceQuerySummaryService(isSummary);
@@ -7780,9 +7782,10 @@
 					+ ReturnGoodsRecord.class.getSimpleName() + " r on r.id = i.returnGoodsRecord_ID ";
 			//材料的数据
 			String returnMaterialSql = "select rmr.depart,rmr.departCoding,rmr.handleDepartCode,'材料' as type,rmr.returnTime," 
-					+ "rmi.amount,rmi.settlementPrice,'' as batchNumber,rmi.price,rmi.materialName as name from "
+					+ "rmi.amount,rmi.settlementPrice,'' as batchNumber,mi.price,rmi.materialName as name from "
 					+ ReturnMaterialItem.class.getSimpleName() + " rmi inner join "
-					+ ReturnMaterialRecord.class.getSimpleName() + " rmr on rmr.id = rmi.returnMaterialRecord_ID ";
+					+ ReturnMaterialRecord.class.getSimpleName() + " rmr on rmr.id = rmi.returnMaterialRecord_ID "
+					+ " inner join " + MaterialItem.class.getSimpleName() + " mi on mi.returnMaterialItemID=rmi.id"; 
 			
 			//String sql = "select min(m.depart),sum(m.amount),sum(m.settlementPrice) from ( ";
 			String sql = "select * from (";