Index: ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js
===================================================================
diff -u -r36912 -r36934
--- ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js	(.../packingView.js)	(revision 36912)
+++ ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js	(.../packingView.js)	(revision 36934)
@@ -1758,6 +1758,23 @@
 				}
 			}
 			return obj;
+		} else if (headerName == '联系方式') {
+			var obj = {
+				header: '联系方式',
+				width: 90,
+				align: 'center',
+				sortable: true,
+				dataIndex: 'urgentContactInfo',
+				hidden: !(sstsConfig.enableUrgentFunction && sstsConfig.enableExtendedInformationOfUrgentFunction && sstsConfig.recyclingOnlyInTheCorrespondingApplicationFormWhenScanningUniqueBarcode),
+				renderer: function (value, metaData, record, rowIdx, colIdx, store) {
+					if (record.data.urgentAdditionalInfo && record.data.urgentAdditionalInfo !== '') {
+						return record.data.urgentAdditionalInfo.urgentContactInfo || '';
+					} else {
+						return null;
+					}
+				}
+			}
+			return obj;
 		} else if (headerName == '清洗篮筐') {
 			var obj = {
 				header: '清洗篮筐',
@@ -1868,6 +1885,7 @@
 				getGridColumns('加急级别', treeId),
 				getGridColumns('预计使用时间', treeId),
 				getGridColumns('加急联系人', treeId),
+				getGridColumns('联系方式', treeId),
 				getGridColumns('清洗篮筐', treeId),
 				getGridColumns('申请科室', treeId),
 				getGridColumns('清洗时间', treeId),
Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/setTousseUrgentAmount.jsp
===================================================================
diff -u -r36112 -r36934
--- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/setTousseUrgentAmount.jsp	(.../setTousseUrgentAmount.jsp)	(revision 36112)
+++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/setTousseUrgentAmount.jsp	(.../setTousseUrgentAmount.jsp)	(revision 36934)
@@ -230,6 +230,7 @@
 								html += '<p><label>预计使用时间：</label><span>'+(result.data[i].expectUseTime || "")+'</span></p>';
 								html += '<p><label>加急手术间号：</label><span>'+(result.data[i].operationRoomName || "")+'</span></p>';
 								html += '<p><label>加急联系人：</label><span>'+(result.data[i].fullName || "")+'</span></p>';
+								html += '<p><label>联系方式：</label><span>'+(result.data[i].urgentContactInfo || "")+'</span></p>';
 								html += '</div>';
 							}
 							$('#additionalInfo .content').html(html);
Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/urgentLevel/urgentLevelForm.js
===================================================================
diff -u -r36436 -r36934
--- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/urgentLevel/urgentLevelForm.js	(.../urgentLevelForm.js)	(revision 36436)
+++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/urgentLevel/urgentLevelForm.js	(.../urgentLevelForm.js)	(revision 36934)
@@ -234,21 +234,26 @@
 								top.Ext4.getCmp('expectUseTimeCheck').enable();
 								top.Ext4.getCmp('operationRoomCheck').enable();
 								top.Ext4.getCmp('urgentContactCheck').enable();
+								top.Ext4.getCmp('urgentContactInfoCheck').enable();
 								top.Ext4.getCmp('expectUseTimeCheck').setValue(true);
 								top.Ext4.getCmp('expectUseTimeNotBlank').enable();
 							} else {
 								top.Ext4.getCmp('expectUseTimeCheck').disable();
 								top.Ext4.getCmp('operationRoomCheck').disable();
 								top.Ext4.getCmp('urgentContactCheck').disable();
+								top.Ext4.getCmp('urgentContactInfoCheck').disable();
 								top.Ext4.getCmp('expectUseTimeCheck').setValue(false);
 								top.Ext4.getCmp('operationRoomCheck').setValue(false);
 								top.Ext4.getCmp('urgentContactCheck').setValue(false);
+								top.Ext4.getCmp('urgentContactInfoCheck').setValue(false);
 								top.Ext4.getCmp('expectUseTimeNotBlank').setValue({expectUseTimeNotBlank:'否'});
 								top.Ext4.getCmp('operationRoomNotBlank').setValue({operationRoomNotBlank:'否'});
 								top.Ext4.getCmp('urgentContactNotBlank').setValue({urgentContactNotBlank:'否'});
+								top.Ext4.getCmp('urgentContactInfoNotBlank').setValue({urgentContactInfoNotBlank:'否'});
 								top.Ext4.getCmp('expectUseTimeNotBlank').disable();
 								top.Ext4.getCmp('operationRoomNotBlank').disable();
 								top.Ext4.getCmp('urgentContactNotBlank').disable();
+								top.Ext4.getCmp('urgentContactInfoNotBlank').disable();
 							}
 						}
 					}
