Index: ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/materialerrordamage/service/MaterialErrorDamageDetailManagerImpl.java
===================================================================
diff -u -r34924 -r35753
--- ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/materialerrordamage/service/MaterialErrorDamageDetailManagerImpl.java	(.../MaterialErrorDamageDetailManagerImpl.java)	(revision 34924)
+++ ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/materialerrordamage/service/MaterialErrorDamageDetailManagerImpl.java	(.../MaterialErrorDamageDetailManagerImpl.java)	(revision 35753)
@@ -466,8 +466,8 @@
 			}
 		}
 		//丢失、报损生产数据量不大，占时可以不考虑性能问题
-		for (String taskId : taskIdToMaterialsMap.keySet()) {
-			materialSupplement(taskId, type, taskIdToMaterialsMap.get(taskId), washBasketBarcode,warehouseId,supplementMaterialDetailIdList);
+		for(Entry<String,JSONArray> entry : taskIdToMaterialsMap.entrySet()){
+			materialSupplement(entry.getKey(), type, entry.getValue(), washBasketBarcode,warehouseId,supplementMaterialDetailIdList);
 		}
 	}
 
@@ -692,9 +692,10 @@
 				SimpleDateFormat sdf = new SimpleDateFormat(DateTools.COMMON_DATE_HMS);
 				String dateAreaCondition = dateQueryAdapter.dateAreaSql("i.sendTime", 
 						sdf.format(cal.getTime()), sdf.format(Calendar.getInstance().getTime()));
-				for (Long currentMaterialDefinitionId : materialNeedWriteBackTotalAmountMap.keySet()) {
+				for(Entry<Long, Long> entry : materialNeedWriteBackTotalAmountMap.entrySet()){
+					Long currentMaterialDefinitionId = entry.getKey();
 					//该器械材料需要回写的数量
-					Long materialNeedWriteBackTotalAmount = materialNeedWriteBackTotalAmountMap.get(currentMaterialDefinitionId);
+					Long materialNeedWriteBackTotalAmount = entry.getValue();
 					//该器械材料的使用量(近一个月内、所有科室之和)
 					Long materialTotalUseAmountForAllDepart = 0L;
 					//3.统计该器械材料最近一个月内的使用量之和
@@ -757,12 +758,10 @@
 					}
 					
 					//5.循环对该物品各科室进行回写
-					if(materialWriteBackAmountForEveryDepartMap != null && materialWriteBackAmountForEveryDepartMap.size() > 0){
-						for (String departCoding : materialWriteBackAmountForEveryDepartMap.keySet()) {
-							if(writeBackInventoryManager != null){
-								writeBackInventoryManager.writeBackForSupplementMaterialDetailData(currentMaterialDefinitionId, 
-										materialWriteBackAmountForEveryDepartMap.get(departCoding), AcegiHelper.getCurrentOrgUnitCode(), departCoding);
-							}
+					if(materialWriteBackAmountForEveryDepartMap != null && materialWriteBackAmountForEveryDepartMap.size() > 0 && writeBackInventoryManager != null){
+						for(Entry<String, Long> entry2 : materialWriteBackAmountForEveryDepartMap.entrySet()){
+							writeBackInventoryManager.writeBackForSupplementMaterialDetailData(currentMaterialDefinitionId, 
+									entry2.getValue(), AcegiHelper.getCurrentOrgUnitCode(), entry2.getKey());
 						}
 					}
 				}