Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
===================================================================
diff -u -r21066 -r21210
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java	(.../JasperReportManagerImpl.java)	(revision 21066)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java	(.../JasperReportManagerImpl.java)	(revision 21210)
@@ -934,7 +934,7 @@
 		if (StringUtils.isNotBlank(year)) {
 			String queryYear = year + "-01-01";
 			String nextYear = getNextYear(year);
-			String sql = "select  "+dateQueryAdapter.dateConverAdapter3("t.operationTime","mm")+" as monthstr,sum(t.statisticsamount) from "
+			String sql = "select  "+dateQueryAdapter.dateConverAdapter3("t.operationTime","mm")+" as monthstr,count(*) from "
 					+ "tousseinstance t,toussedefinition d where t.toussedefinition_id = d.id and d.tousseType = '敷料包' "
 					+ " and t.operationTime between "+dateQueryAdapter.dateAdapter(queryYear)
 					+ " and "+dateQueryAdapter.dateAdapter(nextYear)
@@ -976,16 +976,12 @@
 		if (StringUtils.isNotBlank(year)) {
 			String queryYear = year + "-01-01 00:00:00";
 			String nextYear = getNextYear(year) + " 00:00:00";
-//			String washSql = "select  "+dateQueryAdapter.dateConverAdapter3("w.endDate","mm")+" as monthstr,sum(w.generalMaterialAmount+w.operateMaterialAmount+w.foreignMaterialAmount) from WashAndDisinfectRecord w"
-//					+ " where w.endDate between "+dateQueryAdapter.dateAdapter(queryYear)
-//					+ "and "+dateQueryAdapter.dateAdapter(nextYear)
-//					+ " and w.orgUnitCoding = '"+departCoding+"'"
-//					+ " group by "+dateQueryAdapter.dateConverAdapter3("w.endDate","mm");
-//			ResultSet foreignMaterialRS = objectDao.executeSql(washSql);
 			// 不包括辅料包、外来器械包、消毒物品
 			String invoiceSql = "select  "+dateQueryAdapter.dateConverAdapter3("iv.sendTime","mm")+" as monthstr,sum(ii.amount * td.amount) from InvoiceItem ii,Invoice iv,"
-			+ "(select td.name tdName, sum(mi.count) amount from MaterialInstance mi, tousseDefinition td "
-			+ " where mi.tousse_id=td.id and td.forDisplay=1 group by td.name) td"
+			+ "(select td.name tdName, sum(mi.count) amount "
+			+ " from tousseDefinition td join MaterialInstance mi on mi.tousse_id=td.id "
+			+ " join MaterialDefinition md on md.id=mi.materialDefinition_id "
+			+ " where md.isStatisticWorkLoad='是' and td.forDisplay=1 group by td.name) td"
 			+ " where ii.invoice_id = iv.id and ii.tousseName=td.tdName "
 			+ " and ii.diposable='否' "
 			+ " and ii.tousseType != '敷料包' "