@@ -375,6 +380,44 @@
 							{ boxLabel: '否', name: 'urgentContactNotBlank', inputValue: '否', checked: true }
 						]
 					}]
+				}, {
+					columnWidth: 0.5,
+					layout: 'form',
+					border: 0,
+					style: 'margin-bottom:10px',
+					items: [{
+						id: 'urgentContactInfoCheck',
+						name: 'urgentContactInfoCheck',
+						fieldLabel: '联系方式',
+						xtype: 'checkbox',
+						inputValue: '是',
+						disabled: true,
+						listeners: {
+							change: function (thiz, checked) {
+								if (checked) {
+									top.Ext4.getCmp('urgentContactInfoNotBlank').enable();
+								} else {
+									top.Ext4.getCmp('urgentContactInfoNotBlank').disable();
+								}
+							}
+						}
+					}]
+				}, {
+					columnWidth: 0.5,
+					layout: 'form',
+					border: 0,
+					style: 'margin-bottom:10px',
+					items: [{
+						id: 'urgentContactInfoNotBlank',
+						name: 'urgentContactInfoNotBlank',
+						xtype: 'radiogroup',
+						disabled: true,
+						fieldLabel: '是否必填',
+						items: [
+							{ boxLabel: '是', name: 'urgentContactInfoNotBlank', inputValue: '是' },
+							{ boxLabel: '否', name: 'urgentContactInfoNotBlank', inputValue: '否', checked: true }
+						]
+					}]
 				}]
 			}]
 		}],
@@ -395,7 +438,7 @@
 		layout: 'fit',
 		title: '加急级别信息',
 		width: 600,
-		height: isShowInfo ? 300 : 150,
+		height: isShowInfo ? 350 : 150,
 		modal: true,
 		border: false,
 		plain: true,
@@ -418,6 +461,7 @@
 					top.Ext4.getCmp('expectUseTimeCheck').enable();
 					top.Ext4.getCmp('operationRoomCheck').enable();
 					top.Ext4.getCmp('urgentContactCheck').enable();
+					top.Ext4.getCmp('urgentContactInfoCheck').enable();
 					if(action.result.data.expectUseTimeCheck == '是'){
 						top.Ext4.getCmp('expectUseTimeNotBlank').enable();
 						top.Ext4.getCmp('expectUseTimeNotBlank').setValue({expectUseTimeNotBlank:action.result.data.expectUseTimeNotBlank})
@@ -430,19 +474,27 @@
 						top.Ext4.getCmp('urgentContactNotBlank').enable();
 						top.Ext4.getCmp('urgentContactNotBlank').setValue({urgentContactNotBlank:action.result.data.urgentContactNotBlank})
 					}
