Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/dataindex/DataIndex.java
===================================================================
diff -u -r32592 -r32961
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/dataindex/DataIndex.java	(.../DataIndex.java)	(revision 32592)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/dataindex/DataIndex.java	(.../DataIndex.java)	(revision 32961)
@@ -1008,7 +1008,7 @@
 		case "发货数量":
 			String miCountSql = null;
 			if(dataSoureOfMaterialsCountOfToussesInReports == 3){
-				miCountSql = "case when ((td.isApplyEntireTousse='否' and td.tousseType='消毒物品') or td.tousseType='自定义器械包') then ii.materialAmount*ii.amount else ii.amount end";
+				miCountSql = "ii.materialAmount*ii.amount";
 				joinMaterialInstanceSql = "";
 			}else{
 				miCountSql = "mi.count";
@@ -1088,7 +1088,8 @@
 			
 		case "年度报表中的发货数量（按材料）":
 			if(dataSoureOfMaterialsCountOfToussesInReports == 3){
-				amountColumnSql = "case when ((td.isApplyEntireTousse='否' and td.tousseType='消毒物品') or td.tousseType='自定义器械包') then ii.materialAmount*ii.amount else ii.amount end";
+				//amountColumnSql = "case when ((td.isApplyEntireTousse='否' and td.tousseType='消毒物品') or td.tousseType='自定义器械包') then ii.materialAmount*ii.amount else ii.amount end";
+				amountColumnSql = "ii.materialAmount*ii.amount";
 				joinMaterialInstanceSql = "";
 			}else{
 				amountColumnSql = "mi.count";