Index: ssts-web/src/main/webapp/disinfectsystem/toussemanager/tousseinstancemanager/tousseInstanceView.js
===================================================================
diff -u -r38564 -r38565
--- ssts-web/src/main/webapp/disinfectsystem/toussemanager/tousseinstancemanager/tousseInstanceView.js	(.../tousseInstanceView.js)	(revision 38564)
+++ ssts-web/src/main/webapp/disinfectsystem/toussemanager/tousseinstancemanager/tousseInstanceView.js	(.../tousseInstanceView.js)	(revision 38565)
@@ -2593,10 +2593,6 @@
 	//QYSRMYY-70：新增支持设置默认查询时间
 	var defaultOperationStart = '';
 	var defaultOperationEnd = '';
-	if(sstsConfig.enableAnInstanceIsGeneratedAfterRecycled && !hideRecyclingTimeQuery){
-		$Id('parm_s_recyclingTimeStart').value = getDefaultDate(newDate) + '00:00';
-		$Id('parm_s_recyclingTimeEnd').value = getDefaultDate(newDate) + '23:59';
-	}
 	if(sstsConfig.defaultQueryTimeOfTheFunctionModule && sstsConfig.defaultQueryTimeOfTheFunctionModule.length > 0){
 		var defaultQueryTimeOfTheFunctionModule = sstsConfig.defaultQueryTimeOfTheFunctionModule;
 		var queryPeriod = 0;
@@ -2606,12 +2602,12 @@
 			}
 		}
 		if(queryPeriod > 0 && queryPeriod <= 10000){
+			defaultOperationStart = getDefaultDate(newDate,queryPeriod) + '00:00';
+			defaultOperationEnd = getDefaultDate(newDate) + '23:59';
 			if(sstsConfig.enableAnInstanceIsGeneratedAfterRecycled && !hideRecyclingTimeQuery){
-				$Id('parm_s_recyclingTimeStart').value = getDefaultDate(newDate,queryPeriod) + '00:00';
-				$Id('parm_s_recyclingTimeEnd').value = getDefaultDate(newDate) + '23:59';
+				$Id('parm_s_recyclingTimeStart').value = defaultOperationStart
+				$Id('parm_s_recyclingTimeEnd').value = defaultOperationEnd
 			}else {
-				defaultOperationStart = getDefaultDate(newDate,queryPeriod) + '00:00';
-				defaultOperationEnd = getDefaultDate(newDate) + '23:59';
 				$Id('parm_s_operationStart').value = defaultOperationStart;
 				$Id('parm_s_operationEnd').value = defaultOperationEnd;
 			}
@@ -2755,8 +2751,13 @@
 			});
 		}
 		if(defaultOperationStart !== '' && defaultOperationEnd !== ''){
-			$Id('operationStart').value = defaultOperationStart;
-			$Id('operationEnd').value = defaultOperationEnd;
+			if(sstsConfig.enableAnInstanceIsGeneratedAfterRecycled && !hideRecyclingTimeQuery){
+				$Id('recyclingTimeStart').value = defaultOperationStart;
+				$Id('recyclingTimeEnd').value = defaultOperationEnd;
+			}else {
+				$Id('operationStart').value = defaultOperationStart;
+				$Id('operationEnd').value = defaultOperationEnd;
+			}
 		}
 	})
 }