Index: ssts-web/src/main/webapp/disinfectsystem/toussemanager/tousseinstancemanager/tousseInstanceView.jsp
===================================================================
diff -u -r30413 -r30977
--- ssts-web/src/main/webapp/disinfectsystem/toussemanager/tousseinstancemanager/tousseInstanceView.jsp	(.../tousseInstanceView.jsp)	(revision 30413)
+++ ssts-web/src/main/webapp/disinfectsystem/toussemanager/tousseinstancemanager/tousseInstanceView.jsp	(.../tousseInstanceView.jsp)	(revision 30977)
@@ -340,6 +340,7 @@
     <input type="hidden" id="parm_s_treatmentNum" name="parm_s_treatmentNum">
     <input type="hidden" id="parm_s_hospitalNum" name="parm_s_hospitalNum">
     <input type="hidden" id="parm_s_patientName" name="parm_s_patientName">
+    <input type="hidden" id="ids" name="ids">
     
     
     <!-- 导出用到的条件,用于表单post提交用(因为很多元素的id被ext的元素给用了,为了不与其冲突,再前面加上了前缀确保id唯一) -->
Index: ssts-web/src/main/webapp/disinfectsystem/toussemanager/tousseinstancemanager/tousseInstanceView.js
===================================================================
diff -u -r30842 -r30977
--- ssts-web/src/main/webapp/disinfectsystem/toussemanager/tousseinstancemanager/tousseInstanceView.js	(.../tousseInstanceView.js)	(revision 30842)
+++ ssts-web/src/main/webapp/disinfectsystem/toussemanager/tousseinstancemanager/tousseInstanceView.js	(.../tousseInstanceView.js)	(revision 30977)
@@ -138,7 +138,6 @@
 	$Id('parm_s_operationEnd').value = $Id('operationEnd').value;				//装配结束时间
 	$Id('parm_s_invoiceStart').value = $Id('invoiceStart').value;				//发货开始时间
 	$Id('parm_s_invoiceEnd').value = $Id('invoiceEnd').value;				//发货结束时间
-	
 	$Id('parm_s_department').value = Ext.getCmp('department').getValue();		//科室编号
 	$Id('parm_s_tousseStatus').value = $Id('tousseStatus').value;				//器械包状态
 	$Id('parm_s_tousseGroupName').value = $Id('tousseGroupName').value; 	 	//器械包分组
@@ -201,7 +200,7 @@
 	queryCondition['sterilizationTransitionEnd'] = $Id('sterilizationTransitionEnd').value;		//灭菌交接结束时间
 
 	//装配任务组
-	queryCondition['taskGroup'] = ($Id('id_taskGroup').value == '')?$Id('taskGroup').value:$Id('id_taskGroup').value;				 		
+	queryCondition['taskGroup'] = $Id('id_taskGroup').value;				 		
 	queryCondition['operationStart'] = $Id('operationStart').value;			//装配开始时间
 	queryCondition['operationEnd'] = $Id('operationEnd').value;				//装配结束时间
 	queryCondition['invoiceStart'] = $Id('invoiceStart').value;				//发货开始时间
@@ -1496,16 +1495,30 @@
 			text : '导出',
 			iconCls : 'btn_ext_download',
 			handler : function() {
-				if(!totalDataCount){
-					showResult("结果为空,不能导出");
-					return;
-				}else if(totalDataCount > 65535){
-					showResult("结果数量最大为65535,请缩小查询数据的范围");
-					return;
+				var selectionModel = grid.getSelectionModel();
+				var idsArr = [];
+				if(selectionModel.hasSelection()){
+					selectionModel.each(function(row){
+						idsArr.push(row.data.id);
+					});
 				}
-				var queryCondition = getQueryCondition();
-				//console.log(queryCondition);return
+				if(idsArr.length > 0){
+					if(idsArr.length > 0){
+						var ids = idsArr.join(',');
+						$Id('ids').value = ids;
+					}
+				}else {
+					$Id('ids').value = '';
+					if(!totalDataCount){
+						showResult("结果为空,不能导出");
+						return;
+					}else if(totalDataCount > 65535){
+						showResult("结果数量最大为65535,请缩小查询数据的范围");
+						return;
+					}
+				}
 				//表单元素的id前缀
+				var queryCondition = getQueryCondition();
 				var idPrefix = "id_";
 				for(var propName in queryCondition){
 					if(queryCondition[propName]){