Index: ssts-web/src/main/webapp/disinfectsystem/useRecord/useRecordView.js
===================================================================
diff -u -r36776 -r37434
--- ssts-web/src/main/webapp/disinfectsystem/useRecord/useRecordView.js	(.../useRecordView.js)	(revision 36776)
+++ ssts-web/src/main/webapp/disinfectsystem/useRecord/useRecordView.js	(.../useRecordView.js)	(revision 37434)
@@ -1,5 +1,7 @@
 var entityName = "使用记录";
 var grid;
+var expectUseTimeDefauleValue = 0;
+var expectUseTimeOflimitTime = 0;
 
 //表单提交的结果状态(分别表示初始、提交成功、失败等)
 var formSubmitResultInit = "0";
@@ -1336,4 +1338,28 @@
 			items: grid
 		}]
 	});
+
+	//ZSRY-68：新增扩展信息设置
+	if(sstsConfig.enableUrgentFunction && sstsConfig.recyclingOnlyInTheCorrespondingApplicationFormWhenScanningUniqueBarcode && sstsConfig.enableExtendedInformationOfUrgentFunction){
+		Ext.Ajax.request({
+			url: WWWROOT + '/disinfectSystem/baseData/urgentLevelAction!loadAllUrgentAdditionalInfo.do',
+			method: 'POST',
+			success: function (response, options) {
+				var result = Ext.decode(response.responseText);
+				if (result.message) {
+					showResult(result.message);
+				}
+				if(result.data){
+					expectUseTimeDefauleValue = result.data.expectUseTimeDefauleValue;
+					expectUseTimeOflimitTime = result.data.expectUseTimeOflimitTime;
+				}
+			},
+			failure: function (response, options) {
+				var result = Ext.decode(response.responseText);
+				if (result.message) {
+					showResult(result.message);
+				}
+			}
+		});
+	}
 });
\ No newline at end of file
Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/urgentLevel/urgentLevelForm.js
===================================================================
diff -u -r36934 -r37434
--- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/urgentLevel/urgentLevelForm.js	(.../urgentLevelForm.js)	(revision 36934)
+++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/urgentLevel/urgentLevelForm.js	(.../urgentLevelForm.js)	(revision 37434)
@@ -1,6 +1,7 @@
 var id;
 var formObj;
 var urgentLevelWin;
+var allUrgentAdditionalInfoWin;
 function addAndEditUrgentLevel(id) {
 	this.id = id;
 
@@ -505,6 +506,180 @@
 	}
 }
 
