Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/dataindex/DataIndex.java
===================================================================
diff -u -r35393 -r35495
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/dataindex/DataIndex.java	(.../DataIndex.java)	(revision 35393)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/dataindex/DataIndex.java	(.../DataIndex.java)	(revision 35495)
@@ -1100,7 +1100,7 @@
 				miCountSql = "mi.count";
 				joinMaterialInstanceSql = "inner join MaterialInstance mi on mi.tousse_id = td.id";
 			}
-			if(!obj.getIsOnlyQueryComboTousse()){
+			if(true){
 				amountSql = String
 						.format("select sum(%s) amount %s "
 								+ "from Invoice i inner join InvoiceItem ii on ii.invoice_id=i.id inner join TousseDefinition td on ii.tousseDefinitionId  = td.id join TousseDefinition tdc on tdc.id=td.ancestorID "
@@ -1150,43 +1150,6 @@
 									obj.groupBySql);
 				}
 			}
-			if(obj.getIsQueryCom()){
-				if(!obj.getIsOnlyQueryComboTousse()){
-					amountSql += " union all ";
-				}
-				String queryDisposableGoodAmountSql = "";
-				if(obj.includeDisposableGoodsInTousse){
-					queryDisposableGoodAmountSql = " + case when ti.disposableGoodAmount is null then 0 else  ti.disposableGoodAmount end ";
-				}
-				if(dataSoureOfMaterialsCountOfToussesInReports == 3){
-					miCountSql = "ti.materialAmount" + queryDisposableGoodAmountSql;
-					joinMaterialInstanceSql = "";
-				}else{
-					miCountSql = "mi.count";
-					joinMaterialInstanceSql = "inner join MaterialInstance mi on mi.tousse_id = td.id";
-				}
-				amountSql += String
-						.format("select sum(%s) amount %s "
-								+ "from Invoice i inner join TousseInstance ti on ti.invoice_id = i.id inner join TousseDefinition td on ti.tousseDefinition_id = td.id join TousseDefinition tdc on tdc.id=td.ancestorID "
-								+ " %s where "+ obj.getIsQueryComByPackageSize() +" ti.comboTousseInstanceId is not null and i.sendTime %s %s %s and %s %s %s "
-								//+ "and i.sender is not null and %s(i.sender)<>0"
-								+ " %s %s %s %s %s",
-								miCountSql,
-								obj.extraSelectColumns,
-								joinMaterialInstanceSql,
-								obj.betweenSql,
-								SqlUtils.get_InSql_Extra("i.orgUnitCoding", obj.querySupplyRoom),
-								SqlUtils.get_InSql_Extra("i.depart", obj.applicationDepart),
-								SqlUtils.getStringFieldInLargeCollectionsPredicate("i.depart", obj.recyDepartGroup, " 1=1 "),
-								obj.sterilizationModeSqlWithAliasOfTousseDefinitionIsTd,
-								obj.packageTypeSqlWithAliasOfTousseDefinitionIsTd,
-								//obj.sqlLengthFunctionName,
-								obj.isDisableIDCardSqlWithAliasOfTousseDefinitionIsTd,
-								obj.taskGroupSqlWithAliasOfTousseDefinitionIsTd.replaceAll("tdc", "ti"),
-								obj.tousseGroupSqlWithAliasOfTousseDefinitionIsTd,
-								obj.extraQuery,
-								obj.groupBySql);
-			}
 
 			// 一次性物品的发货统计
 			// TODO:原来的代码做了一次性物品的数量统计，导致发货的器械件数很大，应该单独做一列，列出一次性物品的数量
@@ -1960,13 +1923,13 @@
 			}else{
 				groupBySql = "";
 			}
