Index: ssts-operationmonitor/src/main/java/com/forgon/disinfectsystem/supplyroomcontrol/service/SupplyRoomControlManagerImpl.java
===================================================================
diff -u -r14031 -r14039
--- ssts-operationmonitor/src/main/java/com/forgon/disinfectsystem/supplyroomcontrol/service/SupplyRoomControlManagerImpl.java	(.../SupplyRoomControlManagerImpl.java)	(revision 14031)
+++ ssts-operationmonitor/src/main/java/com/forgon/disinfectsystem/supplyroomcontrol/service/SupplyRoomControlManagerImpl.java	(.../SupplyRoomControlManagerImpl.java)	(revision 14039)
@@ -26,7 +26,9 @@
 
 import com.forgon.databaseadapter.service.DateQueryAdapter;
 import com.forgon.directory.acegi.tools.AcegiHelper;
+import com.forgon.disinfectsystem.basedatamanager.container.service.ContainerManager;
 import com.forgon.disinfectsystem.basedatamanager.supplyroomconfig.service.SupplyRoomConfigManager;
+import com.forgon.disinfectsystem.entity.basedatamanager.container.Container;
 import com.forgon.disinfectsystem.entity.basedatamanager.supplyroomconfig.SupplyRoomConfig;
 import com.forgon.disinfectsystem.entity.basedatamanager.toussedefinition.TousseDefinition;
 import com.forgon.disinfectsystem.entity.basedatamanager.toussedefinition.TousseInstance;
@@ -53,6 +55,7 @@
 	private DateQueryAdapter dateQueryAdapter;
 	
 	private ObjectDao objectDao;
+	private ContainerManager containerManager;
 	
 	//申请单类型
 	private static final String INVOICEPLAN_TYPE = "'"
@@ -75,6 +78,11 @@
 		this.supplyRoomConfigManager = supplyRoomConfigManager;
 	}
 
+	
+	public void setContainerManager(ContainerManager containerManager) {
+		this.containerManager = containerManager;
+	}
+
 	public void setObjectDao(ObjectDao objectDao) {
 		this.objectDao = objectDao;
 	}
@@ -551,8 +559,9 @@
 			String pageSize) {
 		
 		String amountSql = "select po from " + ClassifyBasket.class.getSimpleName() + " po ";
-		String sql = " left join po.washAndDisinfectRecords wr where wr is null";
-		
+		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 ci is not null left join po.classfiedItems ci
 		List<ClassifyBasket> totalBaskets = objectDao.findByHql(amountSql + sql);
 		
 		List<ClassifyBasket> tasksList = objectDao.findBySql(
@@ -569,8 +578,7 @@
 		if( tasksList != null && CollectionUtils.isNotEmpty(tasksList)){
 			for (ClassifyBasket basket : tasksList) {
 //				List<RecyclingRecord> rrs = basket.getRecyclingRecords();
-
-//				String containName = basket.getContainerName();
+				
 				Set<ClassifiedItem> items = basket.getClassfiedItems();
 				
 				JSONObject basketObj = new JSONObject();
Index: ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/action/WashAndDisinfectRecordAction.java
===================================================================
diff -u -r14036 -r14039
--- ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/action/WashAndDisinfectRecordAction.java	(.../WashAndDisinfectRecordAction.java)	(revision 14036)
+++ ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/action/WashAndDisinfectRecordAction.java	(.../WashAndDisinfectRecordAction.java)	(revision 14039)
@@ -31,6 +31,7 @@
 import com.forgon.directory.acegi.tools.AcegiHelper;
 import com.forgon.directory.vo.LoginUserData;
 import com.forgon.disinfectsystem.basedata.becleanitem.service.BeCleanItemManager;
+import com.forgon.disinfectsystem.basedatamanager.container.service.ContainerManager;
 import com.forgon.disinfectsystem.entity.basedatamanager.materialdefinition.MaterialDefinition;
 import com.forgon.disinfectsystem.entity.basedatamanager.rinser.Rinser;
 import com.forgon.disinfectsystem.entity.basedatamanager.toussedefinition.TousseDefinition;
@@ -67,10 +68,15 @@
 	private BeCleanItemManager beCleanItemManager;
 
 	private MaterialDefinitionManager materialDefinitionManager;
+	private ContainerManager containerManager;
 
 	private ObjectDao objectDao;
 	private boolean hasWashRecord = false;
 
+	public void setContainerManager(ContainerManager containerManager) {
+		this.containerManager = containerManager;
+	}
+
 	public MaterialDefinitionManager getMaterialDefinitionManager() {
 		return materialDefinitionManager;
 	}
@@ -613,7 +619,8 @@
 			JSONArray jsonArray = new JSONArray();
 			
 			// 获取未清洗的所有篮筐
-			String sql = "select b from " + ClassifyBasket.class.getSimpleName()+ " b left join b.washAndDisinfectRecords wr where wr is null";
+			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";
 			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");
@@ -634,8 +641,7 @@
 //					// 不是今天的回收记录 不显示
 //					if( isTodayRecyclingRecord == false)
 //						continue;
-//					
-					String containName = basket.getContainerName();
+//					String containName = basket.getContainerName();
 					Set<ClassifiedItem> items = basket.getClassfiedItems();
 					
 					JSONObject basketObj = new JSONObject();