+					if(action.result.data.urgentContactInfoCheck == '是'){
+						top.Ext4.getCmp('urgentContactInfoNotBlank').enable();
+						top.Ext4.getCmp('urgentContactInfoNotBlank').setValue({urgentContactInfoNotBlank:action.result.data.urgentContactInfoNotBlank})
+					}
 				}else {
 					top.Ext4.getCmp('expectUseTimeCheck').disable();
 					top.Ext4.getCmp('operationRoomCheck').disable();
 					top.Ext4.getCmp('urgentContactCheck').disable();
+					top.Ext4.getCmp('urgentContactInfoCheck').disable();
 					top.Ext4.getCmp('expectUseTimeCheck').setValue(false);
 					top.Ext4.getCmp('operationRoomCheck').setValue(false);
 					top.Ext4.getCmp('urgentContactCheck').setValue(false);
+					top.Ext4.getCmp('urgentContactInfoCheck').setValue(false);
 					top.Ext4.getCmp('expectUseTimeNotBlank').setValue({expectUseTimeNotBlank:'否'});
 					top.Ext4.getCmp('operationRoomNotBlank').setValue({operationRoomNotBlank:'否'});
 					top.Ext4.getCmp('urgentContactNotBlank').setValue({urgentContactNotBlank:'否'});
+					top.Ext4.getCmp('urgentContactInfoNotBlank').setValue({urgentContactInfoNotBlank:'否'});
 					top.Ext4.getCmp('expectUseTimeNotBlank').disable();
 					top.Ext4.getCmp('operationRoomNotBlank').disable();
 					top.Ext4.getCmp('urgentContactNotBlank').disable();
+					top.Ext4.getCmp('urgentContactInfoNotBlank').disable();
 				}
 			},
 			failure: function (form, action) {
@@ -458,9 +510,11 @@
 		expectUseTimeCheck:'否',
 		operationRoomCheck:'否',
 		urgentContactCheck:'否',
+		urgentContactInfoCheck:'否',
 		expectUseTimeNotBlank:'否',
 		operationRoomNotBlank:'否',
-		urgentContactNotBlank:'否'
+		urgentContactNotBlank:'否',
+		urgentContactInfoNotBlank:'否'
 	}
 	if (top.Ext4.getCmp('additionalInfo') && top.Ext4.getCmp('additionalInfo').getValue() == '是') {
 		//预计使用时间
@@ -469,7 +523,9 @@
 		var operationRoomCheck = top.Ext4.getCmp('operationRoomCheck').getValue();
 		//加急联系人
 		var urgentContactCheck = top.Ext4.getCmp('urgentContactCheck').getValue();
-		if (!expectUseTimeCheck && !operationRoomCheck && !urgentContactCheck) {
+		//联系方式
+		var urgentContactInfoCheck = top.Ext4.getCmp('urgentContactInfoCheck').getValue();
+		if (!expectUseTimeCheck && !operationRoomCheck && !urgentContactCheck && !urgentContactInfoCheck) {
 			showResult('请至少设置一项额外信息用于填写。');
 			return
 		}
Index: ssts-web/src/main/webapp/disinfectsystem/useRecord/useRecordForm.js
===================================================================
diff -u -r36803 -r36934
--- ssts-web/src/main/webapp/disinfectsystem/useRecord/useRecordForm.js	(.../useRecordForm.js)	(revision 36803)
+++ ssts-web/src/main/webapp/disinfectsystem/useRecord/useRecordForm.js	(.../useRecordForm.js)	(revision 36934)
@@ -1115,39 +1115,22 @@
 		}else {
 			urgentAdditionalInfo = {
 				urgentLevelId:'',
-				urgentContactId:'',
+				urgentContact:'',
 				urgentOperationRoomId:'',
-				expectUseTime:''
+				expectUseTime:'',
+				urgentContactInfo:''
 			}
 		}
 		var urgentLevelRecord = urgentLevelDataMap[urgentLevelIdForUseRecord];
-		//加急联系人
-		var urgentContactStore = new top.Ext.data.Store({
-			proxy: new top.Ext.data.HttpProxy({
-				url: WWWROOT + '/systemmanage/user/loadUserByDepartmentCode!loadUserByDepartmentCode.do',
-				method: 'POST'
-			}),
-			reader: new top.Ext.data.JsonReader({
-				totalProperty: 'totalCount',
-				root: 'data'
-			}, [
-				{ name: 'id', mapping: 'id' },
-				{ name: 'name', mapping: 'name' }
-			]),
-			listeners: {
-				beforeload: function (_this, options) {
-					_this.baseParams.departmentCode = currentOrgUnitCoding;
-				}
-			}
-		});
 		operationRoomJsonStore.load();
-		urgentContactStore.load();
 		var expectUseTimeCheckHidden = (urgentLevelRecord.expectUseTimeCheck == '是')?false:true;
 		var expectUseTimeNotBlank = (urgentLevelRecord.expectUseTimeNotBlank == '是')?false:true;
 		var operationRoomCheckHidden = (urgentLevelRecord.operationRoomCheck == '是')?false:true;
 		var operationRoomNotBlank = (urgentLevelRecord.operationRoomNotBlank == '是')?false:true;
 		var urgentContactCheckHidden = (urgentLevelRecord.urgentContactCheck == '是')?false:true;
 		var urgentContactNotBlank = (urgentLevelRecord.urgentContactNotBlank == '是')?false:true;
+		var urgentContactInfoCheckHidden = (urgentLevelRecord.urgentContactInfoCheck == '是')?false:true;
+		var urgentContactInfoNotBlank = (urgentLevelRecord.urgentContactInfoNotBlank == '是')?false:true;
 
 		var urgentLevelRecordForm = new top.Ext.FormPanel({
 			id: 'urgentLevelRecordForm',
@@ -1213,22 +1196,25 @@
 					columnWidth: 1,
 					hidden:urgentContactCheckHidden,
 					items: [{
-						xtype: 'combo',
-						id : 'urgentContactId',
-						name : 'urgentContactId',
-						queryParam: 'spell',
-						minChars: 0,
+						xtype: 'textfield',
 						fieldLabel: '加急联系人',
-						valueField : 'id',
-						displayField: 'name',
-						store: urgentContactStore,
-						forceSelection: false,
-						lazyInit: true,
-						triggerAction: 'all',
-						typeAhead: false,
+						id: 'urgentContact',
+						name: 'urgentContact',
 						allowBlank : urgentContactNotBlank,
 						anchor: '95%'
 					}]
+				},{
+					layout: 'form',
+					columnWidth: 1,
+					hidden:urgentContactInfoCheckHidden,
+					items: [{
+						xtype: 'textfield',
+						fieldLabel: '联系方式',
+						id: 'urgentContactInfo',
+						name: 'urgentContactInfo',
+						allowBlank : urgentContactInfoNotBlank,
+						anchor: '95%'
+					}]
 				}]
 			}]
 		});