-			if(!obj.getIsOnlyQueryComboTousse()){
+			if(true){
 				if (obj.includeTousses) {
 					amountSql = String
 							.format("select sum(ii.amount) amount %s %s %s %s %s "
 									+ "from Invoice i inner join InvoiceItem ii on ii.invoice_id = i.id "
 									+ "inner join TousseDefinition td on td.id=ii.tousseDefinitionId join TousseDefinition tdc on tdc.id=td.ancestorID %s "
-									+ "where %s and i.sendTime %s %s %s and %s %s %s "
+									+ "where i.sendTime %s %s %s and %s %s %s "
 									//+ "and i.sender is not null and %s(i.sender)<>0"
 									+ " %s %s %s %s %s "
 									+ " %s %s ",
@@ -1976,7 +1939,6 @@
 									obj.selectTousseName ? ",td.name tousseName" : "",
 									obj.extraSelectColumns,
 									obj.extraJoinCondition,
-									obj.haveCombo?"ii.comboTousseInstanceId is null":"1=1",
 									obj.betweenSql,
 									SqlUtils.get_InSql_Extra("i.orgUnitCoding",
 											obj.querySupplyRoom),
@@ -2019,40 +1981,6 @@
 									groupBySql);
 				}
 			}
-			if(obj.getIsQueryCom()){
-				if(!obj.getIsOnlyQueryComboTousse()){
-					amountSql += " union all ";
-				}
-				amountSql += String
-						.format("select sum(ii.amount) amount %s %s %s %s %s "
-								+ "from Invoice i inner join InvoiceItem ii on ii.invoice_id = i.id "
-								+ "inner join TousseDefinition td on td.id=ii.tousseDefinitionId join TousseDefinition tdc on tdc.id=td.ancestorID %s "
-								+ "inner join TousseInstance ti on ti.tousseDefinition_id=td.id "
-								+ "where "+ obj.getIsQueryComByPackageSize() +" ti.comboTousseInstanceId is null and ti.comboTousseDefinitionId is null and ti.invoice_id = i.id and td.tousseType ='"+ TousseDefinition.PACKAGE_TYPE_COMBO +"' and i.sendTime %s %s %s and %s %s %s "
-								//+ "and i.sender is not null and %s(i.sender)<>0"
-								+ " %s %s %s %s %s "
-								+ " %s",
-								obj.queryIntegral?",sum(ii.amount*tdc.integral) integral":"",
-								obj.selectUserName ? ",i.sender userName" : "",
-								obj.selectTousseType ? ", '"+TousseDefinition.PACKAGE_TYPE_COMBO+"' tousseType" : "",
-								obj.selectTousseName ? ",td.name tousseName" : "",
-								obj.extraSelectColumns,
-								obj.extraJoinCondition,
-								obj.betweenSql,
-								SqlUtils.get_InSql_Extra("i.orgUnitCoding",
-										obj.querySupplyRoom),
-								SqlUtils.get_InSql_Extra("i.depart",obj.applicationDepart),
-								SqlUtils.getStringFieldInLargeCollectionsPredicate("i.depart", obj.recyDepartGroup, " 1=1 "),
-								obj.sterilizationModeSqlWithAliasOfTousseDefinitionIsTd,
-								obj.packageTypeSqlWithAliasOfTousseDefinitionIsTd,
-								//obj.sqlLengthFunctionName,
-								obj.isDisableIDCardSqlWithAliasOfTousseDefinitionIsTd,
-								obj.taskGroupSqlWithAliasOfTousseDefinitionIsTd.replaceAll("tdc", "ti"),
-								obj.tousseGroupSqlWithAliasOfTousseDefinitionIsTd,
-								obj.extraWhereSql,
-								obj.extraQuery,
-								groupBySql);
-			}
 			break;
 		case "发货中包含加急的包数量":
 			if (obj.isGroup){
@@ -2211,17 +2139,16 @@
 			break;
 			
 		case "签收数量":
-			if(!obj.getIsOnlyQueryComboTousse()){
+			if(true){
 				amountSql = String
 						.format("select count(*) amount %s, td.tousseType, td.name tousseName "
 								+ "from TousseInstance ti inner join TousseDefinition td on ti.tousseDefinition_id=td.id join TousseDefinition tdc on tdc.id=td.ancestorID %s "
-								+ "where %s and ti.signedDate %s %s %s and %s %s %s "
+								+ "where ti.comboTousseInstanceId is null and ti.signedDate %s %s %s and %s %s %s "
 								+ SqlUtils.getIsNotNullSql(dbConnection, "ti.signedUser")
 								+ " %s %s %s %s %s %s "
 								+ "group by td.tousseType,td.name",
 								obj.extraSelectColumns,
 								obj.extraJoinCondition,
-								obj.haveCombo?"ti.comboTousseInstanceId is null and ti.comboTousseDefinitionId is null":"1=1",
 								obj.betweenSql,
 								SqlUtils.get_InSql_Extra("ti.orgUnitCoding", obj.querySupplyRoom),
 								SqlUtils.get_InSql_Extra("ti.depart", obj.applicationDepart),
@@ -2236,32 +2163,6 @@
 								obj.extraQuery,
 								obj.extraWhereSql);
 			}
-			if(obj.getIsQueryCom()){
-				if(!obj.getIsOnlyQueryComboTousse()){
-					amountSql += " union all ";
-				}
-				amountSql += String
-						.format("select count(*) amount %s, td.tousseType, td.name tousseName "
-								+ "from TousseInstance ti inner join TousseDefinition td on ti.tousseDefinition_id=td.id join TousseDefinition tdc on tdc.id=td.ancestorID %s "
-								+ "where "+ obj.getIsQueryComByPackageSize() +" ti.comboTousseInstanceId is null and ti.comboTousseDefinitionId is not null and ti.signedDate %s %s %s and %s %s %s "
-								+ SqlUtils.getIsNotNullSql(dbConnection, "ti.signedUser")
-								+ " %s %s %s %s %s "
-								+ "group by td.tousseType,td.name ",
-								obj.extraSelectColumns,
-								obj.extraJoinCondition,
-								obj.betweenSql,
-								SqlUtils.get_InSql_Extra("ti.orgUnitCoding", obj.querySupplyRoom),
-								SqlUtils.get_InSql_Extra("ti.depart", obj.applicationDepart),
-								SqlUtils.getStringFieldInLargeCollectionsPredicate("ti.depart", obj.recyDepartGroup, " 1=1 "),
-								obj.sterilizationModeSqlWithAliasOfTousseDefinitionIsTd,
-								obj.packageTypeSqlWithAliasOfTousseDefinitionIsTd,
-								//obj.sqlLengthFunctionName,
-								obj.isDisableIDCardSqlWithAliasOfTousseDefinitionIsTd,
-								obj.taskGroupSqlWithAliasOfTousseDefinitionIsTd.replaceAll("tdc", "ti"),
-								obj.tousseGroupSqlWithAliasOfTousseDefinitionIsTd,
-								obj.extraQuery,
-								obj.extraWhereSql);
-			}
 			break;
 			
 
Index: ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java
===================================================================
diff -u -r35472 -r35495
--- ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java	(.../InvoiceManagerImpl.java)	(revision 35472)
+++ ssts-invoice/src/main/java/com/forgon/disinfectsystem/invoicemanager/service/InvoiceManagerImpl.java	(.../InvoiceManagerImpl.java)	(revision 35495)
@@ -2125,7 +2125,7 @@
 			invoiceItem.setTousseType(comboTousseDefinition.getTousseType());
 			invoiceItem.setTousseName(comboTousseInstance.getTousseName());
 			invoiceItem.setTousseDefinitionId(comboTousseDefinition.getId());
-			invoiceItem.setMaterialAmount(comboTousseDefinition.getMaterialAmount());
+			invoiceItem.setMaterialAmount(comboTousseInstance.getMaterialAmount());
 			invoiceItem.setComboTousseInstanceId(comboTousseInstance.getId());
 			invoiceItem.setSettlementPrice(comboTousseInstance.getPrice());
 //			invoiceItem.setSettlementDiscountPrice(settlementDiscountPrice);