Index: ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java
===================================================================
diff -u -r35650 -r35755
--- ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java	(.../SterilizationRecordManagerImpl.java)	(revision 35650)
+++ ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java	(.../SterilizationRecordManagerImpl.java)	(revision 35755)
@@ -1862,26 +1862,27 @@
                 	containerNameMap.put(containerName, objs);
                 }
                 if(MapUtils.isNotEmpty(containerNameMap)){
-                	msg = "";
-                	for (String key : containerNameMap.keySet()) {
-                		JSONArray arr = containerNameMap.get(key);
+                	StringBuffer sbf = new StringBuffer();
+                	for(Entry<String, JSONArray> entry : containerNameMap.entrySet()){
+                		String key = entry.getKey();
+                		JSONArray arr = entry.getValue();
                 		for (int i = 0; i < arr.size(); i++) {
                 			JSONObject obj = (JSONObject)arr.get(i);
     						//以下物品已经被装载到灭菌篮筐1，请从灭菌记录中移除：下肢器械包B 8件0110455509，工具(3-1)0110455505
     						if(i == 0){
-    							msg += "  以下物品已经被装载到灭菌篮筐" + key + "，请从灭菌记录中移除：";
+    							sbf.append("  以下物品已经被装载到灭菌篮筐" + key + "，请从灭菌记录中移除：");
     						}else if(i == 5){
-    							msg += "......";
+    							sbf.append("......");
     							break;
     						}else{
-    							msg += "，";
+    							sbf.append("，");
     						}
-    						msg += obj.optString("tousseNameAndBarcode");
+    						sbf.append(obj.optString("tousseNameAndBarcode"));
 						}
 					}
-                	if(StringUtils.isNotBlank(msg)){
+                	if(sbf.length() > 0){
                 		 result.put(JSONUtil.JSON_KEY_SUCCESS, false);
-                         result.put(JSONUtil.JSON_KEY_MESSAGE, msg);
+                         result.put(JSONUtil.JSON_KEY_MESSAGE, sbf.toString());
                          return result;
                 	}
                 }
@@ -2352,8 +2353,8 @@
             
             if(!propMap.isEmpty()){
             	String updateSql = "";
-            	for (String key : propMap.keySet()) {
-            		updateSql = StringTools.uniteTwoStringBySemicolon(updateSql, key + "= '" + propMap.get(key) + "' ", ",");
+            	for(Entry<String, String> entry : propMap.entrySet()){
+            		updateSql = StringTools.uniteTwoStringBySemicolon(updateSql, entry.getKey() + "= '" + entry.getValue() + "' ", ",");
 				}
             	updateSql = "update TousseInstance set " + updateSql;
             	List<Long> tousseInstanceIdList = sqlToTiIdMap.get(updateSql);
@@ -2380,8 +2381,9 @@
 
         sterilizationRecord.setTousseInstanceList(whithoutBasketTousseIns);
         if(!sqlToTiIdMap.isEmpty()){
-        	for (String updateSql : sqlToTiIdMap.keySet()) {
-        		List<Long> tousseInsatnceIdList = sqlToTiIdMap.get(updateSql);
+        	for(Entry<String, List<Long>> entry : sqlToTiIdMap.entrySet()){
+        		String updateSql = entry.getKey();
+        		List<Long> tousseInsatnceIdList = entry.getValue();
         		updateSql = updateSql + " where " + SqlUtils.getNonStringFieldInLargeCollectionsPredicate("id", tousseInsatnceIdList);
         		objectDao.excuteSQL(updateSql);
 			}
@@ -5268,8 +5270,8 @@
                             if(CollectionUtils.isNotEmpty(messageList)){
                 				throw new RuntimeException("下列物品灭菌日期不是今天，" + StringUtils.join(messageList, ",") + ",不能添加到灭菌记录");
                 			}
-                            for (String str : cMap.keySet()) {
-                                tousseInstanceArr.add(cMap.get(str));
+                            for (JSONObject obj : cMap.values()) {
+                                tousseInstanceArr.add(obj);
                             }
                             //按加急等级排序（降序）
                             if(CssdUtils.getSystemSetConfigByNameBool("enableUrgentFunction",false)){
@@ -5609,9 +5611,8 @@
             }
             fixedBarcodesAndName = tousseInstanceManager.getFixedBarcodesByIds(tdIdIsTraceable);
             setFixBarcode(fixedBarcodesAndName, bMap);
-            for (String str : bMap.keySet()) {
-                JSONObject  tousseInBasket = bMap.get(str);
-                jsonArray.add(tousseInBasket);
+            for(JSONObject obj : bMap.values()){
+                jsonArray.add(obj);
             }
         }else{
         	fixedBarcodesAndName = tousseInstanceManager.getFixedBarcodesByIds(tdIdIsTraceable);
@@ -5914,10 +5915,8 @@
                     bMap.put(tousse.getBarcode(), jsonObj);  
                 }
             }
-            
-            for (String str : bMap.keySet()) {
-                JSONObject  tousseInBasket=bMap.get(str);
-                jsonArray.add(tousseInBasket);
+            for(JSONObject obj : bMap.values()){
+            	 jsonArray.add(obj);
             }
         }
         
@@ -5985,8 +5984,8 @@
                 }
             }
             jsonObj.put("amount", i);
-            for (String str : cMap.keySet()) {
-                tousseInBasketArray.add(cMap.get(str));
+            for(JSONObject obj : cMap.values()){
+            	tousseInBasketArray.add(obj);
             }
             JSONUtil.addProperty(jsonObj, JSONUtil.JSON_KEY_CHILDREN, tousseInBasketArray);
             jsonArray.add(jsonObj);
@@ -6382,12 +6381,20 @@
         		amount++;
         		tdAmountMap.put(ti.getTousseDefinitionAncestorID(), amount);
 			}
-        	for (Long ancestorID : tdAmountMap.keySet()) {
-				String updateSql = String.format("update %s set amount = (amount-%s) WHERE amount > 0 and goodsType='%s' and tousseDefinitionId = %s and orgUnitCode='%s'",
-						GoodsStock.class.getSimpleName(), tdAmountMap.get(ancestorID),
-						TousseDefinition.PACKAGE_TYPE_INSIDE, ancestorID,
-						defaultWareHouse.getOrgUnitCode());
-				objectDao.excuteSQL(updateSql);
+        	StringBuffer sbf = new StringBuffer();
+        	for(Entry<Long, Integer> entry : tdAmountMap.entrySet()){
+        		Long ancestorID = entry.getKey();
+        		sbf.setLength(0);
+        		sbf.append("update "+ GoodsStock.class.getSimpleName() +" set amount = (amount-"
+        				+ entry.getValue() 
+        				+") WHERE amount > 0 and goodsType='"
+        				+ TousseDefinition.PACKAGE_TYPE_INSIDE 
+        				+"' and tousseDefinitionId = "
+        				+ ancestorID 
+        				+" and orgUnitCode='"
+        				+ defaultWareHouse.getOrgUnitCode() 
+        				+"'");
+				objectDao.excuteSQL(sbf.toString());
 			}
         }
       //=========================2、处理篮筐 
@@ -7367,15 +7374,15 @@
 			}
 		}
 		String currentOrgUnitCode = AcegiHelper.getCurrentOrgUnitCode();
-		for (Sterilizer sterilizer : sterilizerToWaiteTimeMap.keySet()) {
+		for(Entry<Sterilizer, Long> entry : sterilizerToWaiteTimeMap.entrySet()){
+			Sterilizer sterilizer = entry.getKey();
 			if(!StringUtils.equals(currentOrgUnitCode, sterilizer.getOrgUnitCoding())){
 				continue;
 			}
-			Long minWaiteTime = sterilizerToWaiteTimeMap.get(sterilizer);
 			JSONObject json = new JSONObject();
 			json.put("sterilizerId", sterilizer.getId());
 			json.put("sterilizerName", sterilizer.getName());
-			json.put("minWaiteTime", minWaiteTime);
+			json.put("minWaiteTime", entry.getValue());
 			jsonArray.add(json);
 		}