Index: ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterileloading/service/SterileLoadingManagerImpl.java
===================================================================
diff -u -r36426 -r38453
--- ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterileloading/service/SterileLoadingManagerImpl.java	(.../SterileLoadingManagerImpl.java)	(revision 36426)
+++ ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterileloading/service/SterileLoadingManagerImpl.java	(.../SterileLoadingManagerImpl.java)	(revision 38453)
@@ -9,13 +9,19 @@
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang.StringUtils;
 
+import com.forgon.databaseadapter.service.DateQueryAdapter;
+import com.forgon.disinfectsystem.common.CssdUtils;
 import com.forgon.disinfectsystem.entity.basedatamanager.toussedefinition.TousseDefinition;
 import com.forgon.disinfectsystem.entity.basedatamanager.toussedefinition.TousseInstance;
 import com.forgon.disinfectsystem.tousse.toussedefinition.service.TousseInstanceManager;
 import com.forgon.tools.SqlBuilder;
 
 public class SterileLoadingManagerImpl implements SterileLoadingManager {
 	private TousseInstanceManager tousseInstanceManager;
+	private DateQueryAdapter dateQueryAdapter;
+	public void setDateQueryAdapter(DateQueryAdapter dateQueryAdapter) {
+		this.dateQueryAdapter = dateQueryAdapter;
+	}
 	public void setTousseInstanceManager(TousseInstanceManager tousseInstanceManager) {
 		this.tousseInstanceManager = tousseInstanceManager;
 	}
@@ -48,8 +54,14 @@
 		sqlWheres.add(SqlBuilder.build_IN_Statement(
 				"po.barcode", SqlBuilder.NOT_IN, scannedBarcodes));
 		sqlWheres.add("po.status='" + TousseInstance.STATUS_REVIEWED + "'");
-		sqlWheres.add("po.reviewBasket_id is null or po.reviewBasket_id = 0");
-	
+		sqlWheres.add("po.reviewBasket_id is null");
+        //ZSYY-390 灭菌装载扫描不追溯物品的固定条码响应超时的问题
+		if(tousseDefinition != null && !tousseDefinition.traceable()){
+			String[] defaultQueryStartDateAndEndDateArray = CssdUtils.getQueryPeroidOfModule(CssdUtils.getQueryPeroidOfModule("sterilizationLoading_fixedBarcode"));
+			if(defaultQueryStartDateAndEndDateArray != null){
+				sqlWheres.add(dateQueryAdapter.dateAreaSql("po.operationTime", defaultQueryStartDateAndEndDateArray[0] + " 00:00:00", defaultQueryStartDateAndEndDateArray[1] + " 23:59:59"));
+			}
+		}
 		// 非可追溯器械包，返回多个器械包实例
 		resultTousseInstanceList = tousseInstanceManager.getUnTraceableTousseInstanceListByFictitiousTousseDefinition(
 						tousseDefinition, sqlWheres);