Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
===================================================================
diff -u -r15711 -r15718
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java	(.../JasperReportManagerImpl.java)	(revision 15711)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java	(.../JasperReportManagerImpl.java)	(revision 15718)
@@ -866,6 +866,29 @@
 	}
 
 	/**
+	 * 处理器械包总包数
+	 */
+	public EighteenQuotaBean getTousseAmount(String year,String departCoding) {
+		if (StringUtils.isNotBlank(year)) {
+			String queryYear = year + "-01-01 00:00:00";
+			String nextYear = getNextYear(year) + " 00:00:00";
+			String invoiceSql = "select  "+dateQueryAdapter.dateConverAdapter3("iv.sendTime","mm")+" as monthstr,sum(ii.amount) from InvoiceItem ii,Invoice iv "
+			+ " where ii.invoice_id = iv.id and ii.diposable='否' "
+			+ " and ii.tousseType != '敷料包' "
+			+ " and ii.tousseType != '外来器械包' "
+			+ " and ii.tousseType != '消毒物品' "
+			+ " and iv.sendTime between "+dateQueryAdapter.dateAdapter(queryYear)
+			+ " and "+dateQueryAdapter.dateAdapter(nextYear)
+			+ " and iv.orgUnitCoding = '"+departCoding+"'"
+			+ " group by "+dateQueryAdapter.dateConverAdapter3("iv.sendTime","mm");
+			ResultSet tousseRS = objectDao.executeSql(invoiceSql);
+			
+			//Map<String,Integer> map = getGeneralMaterialMap(year,departCoding);
+			return getEveryMonthAmount(tousseRS, "处理器械包总包数");
+		}
+		return null;
+	}
+	/**
 	 * 处理器械总件数
 	 */
 	public EighteenQuotaBean getGeneralMaterialAmount(String year,String departCoding) {
@@ -878,11 +901,15 @@
 //					+ " 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"
 			+ " where ii.invoice_id = iv.id and ii.tousseName=td.tdName "
+			+ " and ii.diposable='否' "
+			+ " and ii.tousseType != '敷料包' "
+			+ " and ii.tousseType != '外来器械包' "
+			+ " and ii.tousseType != '消毒物品' "
 			+ " and iv.sendTime between "+dateQueryAdapter.dateAdapter(queryYear)
 			+ " and "+dateQueryAdapter.dateAdapter(nextYear)
 			+ " and iv.orgUnitCoding = '"+departCoding+"'"
@@ -894,7 +921,6 @@
 		}
 		return null;
 	}
-
 	/**
 	 * 外来器械总件数
 	 * 
@@ -967,17 +993,17 @@
 //					+" group by "+dateQueryAdapter.dateConverAdapter3("i.sendtime","mm");
 //			ResultSet invoiceResult = objectDao.executeSql(invoiceSql);
 			
-			String morrowSendSql = "select " + dateQueryAdapter.dateConverAdapter3("iv.sendTime","mm") +" monthstr,count(ii.amount) from Invoice iv,InvoiceItem ii "
-			+ " where iv.id=ii.invoice_id " 
+			String morrowSendSql = "select " + dateQueryAdapter.dateConverAdapter3("iv.sendTime","mm") +" monthstr,sum(ii.amount) from Invoice iv,InvoiceItem ii "
+			+ " where iv.id=ii.invoice_id and ii.diposable='否' " 
 			+ " and (iv.depart like '%手术室%' or iv.depart like '%麻醉%')"
 			+ " and " + timeCompareSql
 			+ " and iv.sendTime between " + dateQueryAdapter.dateAdapter(queryYear)
 			+ "and "+dateQueryAdapter.dateAdapter(nextYear)
 			+ " group by " + dateQueryAdapter.dateConverAdapter3("iv.sendTime","mm");
 			ResultSet morrowSendResult = objectDao.executeSql(morrowSendSql);
 			
-			String totalSql = "select " + dateQueryAdapter.dateConverAdapter3("iv.sendTime","mm") +" monthstr,count(ii.amount) from Invoice iv,InvoiceItem ii "
-			+ " where iv.id=ii.invoice_id " 
+			String totalSql = "select " + dateQueryAdapter.dateConverAdapter3("iv.sendTime","mm") +" monthstr,sum(ii.amount) from Invoice iv,InvoiceItem ii "
+			+ " where iv.id=ii.invoice_id and ii.diposable='否' " 
 			+ " and (iv.depart like '%手术室%' or iv.depart like '%麻醉%')"
 			+ " and iv.sendTime between " + dateQueryAdapter.dateAdapter(queryYear)
 			+ "and "+dateQueryAdapter.dateAdapter(nextYear)
Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManager.java
===================================================================
diff -u -r15481 -r15718
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManager.java	(.../JasperReportManager.java)	(revision 15481)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManager.java	(.../JasperReportManager.java)	(revision 15718)
@@ -91,6 +91,13 @@
 	public EighteenQuotaBean getPackageIdentification(String queryYear,String departCoding);
 
 	public EighteenQuotaBean getPackageIndicatorCard(String queryYear,String departCoding);
+	/**
+	 * 处理器械包总包数
+	 * @param month
+	 * @param departCoding
+	 * @return
+	 */
+	public EighteenQuotaBean getTousseAmount(String year,String departCoding);
 
 	public List<DisinfectionFractionDefectiveBean> getDisinfectionFDSource(
 			String month,String departCoding);
Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java
===================================================================
diff -u -r15493 -r15718
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java	(.../JasperreportsAction.java)	(revision 15493)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java	(.../JasperreportsAction.java)	(revision 15718)
@@ -1832,20 +1832,22 @@
 			// 外来手术器械总件数
 			EighteenQuotaBean bean14 = jasperReportManager
 					.getForeignMaterialAmount(queryYear,departCoding);
+			// 处理器械包总包数
+			EighteenQuotaBean bean15 = jasperReportManager.getTousseAmount(queryYear,departCoding);
 			// 处理器械总件数
-			EighteenQuotaBean bean15 = jasperReportManager
+			EighteenQuotaBean bean16 = jasperReportManager
 					.getGeneralMaterialAmount(queryYear,departCoding);
 			// 处理敷料总件数
-			EighteenQuotaBean bean16 = jasperReportManager
+			EighteenQuotaBean bean17 = jasperReportManager
 					.getDressingMaterialAmount(queryYear,departCoding);
 			// 灭菌物品包装密闭不合格率
-			EighteenQuotaBean bean17 = jasperReportManager
+			EighteenQuotaBean bean18 = jasperReportManager
 					.getPackObturationDefective(queryYear,departCoding);
 			// 消毒物品不合格率
-			EighteenQuotaBean bean18 = jasperReportManager
+			EighteenQuotaBean bean19 = jasperReportManager
 					.getDisinfectMaterialDefective(queryYear,departCoding);
 			// 无菌物品发放错误发生数
-			EighteenQuotaBean bean19 = jasperReportManager
+			EighteenQuotaBean bean20 = jasperReportManager
 					.getGoodsDeliveryError(queryYear,departCoding);
 			list.add(bean);
 			list.add(bean2);
@@ -1866,6 +1868,7 @@
 			list.add(bean17);
 			list.add(bean18);
 			list.add(bean19);
+			list.add(bean20);
 		}
 		return list;
 	}