Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
===================================================================
diff -u -r15631 -r15652
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java	(.../JasperReportManagerImpl.java)	(revision 15631)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java	(.../JasperReportManagerImpl.java)	(revision 15652)
@@ -6518,7 +6518,7 @@
 			caseSql = " CASE ii.tousseType WHEN '消毒物品' THEN  (ii.tousseName || '_' || ii.invoicePlanID) WHEN '自定义器械包' THEN  (ii.tousseName || '_' || ii.invoicePlanID) ELSE ii.tousseName END ";
 		}
 		
-		String tousseSql = " union all (select i.settleAccountsDepart," + caseSql + " as name,sum(ii.amount) as amount,sum(ii.settlementPrice) as settlementprice,ii.tousseType as type"
+		String tousseSql = "  (select i.settleAccountsDepart," + caseSql + " as name,sum(ii.amount) as amount,sum(ii.settlementPrice) as settlementprice,ii.tousseType as type"
 				+ ",'' as batchNumber,null as expDate from invoice i,InvoiceItem ii "
 				+ " where i.id = ii.invoice_id "
 				+ " and ii.diposable = '否' and  "+getHandleDeptCodeSql("i.orgUnitCoding")+" "
@@ -6534,7 +6534,7 @@
 			diposableGoodsTousseTypeSql = String.format(" and d.type='%s' ", InvoiceItem.TYPE_AUTO_DEDUCTION);
 		}
 		if(StringUtils.isBlank(typeSearch) || "一次性物品".equals(typeSearch) || "高值耗材".equals(typeSearch) || TYPE_AUTO_DEDUCTION.equals(typeSearch)){
-			diposableGoodsSql = "  (select i.settleaccountsdepart,d.name as name,sum(d.amount) as amount,sum(d.fluctuationPrice*d.amount) as settlementprice,'一次性物品' as type"
+			diposableGoodsSql = " union all (select i.settleaccountsdepart,d.name as name,sum(d.amount) as amount,sum(d.fluctuationPrice*d.amount) as settlementprice,'一次性物品' as type"
 					+ ",d.batch as batchNumber,dgbs.expDate from invoice i,DiposableGoodsItem d," + DisposableGoodsBatchStock.class.getSimpleName() + " dgbs "
 					+ " where i.id = d.invoice_id and d.disposableGoodsBatchStockID=dgbs.id and  "+getHandleDeptCodeSql("i.orgUnitCoding")+"  "
 					+" and "+diposableGoodsItemPredicate
@@ -6633,10 +6633,9 @@
 				+ "	group by oge.orgUnitName, ged.goodsName,dgb.batchNumber,dgb.expDate) ";
 		
 		
-		String sql =   diposableGoodsSql  + supplyRoomDiposableGoodsSql ;
+		String sql = tousseSql + diposableGoodsSql + supplyRoomDiposableGoodsSql ;
 		
 		if(!TYPE_AUTO_DEDUCTION.equals(typeSearch)){
-			sql += tousseSql;
 			sql += materialInvoiceSql;
 			sql += returnGoodsSql;
 			sql += materialReturnSql;