Index: ssts-web/src/main/java/com/forgon/disinfectsystem/systemexamination/action/DisposableGoodsStockExaminationAction.java =================================================================== diff -u -r29576 -r31418 --- ssts-web/src/main/java/com/forgon/disinfectsystem/systemexamination/action/DisposableGoodsStockExaminationAction.java (.../DisposableGoodsStockExaminationAction.java) (revision 29576) +++ ssts-web/src/main/java/com/forgon/disinfectsystem/systemexamination/action/DisposableGoodsStockExaminationAction.java (.../DisposableGoodsStockExaminationAction.java) (revision 31418) @@ -166,8 +166,10 @@ if(list == null){ list = new ArrayList(); } - list.add(identification); - disposableGoodsBatchStockIdToIDMap.put(batchStock.getId(), list); + if(identification != null){ + list.add(identification); + disposableGoodsBatchStockIdToIDMap.put(batchStock.getId(), list); + } } }