Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/util/DepartmentMonthDetailHelper.java
===================================================================
diff -u -r38335 -r38336
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/util/DepartmentMonthDetailHelper.java	(.../DepartmentMonthDetailHelper.java)	(revision 38335)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/util/DepartmentMonthDetailHelper.java	(.../DepartmentMonthDetailHelper.java)	(revision 38336)
@@ -762,7 +762,7 @@
 					+ instrumentSetTypesSql
 					+ " and i.settleaccountsdepart is not null "
 					//按大包发货的聚合包内器械包不算
-					+ " and not exists (select 1 from InvoiceItem ii where ii.invoice_id=ti.invoice_id and ii.tousseDefinitionId=ti.tousseDefinition_id and ii.comboTousseInstanceId is not null) "
+					+ " and not exists (select 1 from InvoiceItem ii where ii.invoice_id=ti.invoice_id and ii.tousseDefinitionId=ti.comboTousseDefinitionId and ii.comboTousseInstanceId is not null) "
 					+ groupBySql
 					+ comboSql;
 			tousseSql += " union all "
@@ -793,7 +793,7 @@
 					+ urgentSql
 					+ instrumentSetTypesSql
 					+ " and i.settleaccountsdepart is not null "
-					+ " and not exists (select 1 from InvoiceItem ii where ii.invoice_id=ti.invoice_id and ii.tousseDefinitionId=ti.tousseDefinition_id and ii.comboTousseInstanceId is not null) "
+					+ " and not exists (select 1 from InvoiceItem ii where ii.invoice_id=ti.invoice_id and ii.tousseDefinitionId=ti.comboTousseDefinitionId and ii.comboTousseInstanceId is not null) "
 					+ groupBySql
 					+ ") t "
 					+ groupBySqlOfT;
@@ -1096,10 +1096,9 @@
 				//按大包发货的聚合包退货
 				String comboPriceSql = "";
 				if("2".equals(comboTousseSendByWrapperTousse)){
-					comboPriceSql = " ,-sum((select sum(price) from TousseInstance where ri.id=returnGoodsItem_ID "
-							+ "and comboTousseInstanceId is not null)) ";	
+					comboPriceSql = ",-sum(b.price) as settlementprice,-sum(b.discountPrice) as settlementDiscountPrice";	
 				} else {
-					comboPriceSql = ", -sum(ti.price)  ";
+					comboPriceSql = ", -sum(ti.price) as settlementprice, -sum(ti.discountPrice) as settlementDiscountPrice ";
 				}
 				String returnComboSql = " union all (select "
 						+ (StringUtils.isBlank(tousseInstanceMaterialAmountSql)?"":"-"+tousseInstanceMaterialAmountSql) 
@@ -1110,12 +1109,7 @@
 						+ noQueryIntegralSql
 						+",td.name,"
 						+ "-count(*) as amount"
-						//+ ",-sum(ti.price) "
 						+ comboPriceSql
-						+ "as settlementprice"
-						//+ ",-sum(ti.discountPrice) "
-						+ comboPriceSql
-						+ "as settlementDiscountPrice"
 						+" ,td.toussetype as type ";
 				if(queryUnit){
 					returnComboSql += ",td.unit";
@@ -1128,6 +1122,7 @@
 						+ "join "
 						+ TousseInstance.class.getSimpleName()
 						+" ti on ti.returnGoodsItem_ID=ri.id "
+						+"  join (select tii.comboTousseInstanceId,sum(price) price,sum(discountPrice) discountPrice from TousseInstance tii group by tii.comboTousseInstanceId ) b on b.comboTousseInstanceId=ti.id  "
 						+ " left join " + TousseDefinition.class.getSimpleName() 
 						+ " td on td.id=ti.tousseDefinition_id"
 						+ tdLeftJoinTdcSQL