Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
===================================================================
diff -u -r23920 -r23924
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java	(.../JasperReportManagerImpl.java)	(revision 23920)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java	(.../JasperReportManagerImpl.java)	(revision 23924)
@@ -3642,9 +3642,11 @@
 				startDay = keyOfInnerMap;
 				endDay = innerMap.get(keyOfInnerMap);
 			}
-			String sql = "select sum(ti.statisticsAmount) from tousseinstance ti, invoice i,invoiceplan ip"
-					+ " where ti.invoice_id = i.id and i.invoiceplan_id = ip.id"
-					+ "	and ip.type = '消毒物品申请单' and i.sendTime >= "
+			String sql = "select sum(ti.statisticsAmount) from tousseinstance ti, invoice i,invoiceplan ip , TousseDefinition td"
+					+ " where ti.invoice_id = i.id and i.invoiceplan_id = ip.id and ti.tousseDefinition_id=td.id"
+					//+ "	and ip.type = '消毒物品申请单' " //因为消毒物品不只是消毒物品申请单里有,所以这里去掉单类型的条件过滤,在下面一行增加包类型为消毒物品
+					+ "	and td.tousseType='"+ TousseDefinition.PACKAGE_TYPE_DISINFECTION +"' "
+					+ " and i.sendTime >= "
 					+ dateQueryAdapter.dateAdapter(startDay)
 					+ " and i.sendTime <= "
 					+ dateQueryAdapter.dateAdapter(endDay)