Index: ssts-web/src/main/webapp/disinfectsystem/useRecord/useRecordForm.js
===================================================================
diff -u -r38079 -r38154
--- ssts-web/src/main/webapp/disinfectsystem/useRecord/useRecordForm.js	(.../useRecordForm.js)	(revision 38079)
+++ ssts-web/src/main/webapp/disinfectsystem/useRecord/useRecordForm.js	(.../useRecordForm.js)	(revision 38154)
@@ -1009,6 +1009,9 @@
 //ZSRY-53:补充额外信息
 function showUrgentLevelInfo(urgentLevelIdForUseRecord,rowIndex){
 	var urgentLevelRecord = urgentLevelDataMap[urgentLevelIdForUseRecord];
+	var expectUseTimeDefauleValue = urgentLevelRecord.expectUseTimeDefauleValue;
+	var expectUseTimeOflimitTime = urgentLevelRecord.expectUseTimeOflimitTime;
+
 	if(urgentLevelDataMap && urgentLevelRecord){
 		var item = useItemsStore.getAt(rowIndex);
 		var urgentAdditionalInfo = {};
@@ -1070,35 +1073,70 @@
 					value:expectUseTimeCheckHidden
 				},{
 					layout: 'form',
-					columnWidth: 1,
+					columnWidth: .5,
 					hidden:expectUseTimeCheckHidden,
 					items: [{
 						xtype: 'datefieldWithMin',
-						fieldLabel: '预计使用时间',
+						fieldLabel: '预计使用时间：日期',
 						id: 'expectUseTime',
 						name: 'expectUseTime',
 						altFormats: 'Y-m-d|Y-n-j|y-n-j|y-m-j|y-m-d|y-n-d|Y-n-d|Y-m-j|Ymd|Ynj|ynj|ymj|ymd|ynd|Ynd|Ymj|Y/m/d|Y/n/j|y/n/j|y/m/j|y/m/d|y/n/d|Y/n/d|Y/m/j',
-						format: 'Y-m-d H:i',
+						format: 'Y-m-d',
 						readOnly: true,
 						allowBlank : expectUseTimeNotBlank,
 						anchor: '95%',
+						showMinutesBox:false,
 						listeners:{
 							select:function(combo, records, index){
 								if(expectUseTimeOflimitTime > 0){
 									var now = new Date().getTime() + expectUseTimeDefauleValue*60*1000 - expectUseTimeOflimitTime*60*1000;
-									var day = new Date(records).getTime();
-									var nowDay = new Date(now).Format('yyyy-MM-dd hh:mm');
+									var expectUseTime2 = top.Ext.getCmp('expectUseTime2').getValue();
+									expectUseTime2 = (expectUseTime2 == '')?'00:00':expectUseTime2;
+									var day = new Date(combo.getRawValue() + ' ' + expectUseTime2).getTime();
+									var nowDay = new Date(now).Format('yyyy-MM-dd');
 									var nowTime = new Date(now).Format('hh:mm');
 									if(now > day){
 										showResult('预计使用时间不得早于'+ nowTime);
 										top.Ext.getCmp('expectUseTime').setValue(nowDay);
+										top.Ext.getCmp('expectUseTime2').setValue(nowTime);
 									}
 								}
 							}
 						}
 					}]
 				},{
 					layout: 'form',
+					columnWidth: .3,
+					hidden:expectUseTimeCheckHidden,
+					labelWidth: 30,
+					items: [{
+						xtype: 'timefield',
+						id: 'expectUseTime2',
+						name: 'expectUseTime2',
+						fieldLabel: '时间',
+						format: 'H:i',
+						readOnly: true,
+						allowBlank : false,
+						anchor: '95%',
+						listeners:{
+							select:function(combo, records, index){
+								if(expectUseTimeOflimitTime > 0){
+									var now = new Date().getTime() + expectUseTimeDefauleValue*60*1000 - expectUseTimeOflimitTime*60*1000;
+									var expectUseTime = top.Ext.getCmp('expectUseTime').getRawValue();
+									var day = new Date(expectUseTime + ' ' + combo.getRawValue()).getTime();
+									var nowDay = new Date(now).Format('yyyy-MM-dd');
+									var nowTime = new Date(now).Format('hh:mm');
+									if(now > day){
+										showResult('预计使用时间不得早于'+ nowTime);
+										top.Ext.getCmp('expectUseTime').setValue(nowDay);
+										top.Ext.getCmp('expectUseTime2').setValue(nowTime);
+									}
+								}
+							}
+						}
+					}]
+				},{
+					layout: 'form',
 					columnWidth: 1,
 					hidden:operationRoomCheckHidden,
 					items: [{
@@ -1172,6 +1210,8 @@
 						});
 						DWREngine.setAsync(true);
 						var expectUseTime = top.Ext.getCmp('expectUseTime').getRawValue();
+						var expectUseTime2 = top.Ext.getCmp('expectUseTime2').getRawValue();
+						expectUseTime = expectUseTime + ' ' + expectUseTime2;
 						var expectUseTime1 = expectUseTime.replace(/-/g,'/');//兼容IE
 						var nowDateStr = new Date(datefieldValue).getTime();
 						var expectUseTimeStr = new Date(expectUseTime1).getTime();
@@ -1183,6 +1223,8 @@
 					var urgentContact = top.Ext.getCmp('urgentContact').getValue();
 					var urgentOperationRoomId = top.Ext.getCmp('urgentOperationRoomId').getValue();
 					var expectUseTime = top.Ext.getCmp('expectUseTime').getRawValue();
+					var expectUseTime2 = top.Ext.getCmp('expectUseTime2').getRawValue();
+					expectUseTime = expectUseTime + ' ' + expectUseTime2
 					var urgentContactInfo = top.Ext.getCmp('urgentContactInfo').getValue();
 					useItemsStore.getAt(rowIndex).set('urgentAdditionalInfo','');
 					var urgentAdditionalInfo = {
@@ -1206,7 +1248,12 @@
 		if(urgentAdditionalInfo){
 			setTimeout(function(){
 				top.Ext.getCmp('urgentContactInfo').setValue(urgentAdditionalInfo.urgentContactInfo || '');
-				top.Ext.getCmp('expectUseTime').setValue(urgentAdditionalInfo.expectUseTime || '');
+				if((urgentAdditionalInfo.expectUseTime || '') !== ''){
+					var expectUseDate = urgentAdditionalInfo.expectUseTime.split(' ')[0];
+					var expectUseTime = urgentAdditionalInfo.expectUseTime.split(' ')[1];
+					top.Ext.getCmp('expectUseTime').setValue(expectUseDate);
+					top.Ext.getCmp('expectUseTime2').setValue(expectUseTime);
+				}
 				top.Ext.getCmp('urgentContact').setValue(urgentAdditionalInfo.urgentContact || '');
 				top.Ext.getCmp('urgentOperationRoomId').setValue(urgentAdditionalInfo.urgentOperationRoomId || '');
 				top.Ext.getCmp('urgentLevelId').setValue(urgentAdditionalInfo.urgentLevelId || '');
@@ -3909,30 +3956,6 @@
 			}
 		});
 	}
-
-	//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);
-				}
-			}
-		});
-	}
 }
 
 /**
Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/urgentLevel/urgentLevelForm.js
===================================================================
diff -u -r38123 -r38154
--- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/urgentLevel/urgentLevelForm.js	(.../urgentLevelForm.js)	(revision 38123)
+++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/urgentLevel/urgentLevelForm.js	(.../urgentLevelForm.js)	(revision 38154)
@@ -349,6 +349,11 @@
 								top.Ext4.getCmp('urgentContactInfoCheck').enable();
 								top.Ext4.getCmp('expectUseTimeCheck').setValue(true);
 								top.Ext4.getCmp('expectUseTimeNotBlank').enable();
+								//ZSRY-97：“扩展信息设置”中的内容拆分到加急级别信息中
+								top.Ext4.getCmp('expectUseTimeDefauleValueBox').show();
+								top.Ext4.getCmp('expectUseTimeDefauleValueTextBox').show();
+								top.Ext4.getCmp('expectUseTimeOflimitTimeBox').show();
+								top.Ext4.getCmp('expectUseTimeOflimitTimeTextBox').show();
 							} else {
 								top.Ext4.getCmp('expectUseTimeCheck').disable();
 								top.Ext4.getCmp('operationRoomCheck').disable();
@@ -394,8 +399,16 @@
 							change: function (thiz, checked) {
 								if (checked) {
 									top.Ext4.getCmp('expectUseTimeNotBlank').enable();
+									top.Ext4.getCmp('expectUseTimeDefauleValueBox').show();
+									top.Ext4.getCmp('expectUseTimeDefauleValueTextBox').show();
+									top.Ext4.getCmp('expectUseTimeOflimitTimeBox').show();
+									top.Ext4.getCmp('expectUseTimeOflimitTimeTextBox').show();
 								} else {
 									top.Ext4.getCmp('expectUseTimeNotBlank').disable();
+									top.Ext4.getCmp('expectUseTimeDefauleValueBox').hide();
+									top.Ext4.getCmp('expectUseTimeDefauleValueTextBox').hide();
+									top.Ext4.getCmp('expectUseTimeOflimitTimeBox').hide();
+									top.Ext4.getCmp('expectUseTimeOflimitTimeTextBox').hide();
 								}
 							}
 						}
@@ -416,7 +429,77 @@
 							{ boxLabel: '否', name: 'expectUseTimeNotBlank', inputValue: '否', checked: true }
 						]
 					}]
+				},{
+					columnWidth: .7,
+					layout: 'form',
+					border: 0,
+					style: 'margin-bottom:10px',
+					id:'expectUseTimeDefauleValueBox',
+					hidden:true,
+					items: [{
+						xtype: 'numberfield',
+						labelSeparator: '',
+						labelWidth:240,
+						id:'expectUseTimeDefauleValue',
+						name:'expectUseTimeDefauleValue',
+						fieldLabel:'预计使用时间默认值：当前时间 + ',
+						allowDecimals:false,
+						allowNegative:false,
+						minValue: 0,
+						maxValue: 9999,
+						anchor: '95%'
+					}]
+				},{
+					columnWidth: .11,
+					layout: 'form',
+					border: 0,
+					style: 'margin-bottom:10px',
+					id:'expectUseTimeDefauleValueTextBox',
+					hidden:true,
+					items: [{
+						xtype: 'textfield',
+						labelSeparator: '',
+						value:'分钟',
+						readOnly: true,
+						fieldCls: 'fieldReadOnlyNoRemove',
+						anchor: '95%'
+					}]
 				}, {
+					columnWidth: .7,
+					layout: 'form',
+					border: 0,
+					style: 'margin-bottom:10px',
+					id:'expectUseTimeOflimitTimeBox',
+					hidden:true,
+					items: [{
+						xtype: 'numberfield',
+						labelSeparator: '',
+						labelWidth:240,
+						id:'expectUseTimeOflimitTime',
+						name:'expectUseTimeOflimitTime',
+						fieldLabel:'预计使用时间不得早于默认时间的',
+						allowDecimals:false,
+						allowNegative:false,
+						minValue: 0,
+						maxValue: 9999,
+						anchor: '95%'
+					}]
+				},{
+					columnWidth: .11,
+					layout: 'form',
+					border: 0,
+					style: 'margin-bottom:10px',
+					id:'expectUseTimeOflimitTimeTextBox',
+					hidden:true,
+					items: [{
+						xtype: 'textfield',
+						labelSeparator: '',
+						value:'分钟',
+						readOnly: true,
+						fieldCls: 'fieldReadOnlyNoRemove',
+						anchor: '95%'
+					}]
+				}, {
 					columnWidth: 0.5,
 					layout: 'form',
 					border: 0,
@@ -545,20 +628,12 @@
 		]
 	});
 
-	var height = 150;
-	if(isShowInfo){
-		height += 200;
-	}
-	if(showVoiceNotifications){
-		height += 90;
-	}
-
 	urgentLevelWin = top.Ext4.create('Ext4.window.Window', {
 		id: 'urgentLevelWin',
 		layout: 'fit',
 		title: '加急级别信息',
 		width: 600,
-		height: height,
+		autoHeight:true,
 		modal: true,
 		border: false,
 		plain: true,
@@ -587,7 +662,12 @@
 					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})
+						top.Ext4.getCmp('expectUseTimeNotBlank').setValue({expectUseTimeNotBlank:action.result.data.expectUseTimeNotBlank});
+						//ZSRY-97：“扩展信息设置”中的内容拆分到加急级别信息中
+						top.Ext4.getCmp('expectUseTimeDefauleValueBox').show();
+						top.Ext4.getCmp('expectUseTimeDefauleValueTextBox').show();
+						top.Ext4.getCmp('expectUseTimeOflimitTimeBox').show();
+						top.Ext4.getCmp('expectUseTimeOflimitTimeTextBox').show();
 					}
 					if(action.result.data.operationRoomCheck == '是'){
 						top.Ext4.getCmp('operationRoomNotBlank').enable();
@@ -633,180 +713,6 @@
 	}
 }
 
-//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:'否',