Index: ssts-web/src/main/webapp/disinfectsystem/config/bj309yy/config.js
===================================================================
diff -u -r36750 -r36784
--- ssts-web/src/main/webapp/disinfectsystem/config/bj309yy/config.js	(.../config.js)	(revision 36750)
+++ ssts-web/src/main/webapp/disinfectsystem/config/bj309yy/config.js	(.../config.js)	(revision 36784)
@@ -203,6 +203,8 @@
   useRecordConvertRecyclingApplicationMergeRegular:"operationRoom",
   //是否启用手术间管理界面
   enableOperationRoomManagerViwe:true,
+  //启用外来器械包签收汇总功能
+  enableSignSummaryOfForeignTousseFunction:true,
   //只允许选择已存在的手术间
  onlySelectExistedOperationRoom:true
 }
\ No newline at end of file
Index: ssts-web/src/main/webapp/disinfectsystem/invoice/invoiceSignFormVersion2.js
===================================================================
diff -u -r36684 -r36784
--- ssts-web/src/main/webapp/disinfectsystem/invoice/invoiceSignFormVersion2.js	(.../invoiceSignFormVersion2.js)	(revision 36684)
+++ ssts-web/src/main/webapp/disinfectsystem/invoice/invoiceSignFormVersion2.js	(.../invoiceSignFormVersion2.js)	(revision 36784)
@@ -164,6 +164,7 @@
 		tousseName : goods.tousseName,
 		tousseBarcode : goods.tousseBarcode,
 		sterialTime : goods.sterialTime,
+		signRecordId : goods.signRecordId,
 		count : count
 	});
 	speaker.speak(goods.tousseName);
@@ -244,6 +245,7 @@
 				}
 				for(var x = 0; x < result.arr.length; x++){
 					var goods = result.arr[x];
+					goods.signRecordId = signRecordId;
 					//正确的添加scanGoods表格
 					addInvoiceSignGoodsGrid(goods);					
 					top.Ext.getCmp('scanText').setValue("");
@@ -321,11 +323,12 @@
 	scanGoodsStore = new Ext.data.Store({
 		reader : new Ext.data.JsonReader({
 			fields : [
-			  	    {name : 'tousseName'},
-			  	    {name : 'tousseBarcode'},
-					{name : 'sterialTime'},
-			  	    {name : 'count'}
-			  	]
+				{name : 'tousseName'},
+				{name : 'tousseBarcode'},
+				{name : 'signRecordId'},
+				{name : 'sterialTime'},
+				{name : 'count'}
+			]
 		})
 	});
 
@@ -506,7 +509,30 @@
 									waitInvoiceSignGoodsStore.load();
 									scanGoodsStore.removeAll();
 								}
