Index: ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java
===================================================================
diff -u -r34540 -r34542
--- ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java	(.../RecyclingRecordManagerImpl.java)	(revision 34540)
+++ ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java	(.../RecyclingRecordManagerImpl.java)	(revision 34542)
@@ -3589,11 +3589,13 @@
 						task.setRemarkOfApplyGoods(tousseItem.getRemarkOfApplyGoods());
 					}
 					Integer urgentAmountOfMap = null;//剩余加急装配任务数量
-					if(recyclingItemAndAmountMap.containsKey(ri.getId())){
-						urgentAmountOfMap = recyclingItemAndAmountMap.get(ri.getId());
-					}else{
-						recyclingItemAndAmountMap.put(ri.getId(), ri.getUrgentAmount());
-						urgentAmountOfMap = ri.getUrgentAmount();
+					if(ri != null){
+						if(recyclingItemAndAmountMap.containsKey(ri.getId())){
+							urgentAmountOfMap = recyclingItemAndAmountMap.get(ri.getId());
+						}else{
+							recyclingItemAndAmountMap.put(ri.getId(), ri.getUrgentAmount());
+							urgentAmountOfMap = ri.getUrgentAmount();
+						}
 					}
 					if(urgentAmountOfMap != null && urgentAmountOfMap != 0){
 						task.setUrgentLevel(ri == null?"":ri.getUrgentLevel());