+//ZSRY-68：新增扩展信息设置功能
+function allUrgentAdditionalInfo(){
+	var formObj = new top.Ext4.form.Panel({
+		id: 'formSumPanel',
+		frame: true,
+		labelSeparator: ':',
+		bodyStyle: 'padding:5px 5px 0px 5px;',
+		width: 800,
+		buttonAlign: 'center',
+		fieldDefaults: {
+			labelAlign: 'right'
+		},
+		items: [{
+			layout: 'column',
+			items: [{
+				xtype:'hidden',
+				id:'id',
+				name:'id'
+			},{
+				columnWidth: 1,
+				layout: 'form',
+				border: 0,
+				style: 'margin-bottom:10px',
+				items: [{
+					xtype: 'textfield',
+					labelSeparator: '：',
+					labelWidth:150,
+					fieldLabel:'预计使用时间默认值',
+					readOnly: true,
+					fieldCls: 'fieldReadOnlyNoRemove',
+					anchor: '95%'
+				}]
+			},{
+				columnWidth: .66,
+				layout: 'form',
+				border: 0,
+				style: 'margin-bottom:10px',
+				items: [{
+					xtype: 'numberfield',
+					labelSeparator: '+',
+					labelWidth:150,
+					id:'expectUseTimeDefauleValue',
+					fieldLabel:'当前时间 ',
+					allowDecimals:false,
+					allowNegative:false,
+					minValue: 0,
+					maxValue: 9999,
+					anchor: '95%'
+				}]
+			},{
+				columnWidth: .33,
+				layout: 'form',
+				border: 0,
+				style: 'margin-bottom:10px',
+				items: [{
+					xtype: 'textfield',
+					labelSeparator: '',
+					value:'分钟',
+					readOnly: true,
+					fieldCls: 'fieldReadOnlyNoRemove',
+					anchor: '95%'
+				}]
+			},{
+				columnWidth: .88,
+				layout: 'form',
+				border: 0,
+				style: 'margin-bottom:10px',
+				items: [{
+					xtype: 'numberfield',
+					labelSeparator: '',
+					labelWidth:240,
+					id:'expectUseTimeOflimitTime',
+					fieldLabel:'预计使用时间不得早于默认时间的',
+					allowDecimals:false,
+					allowNegative:false,
+					minValue: 0,
+					maxValue: 9999,
+					anchor: '95%'
+				}]
+			},{
+				columnWidth: .11,
+				layout: 'form',
+				border: 0,
+				style: 'margin-bottom:10px',
+				items: [{
+					xtype: 'textfield',
+					labelSeparator: '',
+					value:'分钟',
+					readOnly: true,
+					fieldCls: 'fieldReadOnlyNoRemove',
+					anchor: '95%'
+				}]
+			}]
+		}],
+		buttons: [{
+			id: 'saveBtn',
+			text: '保存',
+			handler: function(){
+				var expectUseTimeDefauleValue = top.Ext4.getCmp('expectUseTimeDefauleValue').getValue() || 0;
+				var expectUseTimeOflimitTime = top.Ext4.getCmp('expectUseTimeOflimitTime').getValue() || 0;
+				var id = top.Ext4.getCmp('id').getValue();
+				if(expectUseTimeDefauleValue < 0 || expectUseTimeOflimitTime < 0){
+					showResult('时间不能小于0');
+					return
+				}
+				Ext4.Ajax.request({
+					url: WWWROOT + '/disinfectSystem/baseData/urgentLevelAction!saveOrUpdateAllUrgentAdditionalInfo.do',
+					method: 'POST',
+					params: {
+						expectUseTimeDefauleValue: expectUseTimeDefauleValue,
+						expectUseTimeOflimitTime:expectUseTimeOflimitTime,
+						id:id
+					},
+					success: function (response, options) {
+						var result = Ext4.decode(response.responseText);
+						if (result.message) {
+							showResult(result.message);
+						}
+						allUrgentAdditionalInfoWin.close();
+					},
+					failure: function (response, options) {
+						var result = Ext4.decode(response.responseText);
+						if (result.message) {
+							showResult(result.message);
+						}
+					}
+				});
+			}
+		}, {
+			text: '取消',
+			id: 'saveAndNewBtn',
+			handler: function(){
+				allUrgentAdditionalInfoWin.close();
+			}
+		}]
+	});
+
+	allUrgentAdditionalInfoWin = top.Ext4.create('Ext4.window.Window', {
+		id: 'allUrgentAdditionalInfoWin',
+		layout: 'fit',
+		title: '加急扩展信息设置',
+		width: 400,
+		height: 200,
+		modal: true,
+		border: false,
+		plain: true,
+		items: [formObj]
+	});
+	allUrgentAdditionalInfoWin.show();
+
+	//ZSRY-68：新增扩展信息设置
+	Ext4.Ajax.request({
+		url: WWWROOT + '/disinfectSystem/baseData/urgentLevelAction!loadAllUrgentAdditionalInfo.do',
+		method: 'POST',
+		success: function (response, options) {
+			var result = Ext4.decode(response.responseText);
+			if (result.message) {
+				showResult(result.message);
+			}
+			if(result.data){
+				top.Ext4.getCmp('expectUseTimeDefauleValue').setValue(result.data.expectUseTimeDefauleValue);
+				top.Ext4.getCmp('expectUseTimeOflimitTime').setValue(result.data.expectUseTimeOflimitTime);
+				top.Ext4.getCmp('id').setValue(result.data.id);
+			}
+		},
+		failure: function (response, options) {
+			var result = Ext4.decode(response.responseText);
+			if (result.message) {
+				showResult(result.message);
+			}
+		}
+	});
+}
+
 function submit() {
 	var params = {
 		expectUseTimeCheck:'否',
Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/urgentLevel/urgentLevelView.js
===================================================================
diff -u -r36082 -r37434
--- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/urgentLevel/urgentLevelView.js	(.../urgentLevelView.js)	(revision 36082)
+++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/urgentLevel/urgentLevelView.js	(.../urgentLevelView.js)	(revision 37434)
@@ -149,6 +149,13 @@
 		handler: function () {
 			deleteUrgentLevel(grid);
 		}
+	}, '-', {
+		text: '扩展信息设置',
+		hidden : !(sstsConfig.recyclingOnlyInTheCorrespondingApplicationFormWhenScanningUniqueBarcode && sstsConfig.enableExtendedInformationOfUrgentFunction),
+		iconCls: 'btn_ext_application_set',
+		handler: function () {
+			allUrgentAdditionalInfo();
+		}
 	}];
 	var dwrCallParams = null;
 
