Index: ssts-operationmonitor/src/main/java/com/forgon/disinfectsystem/supplyroomcontrol/service/SupplyRoomControlManagerImpl.java
===================================================================
diff -u -r14039 -r14040
--- ssts-operationmonitor/src/main/java/com/forgon/disinfectsystem/supplyroomcontrol/service/SupplyRoomControlManagerImpl.java	(.../SupplyRoomControlManagerImpl.java)	(revision 14039)
+++ ssts-operationmonitor/src/main/java/com/forgon/disinfectsystem/supplyroomcontrol/service/SupplyRoomControlManagerImpl.java	(.../SupplyRoomControlManagerImpl.java)	(revision 14040)
@@ -560,7 +560,7 @@
 		
 		String amountSql = "select po from " + ClassifyBasket.class.getSimpleName() + " po ";
 		String sql = " left join po.washAndDisinfectRecords wr where wr is null and po in (select classifyBasket from ClassifiedItem) "
-				+ " and po.containerName in (select containerName from Container) order by po.id desc";
+				+ " and po.containerName in (select ct.containerName from Container ct where ct.status = \'清洗装载\') order by po.id desc";
 		 // and ci is not null left join po.classfiedItems ci
 		List<ClassifyBasket> totalBaskets = objectDao.findByHql(amountSql + sql);
 		
Index: ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/action/WashAndDisinfectRecordAction.java
===================================================================
diff -u -r14039 -r14040
--- ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/action/WashAndDisinfectRecordAction.java	(.../WashAndDisinfectRecordAction.java)	(revision 14039)
+++ ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/action/WashAndDisinfectRecordAction.java	(.../WashAndDisinfectRecordAction.java)	(revision 14040)
@@ -620,7 +620,7 @@
 			
 			// 获取未清洗的所有篮筐
 			String sql = "select po from " + ClassifyBasket.class.getSimpleName()+ " po left join po.washAndDisinfectRecords wr where wr is null and po in (select classifyBasket from ClassifiedItem) "
-						+ " and po.containerName in (select containerName from Container) order by po.id desc";
+						+ " and po.containerName in (select ct.containerName from Container ct where ct.status = \'清洗装载\') order by po.id desc";
 			List<ClassifyBasket> baskets = objectDao.findByHql(sql);
 //			String currentDate = new SimpleDateFormat("yyyy-MM-dd").format(new Date());
 //			SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");