Index: ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js
===================================================================
diff -u -r38671 -r38815
--- ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js	(.../packingView.js)	(revision 38671)
+++ ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js	(.../packingView.js)	(revision 38815)
@@ -2254,8 +2254,7 @@
 				width: 150,
 				align: 'center',
 				sortable: true,
-				dataIndex: 'expectUseTimeStr',
-				hidden: !(sstsConfig.enableUrgentFunction && sstsConfig.enableExtendedInformationOfUrgentFunction && sstsConfig.recyclingOnlyInTheCorrespondingApplicationFormWhenScanningUniqueBarcode),
+				hidden: !sstsConfig.enableUrgentFunction,
 				renderer: function (value, metaData, record, rowIdx, colIdx, store) {
 					if (record.data.urgentAdditionalInfo && record.data.urgentAdditionalInfo !== '') {
 						return record.data.urgentAdditionalInfo.expectUseTimeStr || '';
@@ -2265,17 +2264,31 @@
 				}
 			}
 			return obj;
-		} else if (headerName == '加急联系人') {
+		} else if (headerName == '加急手术间') {
 			var obj = {
-				header: '加急联系人',
+				header: '加急手术间',
+				width: 100,
+				align: 'center',
+				sortable: true,
+				renderer: function (value, metaData, record, rowIdx, colIdx, store) {
+					if (record.data.urgentAdditionalInfo && record.data.urgentAdditionalInfo !== '') {
+						return record.data.urgentAdditionalInfo.urgentOperationRoomName || '';
+					} else {
+						return null;
+					}
+				}
+			}
+			return obj;
+		} else if (headerName == '加急人' || headerName == '加急联系人') {
+			var obj = {
+				header: headerName,
 				width: 90,
 				align: 'center',
 				sortable: true,
-				dataIndex: 'urgentContactFullName',
-				hidden: !(sstsConfig.enableUrgentFunction && sstsConfig.enableExtendedInformationOfUrgentFunction && sstsConfig.recyclingOnlyInTheCorrespondingApplicationFormWhenScanningUniqueBarcode),
+				hidden: !sstsConfig.enableUrgentFunction,
 				renderer: function (value, metaData, record, rowIdx, colIdx, store) {
 					if (record.data.urgentAdditionalInfo && record.data.urgentAdditionalInfo !== '') {
-						return record.data.urgentAdditionalInfo.urgentContactFullName || '';
+						return record.data.urgentAdditionalInfo.urgentContact || '';
 					} else {
 						return null;
 					}
@@ -4206,10 +4219,14 @@
 				return;
 			}
 			var ids = "";
+			var idsArr = [];
 			Ext4.each(selNodes, function (pNode) {
 				if (pNode.childNodes.length > 0) {
 					Ext4.each(pNode.childNodes, function (cNode) {
 						var taskId = cNode.get('taskId');
+						if(idsArr.indexOf('taskId') == -1){
+							
+						}
 						if (ids != "") {
 							ids += ";";
 						}
Index: ssts-web/src/main/webapp/disinfectsystem/config/zsdxfsdeyy/config.js
===================================================================
diff -u -r38199 -r38815
--- ssts-web/src/main/webapp/disinfectsystem/config/zsdxfsdeyy/config.js	(.../config.js)	(revision 38199)
+++ ssts-web/src/main/webapp/disinfectsystem/config/zsdxfsdeyy/config.js	(.../config.js)	(revision 38815)
@@ -289,6 +289,8 @@
   enableEquipmentInspectionManagementFunction:true,
   //急用物品处理周期统计报表扩展列配置
   extendedColumnConfigOfUrgentNeedGoodsProcessingCycleReport:["useTime","intervalBetweenRecyclingAndUse"],
+  //待装配任务列表的列配置
+  columnConfigOfpackingTaskList: ["物品名称","数量","清洗篮筐","操作","加急数量","加急级别","加急人","预计使用时间","加急手术间","申请科室","清洗时间","回收时间","状态"],
   //启用加急级别的适用科室功能
   enableApplicableDepartmentsOfUrgentFunction:true,
   //器械包信息模块扩展查询项配置