Index: ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/action/WashAndDisinfectRecordAction.java
===================================================================
diff -u -r16187 -r16344
--- ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/action/WashAndDisinfectRecordAction.java	(.../WashAndDisinfectRecordAction.java)	(revision 16187)
+++ ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/action/WashAndDisinfectRecordAction.java	(.../WashAndDisinfectRecordAction.java)	(revision 16344)
@@ -597,13 +597,20 @@
 //				return;
 //			}
 
-
 			JSONArray jsonArray = new JSONArray();
 			JSONArray notTimeoutJsonArray = new JSONArray();      //未超时的篮筐,需要放在后面
 			
+			String coding = AcegiHelper.getLoginUser().getOrgUnitCodingFromSupplyRoomConfig();
+			String sql = "";
 			// 获取未清洗的所有篮筐
-			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) "
+			if(StringUtils.isBlank(coding)){
+				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 ct.containerName from Container ct where ct.status = \'清洗装载\') order by po.recyclingTime desc"; //po.id desc";
+			}else{
+				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 ct.containerName from Container ct where ct.status = \'清洗装载\'" + " and ct.departCode = '" + coding + "'" + ")"
+						+ " 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");