Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedata/becleanitem/service/BeCleanItemManagerImpl.java =================================================================== diff -u -r27539 -r28548 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedata/becleanitem/service/BeCleanItemManagerImpl.java (.../BeCleanItemManagerImpl.java) (revision 27539) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedata/becleanitem/service/BeCleanItemManagerImpl.java (.../BeCleanItemManagerImpl.java) (revision 28548) @@ -1163,7 +1163,13 @@ } int frequency = 0; - ClassifyBasket classifyBasket = classifyBasketManager.getUnWashedBasket(barcode); + Set barcodes = new HashSet(); + barcodes.add(barcode); + List classifyBaskets = classifyBasketManager.getUnWashedAndTousseItemUnEndBasket(barcodes); + ClassifyBasket classifyBasket = null; + if(CollectionUtils.isNotEmpty(classifyBaskets)){ + classifyBasket = classifyBaskets.get(0); + } if (classifyBasket == null) { classifyBasket = getLatestWashedBasketByBarcode(barcode); }