Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/container/service/ReviewedBasketManagerImpl.java =================================================================== diff -u -r38235 -r38585 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/container/service/ReviewedBasketManagerImpl.java (.../ReviewedBasketManagerImpl.java) (revision 38235) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/container/service/ReviewedBasketManagerImpl.java (.../ReviewedBasketManagerImpl.java) (revision 38585) @@ -291,10 +291,14 @@ // Object recordObj = objArray[1]; if (basketObj instanceof ReviewedBasket) { boolean allFailed = true; //必须所有的灭菌记录都是灭菌失败,才能使用。如果包含有灭菌完成、灭菌中、或者是灭菌中断的记录,则此篮筐实例不能使用 - for(SterilizationRecord sr : ((ReviewedBasket) basketObj).getSterilizationRecords()){ - if(sr!= null && !sr.isSterilizationFailure()){ - allFailed = false; - break; + ReviewedBasket rb = (ReviewedBasket) basketObj; + List sterilizationRecords = rb.getSterilizationRecords(); + if(CollectionUtils.isNotEmpty(sterilizationRecords)){ + for(SterilizationRecord sr : sterilizationRecords){ + if(sr!= null && !sr.isSterilizationFailure()){ + allFailed = false; + break; + } } } if(allFailed){