Index: ssts-web/src/main/webapp/disinfectsystem/useRecord/useRecordForm.js
===================================================================
diff -u -r37370 -r37434
--- ssts-web/src/main/webapp/disinfectsystem/useRecord/useRecordForm.js	(.../useRecordForm.js)	(revision 37370)
+++ ssts-web/src/main/webapp/disinfectsystem/useRecord/useRecordForm.js	(.../useRecordForm.js)	(revision 37434)
@@ -994,21 +994,33 @@
 
 //ZSRY-53:补充额外信息
 function showUrgentLevelInfo(urgentLevelIdForUseRecord,rowIndex){
-	if(urgentLevelDataMap && urgentLevelDataMap[urgentLevelIdForUseRecord]){
+	var urgentLevelRecord = urgentLevelDataMap[urgentLevelIdForUseRecord];
+	if(urgentLevelDataMap && urgentLevelRecord){
 		var item = useItemsStore.getAt(rowIndex);
 		var urgentAdditionalInfo = {};
 		if(item.get('urgentAdditionalInfo')){
 			urgentAdditionalInfo = item.get('urgentAdditionalInfo');
 		}else {
+			var expectUseTime = '';
+			if(urgentLevelRecord.expectUseTimeCheck == '是' && expectUseTimeDefauleValue > 0){
+				var datefieldValue;
+				DWREngine.setAsync(false);
+				ServerTimeTableManager.getServerDateTime('yyyy/MM/dd HH:mm', function (config) {
+					datefieldValue = config;
+				});
+				DWREngine.setAsync(true);
+				var nowDateStr = new Date(datefieldValue).getTime();
+				nowDateStr += expectUseTimeDefauleValue*60*1000;
+				expectUseTime = new Date(nowDateStr).Format('yyyy-MM-dd hh:mm');
+			}
 			urgentAdditionalInfo = {
 				urgentLevelId:'',
 				urgentContact:'',
 				urgentOperationRoomId:'',
-				expectUseTime:'',
+				expectUseTime:expectUseTime,
 				urgentContactInfo:''
 			}
 		}
-		var urgentLevelRecord = urgentLevelDataMap[urgentLevelIdForUseRecord];
 		operationRoomJsonStore.load();
 		var expectUseTimeCheckHidden = (urgentLevelRecord.expectUseTimeCheck == '是')?false:true;
 		var expectUseTimeNotBlank = (urgentLevelRecord.expectUseTimeNotBlank == '是')?false:true;
@@ -1055,7 +1067,21 @@
 						format: 'Y-m-d H:i',
 						readOnly: true,
 						allowBlank : expectUseTimeNotBlank,
-						anchor: '95%'
+						anchor: '95%',
+						listeners:{
+							select:function(combo, records, index){
+								if(expectUseTimeOflimitTime > 0){
+									var now = new Date().getTime() - expectUseTimeOflimitTime*60*1000;
+									var day = new Date(records).getTime();
+									var nowDay = new Date(now).Format('yyyy-MM-dd hh:mm');
+									var nowTime = new Date(now).Format('hh:mm');
+									if(now > day){
+										showResult('预计使用时间不得早于'+ nowTime);
+										top.Ext.getCmp('expectUseTime').setValue(nowDay);
+									}
+								}
+							}
+						}
 					}]
 				},{
 					layout: 'form',