Index: ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java =================================================================== diff -u -r18575 -r18576 --- ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java (.../PackingManagerImpl.java) (revision 18575) +++ ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java (.../PackingManagerImpl.java) (revision 18576) @@ -4286,7 +4286,7 @@ while(rs.next()){ String taskId = rs.getString("taskId"); PackingTask urgentPackingTask = getPackingTaskByIdForUpdate_internal(taskId); - if(urgentPackingTask != null){ + if(urgentPackingTask != null && (urgentPackingTask.getUrgentAmount() != null && urgentPackingTask.getUrgentAmount() > 0)){ urgentPackingTask.setUrgentAmount(urgentPackingTask.getUrgentAmount() - 1); tousseInstance.setIsUrgentTousse(TousseDefinition.STR_YES); urgentAmountJson.put("currentUrgentAmount", currentUrgentAmount - 1);