Index: ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java =================================================================== diff -u -r28549 -r28554 --- ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java (.../RecyclingRecordManagerImpl.java) (revision 28549) +++ ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java (.../RecyclingRecordManagerImpl.java) (revision 28554) @@ -3223,7 +3223,7 @@ Integer amountOfTd = entry.getValue(); Integer amountOfClassifyBasket = mdIdAndAmount.get(mdIdOfTd); if(!mdIdAndAmount.containsKey(mdIdOfTd) || amountOfClassifyBasket == null){ - continue; + return new HashMap();//材料种类不全,说明不能完美组合(无剩余器械) } if(amountOfClassifyBasket % amountOfTd != 0){//有余数说明不是整数倍 return new HashMap();