-							}]
+							}],
+							listeners: {
+								render : function() {
+									if(sstsConfig.enableSignSummaryOfForeignTousseFunction){
+										var tbar2 = new top.Ext.Toolbar ({
+											items : [{
+												xtype : 'button',
+												text : '外来器械包签收汇总',
+												iconCls : 'icon_search',
+												handler : function() {
+													var signRecordIds = [];
+													for(var i=0;i<scanGoodsStore.getCount();i++){
+														var item = scanGoodsStore.getAt(i);
+														signRecordIds[i] = item.data.signRecordId;
+													}
+													signSummaryOfForeignTousse(signRecordIds.join(';'))
+												}
+											}]
+										});
+										var c = top.Ext.getCmp('scanGoods');
+										tbar2.render(c.tbar);
+									}
+								}
+							}
 						}
 					)]		
 				},{
@@ -846,4 +872,86 @@
 	invoiceSignGoodsWin.close();
 	signRecordId = 0;
 	grid.dwrReload();//刷新签收记录列表
+}
+
+//BJ309YY-6：外来器械包签收汇总
+function signSummaryOfForeignTousse(signRecordIds){
+	if(signRecordIds == undefined){
+		var startDate = Ext.getCmp('startDate').getRawValue();
+		var endDate = Ext.getCmp('endDate').getRawValue();
+	
+		if(startDate == '' || endDate == ''){
+			showResult("查询时间不能为空！");
+			return
+		}
+			
+		if(!compareDate(startDate,endDate)){
+			showResult("开始时间不能大于结束时间");
+			return;
+		}
+	}
+
+	var cm = new top.Ext.grid.ColumnModel([	 
+	    {header : "住院号",dataIndex : 'hospitalNumber',width : 80,menuDisabled: true},		
+		{header : "患者姓名",dataIndex : 'patient',width : 80,menuDisabled: true},
+		{header : "患者所属科室",dataIndex : 'ascriptionDepartment',width : 100,  menuDisabled: true},
+	    {header : "手术医生",dataIndex : 'doctor',width : 80,  menuDisabled: true},
+		{header : "手术名称",dataIndex : 'surgery',width : 80,  menuDisabled: true},
+		{header : "手术数量",dataIndex : 'tousseAmount',width : 80,  menuDisabled: true}
+	]);
+	var store = new top.Ext.data.Store({
+		proxy : new top.Ext.data.HttpProxy({
+			url : WWWROOT + '/disinfectSystem/signRecordAction!foreignTousseSignSummary.do',
+			method : 'POST'
+		}),
+		reader : new top.Ext.data.JsonReader({
+			root : 'data'
+		}, [
+		   {name : 'hospitalNumber'},
+		   {name : 'patient'},
+		   {name : 'ascriptionDepartment'}, 
+		   {name : 'doctor'},
+		   {name : 'surgery'},
+		   {name : 'tousseAmount'}
+		]),
+		listeners:{
+			beforeload:function(thiz){
+				if(signRecordIds == undefined){
+					thiz.baseParams["beginDate"] = startDate;
+					thiz.baseParams["endDate"] = endDate;
+				}else {
+					thiz.baseParams["signRecordIds"] = signRecordIds;
+				}
+			}
+		}
+	});
+	store.load();
+	var signSummaryOfForeignTousseWin = new top.Ext.Window({
+		id : 'signSummaryOfForeignTousseWin',
+		layout : 'fit',
+		title : '外来器械包签收汇总',
+		resizable: false,
+		width : 800,
+		height : 400,
+		border : false,
+		modal : true,
+		plain : true,
+		items : [new top.Ext.grid.EditorGridPanel({
+			id : 'signSummaryOfForeignTousseGoods',		
+			bodyStyle : 'border:1px solid #afd7af',
+			frame :false,
+			width : 800,
+			height : 400,
+			viewConfig: {
+				forceFit:true
+			},
+			cm : cm,
+			store : store,
+			selModel : new top.Ext.grid.RowSelectionModel({
+				singleSelect : false
+			}) 
+		})]
+	});
+
+	signSummaryOfForeignTousseWin.show();
 }
\ No newline at end of file
Index: ssts-web/src/main/webapp/disinfectsystem/invoice/invoiceSignViewVersion2.js
===================================================================
diff -u -r35628 -r36784
--- ssts-web/src/main/webapp/disinfectsystem/invoice/invoiceSignViewVersion2.js	(.../invoiceSignViewVersion2.js)	(revision 35628)
+++ ssts-web/src/main/webapp/disinfectsystem/invoice/invoiceSignViewVersion2.js	(.../invoiceSignViewVersion2.js)	(revision 36784)
@@ -292,6 +292,14 @@
 								handler : function() {
 									queryInvoiceSignRecord();
 								}
+							},{
+								xtype : 'button',
+								text : '外来器械包签收汇总',
+								iconCls : 'icon_search',
+								hidden:!sstsConfig.enableSignSummaryOfForeignTousseFunction,
+								handler : function() {
+									signSummaryOfForeignTousse()
+								}
 							}
 						]
 					});