Index: ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManagerImpl.java
===================================================================
diff -u -r34098 -r34103
--- ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManagerImpl.java	(.../WashAndDisinfectRecordManagerImpl.java)	(revision 34098)
+++ ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManagerImpl.java	(.../WashAndDisinfectRecordManagerImpl.java)	(revision 34103)
@@ -918,7 +918,6 @@
 					}
 					//如果篮筐没有装配任务了，并且是清洗完成状态,那状态就设置为空闲
 					if(containerManager.isEmpty(container.getBarcode()) && container.washed()){
-						releaseBasketAfterReturn = true;
 						if(releaseBasketAfterReturn && isExistForeignTousseInBasket(classifyBasketId)){
 							return;//如果科室供应室配置中 外来器械归还后释放清洗篮筐为是,篮筐中又包含外来器械 则此处不设置为空闲
 						}
@@ -941,7 +940,7 @@
 				+" ci on ci.classifybasket_id=cb.id "
 				+ "join "
 				+ TousseDefinition.class.getSimpleName()
-				+" td on td.id=ci.toussedefinition_id "
+				+" td on td.id=ci.toussedefinition_id or td.id=ci.toussedefinitionID "
 				+" where td.tousseType in('"+
 				TousseDefinition.PACKAGE_TYPE_FOREIGN
 				+"','"+