@@ -1267,14 +1253,16 @@
 							return false;
 						}
 					}
-					var urgentContactId = top.Ext.getCmp('urgentContactId').getValue();
+					var urgentContact = top.Ext.getCmp('urgentContact').getValue();
 					var urgentOperationRoomId = top.Ext.getCmp('urgentOperationRoomId').getValue();
 					var expectUseTime = top.Ext.getCmp('expectUseTime').getRawValue();
+					var urgentContactInfo = top.Ext.getCmp('urgentContactInfo').getValue();
 					useItemsStore.getAt(rowIndex).set('urgentAdditionalInfo','');
 					var urgentAdditionalInfo = {
 						urgentLevelId:urgentLevelRecord.id || '',
-						urgentContactId:urgentContactId || '',
+						urgentContact:urgentContact || '',
 						urgentOperationRoomId:urgentOperationRoomId || '',
+						urgentContactInfo:urgentContactInfo || '',
 						expectUseTime:expectUseTime || ''
 					}
 					useItemsStore.getAt(rowIndex).set('urgentAdditionalInfo',urgentAdditionalInfo);
@@ -1289,19 +1277,10 @@
 		});
 
 		if(urgentAdditionalInfo){
-			var datefieldValue;
-			DWREngine.setAsync(false);
-			ServerTimeTableManager.getServerDateTime('yyyy/MM/dd HH:mm', function (config) {
-				datefieldValue = config;
-			});
-			DWREngine.setAsync(true);
-			if(urgentAdditionalInfo.expectUseTime){
-				top.Ext.getCmp('expectUseTime').setValue(urgentAdditionalInfo.expectUseTime);
-			}else {
-				top.Ext.getCmp('expectUseTime').setValue(new Date(datefieldValue));
-			}
 			setTimeout(function(){
-				top.Ext.getCmp('urgentContactId').setValue(urgentAdditionalInfo.urgentContactId || '');
+				top.Ext.getCmp('urgentContactInfo').setValue(urgentAdditionalInfo.urgentContactInfo || '');
+				top.Ext.getCmp('expectUseTime').setValue(urgentAdditionalInfo.expectUseTime || '');
+				top.Ext.getCmp('urgentContact').setValue(urgentAdditionalInfo.urgentContact || '');
 				top.Ext.getCmp('urgentOperationRoomId').setValue(urgentAdditionalInfo.urgentOperationRoomId || '');
 				top.Ext.getCmp('urgentLevelId').setValue(urgentAdditionalInfo.urgentLevelId || '');
 			},500)