Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
===================================================================
diff -u -r16451 -r16496
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java	(.../JasperReportManagerImpl.java)	(revision 16451)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java	(.../JasperReportManagerImpl.java)	(revision 16496)
@@ -6309,6 +6309,7 @@
 						lostMaterialFilterSql += " and 1=2 ";
 						damageFilterSql += " and 1=2 ";
 						expensiveDisposablegoodsSql = " and d.expensiveDisposablegoodsId is not null ";
+						outEntryFilterSql += " and dg.goodsType = '" + DisposableGoods.TYPE_EXPENSIVEDIPOSABLEGOODS + "' ";
 					}else{
 						returnGoodsFilterSql += " and 1=2 ";
 						materialTypeFilterSql = " and d.goodsType = '"+MaterialDefinition.TYPE_EXPENSIVEMATERIALGOODS+"'";
@@ -6317,6 +6318,7 @@
 						lostMaterialFilterSql += " and m.goodsType = '"+MaterialDefinition.TYPE_EXPENSIVEMATERIALGOODS+"' ";
 						damageFilterSql += " and m.goodsType = '"+MaterialDefinition.TYPE_EXPENSIVEMATERIALGOODS+"' ";
 						expensiveDisposablegoodsSql = " and 1=2 ";
+						outEntryFilterSql += " and 1=2 ";
 					}
 				}else{
 					returnGoodsFilterSql += " and ri.expensiveDisposablegoodsId is not null and  ri.expensiveDisposablegoodsId <> 0";
@@ -6326,6 +6328,7 @@
 					lostMaterialFilterSql += " and m.goodsType = '"+MaterialDefinition.TYPE_EXPENSIVEMATERIALGOODS+"' ";
 					damageFilterSql += " and m.goodsType = '"+MaterialDefinition.TYPE_EXPENSIVEMATERIALGOODS+"' ";
 					expensiveDisposablegoodsSql = " and d.expensiveDisposablegoodsId is not null ";
+					outEntryFilterSql += " and dg.goodsType = '" + DisposableGoods.TYPE_EXPENSIVEDIPOSABLEGOODS + "' ";
 				}
 				typeFilterSql  = " and 1=2 ";
 			}else if (TYPE_AUTO_DEDUCTION.equals(typeSearch)) {
@@ -6503,14 +6506,14 @@
 				+ "	group by rr.depart,rri.goodsName,rri.amount,rri.type,dbs.batchNumber,dbs.expDate) ";
 		// 调拨出库
 		String appropriateOutDiposableGoodsSql = " union all (select oge.targetOrgUnitName as settleaccountsdepart,ged.goodsName,sum(ged.amount),sum(ged.price*ged.amount) as settlementprice,'一次性物品' as type,dgb.batchNumber as batchNumber,dgb.expDate " 
-				+" from GodownEntry oge inner join GodownEntryDiposableGoodsItem ged on oge.id = ged.godownEntryID inner join DisposableGoodsBatch dgb on ged.disposableGoodsBatchID=dgb.id "
+				+" from GodownEntry oge inner join GodownEntryDiposableGoodsItem ged on oge.id = ged.godownEntryID inner join DisposableGoodsBatch dgb on ged.disposableGoodsBatchID=dgb.id inner join DisposableGoods dg on dgb.diposablegoods_id = dg.id "
 				+"  where oge.type ='退库单' and oge.subType='调拨出库' and  "+getHandleDeptCodeSql("oge.orgUnitCode")+" "
 				+outEntryFilterSql
 				+" and "+outEntryPredicate
 				+ "	group by oge.targetOrgUnitName, ged.goodsName,dgb.batchNumber,dgb.expDate) ";
 		// 盘亏出库
 		String stocktakeOutDiposableGoodsSql = " union all (select oge.orgUnitName as settleaccountsdepart,ged.goodsName,sum(ged.amount),sum(ged.price*ged.amount) as settlementprice,'一次性物品' as type,dgb.batchNumber as batchNumber,dgb.expDate " 
-				+" from GodownEntry oge inner join GodownEntryDiposableGoodsItem ged on oge.id = ged.godownEntryID inner join DisposableGoodsBatch dgb on ged.disposableGoodsBatchID=dgb.id "
+				+" from GodownEntry oge inner join GodownEntryDiposableGoodsItem ged on oge.id = ged.godownEntryID inner join DisposableGoodsBatch dgb on ged.disposableGoodsBatchID=dgb.id inner join DisposableGoods dg on dgb.diposablegoods_id = dg.id "
 				+"  where oge.type ='退库单' and oge.subType='盘亏出库' and  "+getHandleDeptCodeSql("oge.orgUnitCode")+" "
 				+outEntryFilterSql
 				+" and "+outEntryPredicate