Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplyroomconfig/service/SupplyRoomConfigManagerImpl.java
===================================================================
diff -u -r17521 -r17837
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplyroomconfig/service/SupplyRoomConfigManagerImpl.java	(.../SupplyRoomConfigManagerImpl.java)	(revision 17521)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/supplyroomconfig/service/SupplyRoomConfigManagerImpl.java	(.../SupplyRoomConfigManagerImpl.java)	(revision 17837)
@@ -571,7 +571,9 @@
 		}
 		return false;
 	}
-
+	/**
+	 * 判断登录用户是否为供应室用户（一级供应室或者二级供应室）
+	 */
 	@Override
 	public boolean isSupplyRoomUser() {
 		return isSupplyRoomUser(AcegiHelper.getLoginUser());
Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/returngoodsrecord/ReturnGoodsRecord.java
===================================================================
diff -u -r17723 -r17837
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/returngoodsrecord/ReturnGoodsRecord.java	(.../ReturnGoodsRecord.java)	(revision 17723)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/returngoodsrecord/ReturnGoodsRecord.java	(.../ReturnGoodsRecord.java)	(revision 17837)
@@ -29,7 +29,7 @@
 
 /**
  * @author panhaowen
- * 退货记录
+ * 器械包或者一次性物品的退货记录
  * 2012-4-12 下午01:51:49
  */
 @Entity
Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java
===================================================================
diff -u -r17831 -r17837
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java	(.../JasperReportManagerImpl.java)	(revision 17831)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/service/JasperReportManagerImpl.java	(.../JasperReportManagerImpl.java)	(revision 17837)
@@ -10276,10 +10276,10 @@
 		
 		//发货数量（按包统计）
 		sql	+= " union all ";
-		sql += String.format("select 'invoice' as type,ti.tousseName,count(*),td.tousseType from invoice i,TousseInstance ti,TousseDefinition td "
-				+" where i.id = ti.invoice_id and ti.tousseDefinition_id=td.id "
-				+" and i.orgUnitCoding = '%s' and i.sendTime between %s and %s and ti.foreignTousseApp_id is null group by td.tousseType,ti.tousseName "
-				+ "having(td.tousseType %s) ",
+		sql += String.format("select 'invoice' as type,ii.tousseName,sum(ii.amount) amount,ii.tousseType from Invoice i join InvoiceItem ii on ii.invoice_id=i.id "
+				+ "where i.orgUnitCoding = '%s' and ii.diposable='否' and i.sendTime between %s and %s "
+				+ "and not exists(select 1 from ForeignTousseApplication fta where fta.id=i.invoicePlan_ID) "
+				+ "group by ii.tousseType,ii.tousseName having(ii.tousseType %s) ",
 				departCoding,startDateSql,endDateSql,tousseTypeSql);
 		if (includeForeignTousse) {
 			sql	+= " union all ";
Index: ssts-web/src/main/webapp/disinfectsystem/reportforms/departmentMonthlyDetailDSInvoiceItemView.js
===================================================================
diff -u -r17582 -r17837
--- ssts-web/src/main/webapp/disinfectsystem/reportforms/departmentMonthlyDetailDSInvoiceItemView.js	(.../departmentMonthlyDetailDSInvoiceItemView.js)	(revision 17582)
+++ ssts-web/src/main/webapp/disinfectsystem/reportforms/departmentMonthlyDetailDSInvoiceItemView.js	(.../departmentMonthlyDetailDSInvoiceItemView.js)	(revision 17837)
@@ -57,7 +57,22 @@
 		if(sstsConfig.enableDiscountPrice){
 			jasperreportFileName = "DepartmentMonthDetailDiscountPrice.jasper";
 		}
-		window.open(WWWROOT + "/jasperreports/jasperreportsAction!createReportFromJavaBeanSource.do?jasperreportName="+jasperreportFileName+"&reportName=departmentMonthDetail&departSearch="+departSearch+"&startTime="+startTime+"&endTime="+endTime+"&goodsSearch="+goodsSearch+"&tousseType="+tousseType+"&goodsType="+goodsType+"&searchType="+searchType+"&batch="+batch+"&departCoding="+departCoding+"&disposableGoodsType="+disposableGoodsType+"&showCustonTousseAmount="+showCustonTousseAmount,'thisIframe','_self');
+		window.open(WWWROOT + "/jasperreports/jasperreportsAction!createReportFromJavaBeanSource.do?"
+				+ "reportName=departmentMonthDetail&jasperreportName=" + jasperreportFileName
+				+ "&departSearch=" + departSearch 
+				+ "&startTime=" + startTime 
+				+ "&endTime=" + endTime
+				+ "&goodsSearch=" + goodsSearch
+				+ "&tousseType=" + tousseType
+				+ "&goodsType=" + goodsType
+				+ "&searchType=" + searchType
+				+ "&batch=" + batch 
+				+ "&departCoding=" + departCoding
+				+ "&disposableGoodsType=" + disposableGoodsType
+				+ "&showCustonTousseAmount=" + showCustonTousseAmount,
+				 'thisIframe', '_self');
+		
+						
 	}
 
 	Ext.ux.ForgonPageGrid.prototype.getGridParameterMap = function() {};
@@ -288,6 +303,7 @@
 									Ext.getCmp('goodsType').setValue('全部');
 									Ext.getCmp('goodsTypeElement').hide();
 								}
+								reloadReport();
 							}
 						}
 					}