Index: ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java
===================================================================
diff -u -r35677 -r35752
--- ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java	(.../RecyclingRecordAction.java)	(revision 35677)
+++ ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java	(.../RecyclingRecordAction.java)	(revision 35752)
@@ -2155,11 +2155,12 @@
 							departTousseMap.put(depart, volist);
 						}
 						if(departTousseMap.size() > 0){
-							for (String departKey : departTousseMap.keySet()) {
+							for(Entry<String,List<TousseInstanceVo>> entry : departTousseMap.entrySet()){
+								String departKey = entry.getKey();
 								JSONObject jsonObject = new JSONObject();
 								jsonObject.put("departName", departKey);
 								StringBuffer specializedDepartTousseNote = new StringBuffer();
-								List<TousseInstanceVo> departTousseVolist = departTousseMap.get(departKey);
+								List<TousseInstanceVo> departTousseVolist = entry.getValue();;
 								if(CollectionUtils.isNotEmpty(departTousseVolist)){
 									for(TousseInstanceVo vo : departTousseVolist){
 										if(specializedDepartTousseNote.length() > 0){
@@ -2312,11 +2313,12 @@
 					}
 					if(departTousseListMap.size() > 0){
 						JSONArray jsonArray = new JSONArray();
-						for (String departKey : departTousseListMap.keySet()) {
+						for(Entry<String,List<TousseInstanceVo>> entry : departTousseListMap.entrySet()){
+							String departKey = entry.getKey();
 							JSONObject jsonObject = new JSONObject();
 							jsonObject.put("departName", departKey);
 							StringBuffer specializedDepartTousseNote = new StringBuffer();
-							List<TousseInstanceVo> departTousseVolist = departTousseListMap.get(departKey);
+							List<TousseInstanceVo> departTousseVolist = entry.getValue();
 							if(CollectionUtils.isNotEmpty(departTousseVolist)){
 								for(TousseInstanceVo vo : departTousseVolist){
 									if(specializedDepartTousseNote.length() > 0){
@@ -3145,18 +3147,19 @@
 	
 	private JSONArray buildDepartToussJson(Map<String, List<DepartRecycleTousse>> map,JSONArray config){
 		JSONArray array = new JSONArray();
-		for (String departCode : map.keySet()) {
+		for(Entry<String, List<DepartRecycleTousse>> entry : map.entrySet()){
+			String departCode = entry.getKey();
 			JSONObject obj = new JSONObject();
 			obj.put("departCode", departCode);
 			String showDepart = getShowDepart(config,departCode);
+			List<DepartRecycleTousse> list = entry.getValue();
 			if(StringUtils.isBlank(showDepart)){
-				List<DepartRecycleTousse> list = map.get(departCode);
 				if(CollectionUtils.isNotEmpty(list)){
 					showDepart = list.get(0).getDepart();
 				}
 			}
 			obj.put("showDepart", showDepart);
-			obj.put("items", map.get(departCode));
+			obj.put("items", list);
 			array.add(obj);
 		}
 		return array;
@@ -3419,12 +3422,9 @@
 				}
 			}
 			//转json
-			Iterator<String> itr = departTousseMap.keySet()
-					.iterator();
-			while (itr.hasNext()) {
-				String departName = itr.next();
-				Map<String, Integer> tousseMap = departTousseMap
-						.get(departName);
+			for(Entry<String, Map<String, Integer>> entry : departTousseMap.entrySet()){
+				String departName = entry.getKey();
+				Map<String, Integer> tousseMap = entry.getValue();
 				RecyclingDetailVo vo = new RecyclingDetailVo();
 				OrgUnit orgUnit = null;
 				if(orgUnitMap.containsKey(departName)){
@@ -3439,8 +3439,9 @@
 					vo.setBrevityCode(departName);
 				}
 				vo.setDepartName(departName);
-				for (String tousseName : tousseMap.keySet()) {
-					Integer amount = tousseMap.get(tousseName);
+				for(Entry<String, Integer> entry2 : tousseMap.entrySet()){
+					String tousseName = entry2.getKey();
+					Integer amount = entry2.getValue();
 					RecyclingDetailItemVo itemVo = new RecyclingDetailItemVo();
 					itemVo.setTousseName(tousseName);
 					itemVo.setAmount(amount);
@@ -3453,20 +3454,15 @@
 					voList.add(vo);
 				}
 			}
-			
-			Iterator<String> disinfectionItr = disinfectionMap
-					.keySet().iterator();
-			while (disinfectionItr.hasNext()) {
-				String goodsName = disinfectionItr.next();
-				Map<String,Map<TousseDefinition,Integer>> departMap = disinfectionMap
-						.get(goodsName);
-				Iterator<String> departItr = departMap.keySet()
-						.iterator();
+			StringBuffer sbf = new StringBuffer();
+			for(Entry<String, Map<String, Map<TousseDefinition, Integer>>> entry : disinfectionMap.entrySet()){
+				String goodsName = entry.getKey();
+				Map<String,Map<TousseDefinition,Integer>> departMap = entry.getValue();
 				DisinfectionDetailVo vo = new DisinfectionDetailVo();
 				JSONArray array = new JSONArray();
 				vo.setGoodsName(goodsName);
-				while (departItr.hasNext()) {
-					String depart = departItr.next();
+				for(Entry<String, Map<TousseDefinition, Integer>> entry2 : departMap.entrySet()){
+					String depart = entry2.getKey();
 					OrgUnit orgUnit = null;
 					if(orgUnitMap.containsKey(depart)){
 						orgUnit = orgUnitMap.get(depart);
@@ -3482,18 +3478,18 @@
 					JSONObject obj = new JSONObject();
 					obj.put("depart", brevityCode);
 					
-					Map<TousseDefinition,Integer> tousseMap = departMap
-							.get(depart);
+					Map<TousseDefinition,Integer> tousseMap = entry2.getValue();
 					Map<String, Integer> materialMap = new HashMap<String, Integer>();
-					for (TousseDefinition tousseDefinition : tousseMap.keySet()) {
+					for(Entry<TousseDefinition, Integer> entry3 : tousseMap.entrySet()){
+						TousseDefinition tousseDefinition = entry3.getKey();
 						List<MaterialInstance> msList = null;
 						if(materialInstancesOfTdMap.containsKey(tousseDefinition.getId())){
 							msList = materialInstancesOfTdMap.get(tousseDefinition.getId());
 						}else{
 							msList = (List<MaterialInstance>)objectDao.findByHql("select new MaterialInstance(po.materialName,po.count)  from "+ MaterialInstance.class.getSimpleName() +" po where po.tousse.id= " + tousseDefinition.getId());
 							materialInstancesOfTdMap.put(tousseDefinition.getId(), msList);
 						}
-						Integer r_Amount = tousseMap.get(tousseDefinition);
+						Integer r_Amount = entry3.getValue();
 						for (MaterialInstance materialInstance : msList) {
 							String materialName = materialInstance
 									.getMaterialName();
@@ -3510,19 +3506,16 @@
 									(amount + recyclingAmount));
 						}
 					}
-					Iterator<String> materialItr = materialMap
-							.keySet().iterator();
-					String amountStr = "";
-					while (materialItr.hasNext()) {
-						String materialName = materialItr.next();
-						Integer amount = materialMap
-								.get(materialName);
-						amountStr += amount;
-						if (materialItr.hasNext()) {
-							amountStr += "，";
+					sbf.setLength(0);
+					int i = 0;
+					for(Integer amount : materialMap.values()){
+						sbf.append(amount);
+						i++;
+						if (i < materialMap.size()) {
+							sbf.append("，");
 						}
 					}
-					obj.put("amount", amountStr);
+					obj.put("amount", sbf.toString());
 					array.add(obj);
 				}
 				vo.setValue(array.toString());