Index: ssts-web/src/main/webapp/disinfectsystem/useRecord/useRecordForm.js
===================================================================
diff -u -r37434 -r37444
--- ssts-web/src/main/webapp/disinfectsystem/useRecord/useRecordForm.js	(.../useRecordForm.js)	(revision 37434)
+++ ssts-web/src/main/webapp/disinfectsystem/useRecord/useRecordForm.js	(.../useRecordForm.js)	(revision 37444)
@@ -1002,7 +1002,7 @@
 			urgentAdditionalInfo = item.get('urgentAdditionalInfo');
 		}else {
 			var expectUseTime = '';
-			if(urgentLevelRecord.expectUseTimeCheck == '是' && expectUseTimeDefauleValue > 0){
+			if(urgentLevelRecord.expectUseTimeCheck == '是'){
 				var datefieldValue;
 				DWREngine.setAsync(false);
 				ServerTimeTableManager.getServerDateTime('yyyy/MM/dd HH:mm', function (config) {
@@ -1071,7 +1071,7 @@
 						listeners:{
 							select:function(combo, records, index){
 								if(expectUseTimeOflimitTime > 0){
-									var now = new Date().getTime() - expectUseTimeOflimitTime*60*1000;
+									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 nowTime = new Date(now).Format('hh:mm');
@@ -1150,7 +1150,7 @@
 						return false;
 					}
 					var expectUseTimeCheckHidden = top.Ext.getCmp('expectUseTimeCheckHidden').getValue();
-					if(expectUseTimeCheckHidden == false || expectUseTimeCheckHidden == 'false'){
+					if((expectUseTimeCheckHidden == false || expectUseTimeCheckHidden == 'false') && expectUseTimeOflimitTime == 0){
 						var datefieldValue;
 						DWREngine.setAsync(false);
 						ServerTimeTableManager.getServerDateTime('yyyy/MM/dd HH:mm', function (config) {
@@ -3836,6 +3836,30 @@
 			}
 		});
 	}
+
+	//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);
+				}
+			}
+		});
+	}
 }
 
 /**
@@ -4459,7 +4483,6 @@
 			materialErrorDamageFormPanel.getEl().unmask();
 		}
 	});
-
 }
 
 /**
Index: ssts-web/src/main/webapp/disinfectsystem/useRecord/useRecordView.js
===================================================================
diff -u -r37434 -r37444
--- ssts-web/src/main/webapp/disinfectsystem/useRecord/useRecordView.js	(.../useRecordView.js)	(revision 37434)
+++ ssts-web/src/main/webapp/disinfectsystem/useRecord/useRecordView.js	(.../useRecordView.js)	(revision 37444)
@@ -1338,28 +1338,4 @@
 			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