Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
===================================================================
diff -u -r14174 -r14175
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java	(.../JasperReportManagerImpl.java)	(revision 14174)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java	(.../JasperReportManagerImpl.java)	(revision 14175)
@@ -3708,7 +3708,6 @@
 			invoiceItemDisposableGoodsTypePredicate = String.format(" (ii.diposable='否' or ii.disposableGoodsId in(%s)) ", disposableGoodsIdSql);
 			disposableGoodsInvoiceAmountPredicate = String.format(" (ii.diposable='是' and ii.disposableGoodsId in(%s)) ", disposableGoodsIdSql);
 			returnGoodsItemPredicate = String.format(" (r.type!='一次性物品' or i.disposableGoodsId in(%s)) ", disposableGoodsIdSql);
-			receiveRecordItemPredicate = String.format(" (i.type!='一次性物品' or i.disposableGoodsId in(%s)) ", disposableGoodsIdSql);
 			outEntryPredicate = String.format(" (ged.disposableGoodsID in(%s)) ", disposableGoodsIdSql);
 		}
 		if(StringUtils.isBlank(tousseType) || !"器械材料".equals(tousseType)){
@@ -3933,6 +3932,17 @@
 		}
 		
 		if(StringUtils.isBlank(tousseType) || "器械材料".equals(tousseType) || TousseItem.TYPE_DIPOSABLE_GOODS.equals(tousseType)){
+			if("器械材料".equals(tousseType)){
+				receiveRecordItemPredicate = String.format(" (i.type!='一次性物品') ");
+			}else if(TousseItem.TYPE_DIPOSABLE_GOODS.equals(tousseType)){
+				if(StringUtils.isNotBlank(disposableGoodsType)){
+					receiveRecordItemPredicate = String.format(" (i.type='一次性物品' and i.disposableGoodsId in(%s)) ", disposableGoodsIdSql);
+				}
+			}else{
+				if(StringUtils.isNotBlank(disposableGoodsType)){
+					receiveRecordItemPredicate = String.format(" (i.type!='一次性物品' or i.disposableGoodsId in(%s)) ", disposableGoodsIdSql);
+				}
+			}
 			//供应室领用(器械材料与一次性物品)
 			String receiveSql = "select i.type,(i.amount*i.price),i.amount,r.departcoding "
 						      + "from ReceiveRecord r,ReceiveRecordItem i where r.id = i.receiverecord_id "