Index: ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/action/WashAndDisinfectRecordAction.java
===================================================================
diff -u -r20578 -r20789
--- ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/action/WashAndDisinfectRecordAction.java	(.../WashAndDisinfectRecordAction.java)	(revision 20578)
+++ ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/action/WashAndDisinfectRecordAction.java	(.../WashAndDisinfectRecordAction.java)	(revision 20789)
@@ -406,15 +406,6 @@
 
 	public void getPendingWashAndDisinfectTousseAndBasket(){
 		try {
-//			String status = StrutsParamUtils.getPraramValue("status", "");
-			// 状态如果是清洗完成,不用加载
-//			if (StringUtils.equals(status,
-//					SterilizationRecord.STERILIZATION_STATUS_END)
-//					|| StringUtils.equals(status,
-//							SterilizationRecord.STERILIZATION_STATUS_FAILURE)) {
-//				return;
-//			}
-
 			JSONArray jsonArray = new JSONArray();
 			JSONArray notTimeoutJsonArray = new JSONArray();      //未超时的篮筐,需要放在后面
 			
@@ -431,28 +422,10 @@
 						+ " and po.id not in (select classifyBasketId from PackingRecord_ClassifyBasket where classifyBasketId is not null) order by po.recyclingTime desc"; //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");
-//			Date startTime = sdf.parse(currentDate + " 00:00:00");
-//			Date endTime = sdf.parse(currentDate + " 23:59:59");
 			List<String> basketBarcodes = new ArrayList<String>();
 			if( baskets != null && CollectionUtils.isNotEmpty(baskets)){
 				TimeoutSetting timeoutSetting = timeoutManager.getTimeoutSetting(TimeoutManager.PROCEDURE_RECYCLE_TO_WASH);
 				for (ClassifyBasket basket : baskets) {
-//					List<RecyclingRecord> rrs = basket.getRecyclingRecords();
-//					boolean isTodayRecyclingRecord = false;
-//					for( RecyclingRecord rr : rrs)
-//					{
-//						Date rTime = rr.getRecyclingTime();
-//						if( rTime.getTime() >= startTime.getTime() && rTime.getTime() <= endTime.getTime())
-//						{
-//							isTodayRecyclingRecord = true;
-//						}
-//					}
-//					// 不是今天的回收记录 不显示
-//					if( isTodayRecyclingRecord == false)
-//						continue;
-//					String containName = basket.getContainerName();
 					String bkBarcode = basket.getContainerBarcode();
 					String IDcardBarcode = null;
 					BarcodeDevice barcodeDevice = barcodeManager.getBarcodeByBarcode(bkBarcode);