Index: ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManager.java
===================================================================
diff -u -r21855 -r21856
--- ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManager.java	(.../SterilizationRecordManager.java)	(revision 21855)
+++ ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManager.java	(.../SterilizationRecordManager.java)	(revision 21856)
@@ -5,10 +5,12 @@
 import java.util.List;
 import java.util.Map;
 
+import net.sf.json.JSONArray;
 import net.sf.json.JSONObject;
 
 import com.forgon.disinfectsystem.entity.basedatamanager.sterilizer.Sterilizer;
 import com.forgon.disinfectsystem.entity.basedatamanager.toussedefinition.TousseInstance;
+import com.forgon.disinfectsystem.entity.packing.ReviewedBasket;
 import com.forgon.disinfectsystem.entity.sterilizationmanager.sterilizationrecord.SterilizationInterruptRecord;
 import com.forgon.disinfectsystem.entity.sterilizationmanager.sterilizationrecord.SterilizationRecord;
 import com.forgon.disinfectsystem.entity.sterilizationmanager.sterilizationrecord.SterilizationRecordPic;
@@ -28,6 +30,14 @@
 	public void saveOrUpdate(SterilizationRecord sterilizationRecord);
 	
 	/**
+	 * 加载灭菌物品列表
+	 * @param tousseInstanceList 没入篮筐的器械包
+	 * @param reviewedBasketList 容器
+	 * @return
+	 */
+	public JSONArray loadSterilizationGoods(List<TousseInstance> tousseInstanceList,List<ReviewedBasket> reviewedBasketList);
+	
+	/**
 	 * 更新旧的灭菌记录 有时器械包在灭菌后不合格需要重新灭菌，并非该炉灭菌失败，而是某几个器械包需要重新灭菌
 	 * 这时需要将这些器械包重新扫入灭菌记录中，并用新的灭菌记录覆盖旧的灭菌记录.
 	 * @param tousseInstance
Index: ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/action/SterilizationRecordAction.java
===================================================================
diff -u -r21832 -r21856
--- ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/action/SterilizationRecordAction.java	(.../SterilizationRecordAction.java)	(revision 21832)
+++ ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/action/SterilizationRecordAction.java	(.../SterilizationRecordAction.java)	(revision 21856)
@@ -407,75 +407,12 @@
 	 * @return
 	 */
 	public String loadSterilizationGoods() {
-		JSONArray jsonArray = new JSONArray();
-		// 没入篮筐的器械包
-		List<TousseInstance> tousseInstanceList = sterilizationRecord.getTousseInstanceList();
-		if(CollectionUtils.isNotEmpty(tousseInstanceList)){
-			for (TousseInstance tousse : tousseInstanceList) {
-				//如果为聚合包内的包实例,则过滤掉
-				if(tousse.getComboTousseInstanceId() != null){
-					continue;
-				}
-				String tousseName = tousse.getTousseName();
-				JSONObject jsonObj = new JSONObject();
-				jsonObj.put("isParentNode", true);
-				jsonObj.put("barcode", tousse.getBarcode());
-				jsonObj.put("name", tousseName);
-				jsonObj.put("typeForSterilizationStatistics", getTypeForSterilizationStatistics(tousse));
-				jsonObj.put("depart", StringUtils.defaultString(tousse.getDepart(), ""));
-				jsonObj.put("type", "器械包");
-				jsonObj.put("position", tousse.getSterilizerPosition());
-				jsonObj.put("amount", 1);
-				jsonObj.put("uiProvider", "col");
-				jsonObj.put("iconCls", "task");
-				jsonObj.put("leaf", true);
-				jsonArray.add(jsonObj);
-			}
-		}
-		// 容器
-		List<ReviewedBasket> reviewedBasketList = sterilizationRecord.getReviewedBaskets();
-		for (ReviewedBasket reviewedBasket : reviewedBasketList) {
-			try {
-				Set<TousseInstance> tousseInstanceList2 = reviewedBasket.getTousseInstances(objectDao);
-				
-				JSONObject jsonObj = new JSONObject();
-				jsonObj.put("isParentNode", true);
-				jsonObj.put("barcode", reviewedBasket.getContainer().getBarcode());
-				jsonObj.put("name", reviewedBasket.getContainer().getContainerName());
-				jsonObj.put("type", "篮筐");
-				jsonObj.put("position", reviewedBasket.getSterilizerPosition());
-				jsonObj.put("amount", 1);
-				jsonObj.put("uiProvider", "col");
-				jsonObj.put("iconCls", "task-folder");
-				
-				JSONArray tousseInBasketArray = new JSONArray();
-				List<TousseInstance> tousseInstanceResultList = new ArrayList<TousseInstance>();
-				tousseInstanceResultList.addAll(tousseInstanceList2);
-				Collections.sort(tousseInstanceResultList);
-				for (TousseInstance tousseInstance : tousseInstanceResultList) {
-					// 外来器械包去掉下划线ID
-					String tousseName = tousseInstance.getTousseName();
-					JSONObject tousseObj = new JSONObject();
-					tousseObj.put("isParentNode", false);
-					tousseObj.put("barcode", tousseInstance.getBarcode());
-					tousseObj.put("name", tousseName);
-					tousseObj.put("typeForSterilizationStatistics", getTypeForSterilizationStatistics(tousseInstance));
-					tousseObj.put("depart", StringUtils.defaultString(tousseInstance.getDepart(), ""));
-					tousseObj.put("type", "器械包");
-					tousseObj.put("amount", 1);
-					tousseObj.put("uiProvider", "col");
-					tousseObj.put("leaf", true);
-					tousseObj.put("iconCls", "task");
-					tousseInBasketArray.add(tousseObj);
-				}
-				jsonObj.put("children", tousseInBasketArray);
-				jsonArray.add(jsonObj);
-
-			} catch (Exception e) {
-				e.printStackTrace();
-			}
-		}
-		StrutsResponseUtils.output(jsonArray);
+	    // 没入篮筐的器械包
+	    List<TousseInstance> tousseInstanceList = sterilizationRecord.getTousseInstanceList();
+	    // 容器
+	    List<ReviewedBasket> reviewedBasketList = sterilizationRecord.getReviewedBaskets();
+	    
+	    StrutsResponseUtils.output(sterilizationRecordManager.loadSterilizationGoods(tousseInstanceList,reviewedBasketList));
 		return null;
 	}
 
@@ -684,9 +621,7 @@
 		String finalBarcodes ="";
 		String str = savedBarcodes==""?"":";";
 		finalBarcodes = savedBarcodes+str+myBarcodes;
-		System.out.println("=="+finalBarcodes);
 		
-		
 		JSONObject jsonObj = new JSONObject();
 		if (StringUtils.isNotBlank(barcodeStr)) {
 		    StrutsResponseUtils.output(sterilizationRecordManager.loadTousseInstanceInfo(barcodeStr,finalBarcodes));
Index: ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java
===================================================================
diff -u -r21855 -r21856
--- ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java	(.../SterilizationRecordManagerImpl.java)	(revision 21855)
+++ ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/sterilizationrecord/service/SterilizationRecordManagerImpl.java	(.../SterilizationRecordManagerImpl.java)	(revision 21856)
@@ -3038,4 +3038,81 @@
                 + "reviewTime >= convert(datetime,'"+todayStr+" 00:00:00',120) and reviewTime <= convert(datetime,'"+todayStr+" 23:59:59',120)";
         return 0;
     }
+
+    /**
+     * 加载灭菌物品列表
+     * @param tousseInstanceList 没入篮筐的器械包
+     * @param reviewedBasketList 容器
+     * @return
+     */
+    @Override
+    public JSONArray loadSterilizationGoods(List<TousseInstance> tousseInstanceList,List<ReviewedBasket> reviewedBasketList) {
+        JSONArray jsonArray = new JSONArray();
+        // 没入篮筐的器械包
+        if(CollectionUtils.isNotEmpty(tousseInstanceList)){
+            for (TousseInstance tousse : tousseInstanceList) {
+                //如果为聚合包内的包实例,则过滤掉
+                if(tousse.getComboTousseInstanceId() != null){
+                    continue;
+                }
+                String tousseName = tousse.getTousseName();
+                JSONObject jsonObj = new JSONObject();
+                jsonObj.put("isParentNode", true);
+                jsonObj.put("barcode", tousse.getBarcode());
+                jsonObj.put("name", tousseName);
+                jsonObj.put("typeForSterilizationStatistics", getTypeForSterilizationStatistics(tousse));
+                jsonObj.put("depart", StringUtils.defaultString(tousse.getDepart(), ""));
+                jsonObj.put("type", "器械包");
+                jsonObj.put("position", tousse.getSterilizerPosition());
+                jsonObj.put("amount", 1);
+                jsonObj.put("uiProvider", "col");
+                jsonObj.put("iconCls", "task");
+                jsonObj.put("leaf", true);
+                jsonArray.add(jsonObj);
+            }
+        }
+        // 容器
+        for (ReviewedBasket reviewedBasket : reviewedBasketList) {
+            try {
+                Set<TousseInstance> tousseInstanceList2 = reviewedBasket.getTousseInstances(objectDao);
+                
+                JSONObject jsonObj = new JSONObject();
+                jsonObj.put("isParentNode", true);
+                jsonObj.put("barcode", reviewedBasket.getContainer().getBarcode());
+                jsonObj.put("name", reviewedBasket.getContainer().getContainerName());
+                jsonObj.put("type", "篮筐");
+                jsonObj.put("position", reviewedBasket.getSterilizerPosition());
+                jsonObj.put("amount", 1);
+                jsonObj.put("uiProvider", "col");
+                jsonObj.put("iconCls", "task-folder");
+                
+                JSONArray tousseInBasketArray = new JSONArray();
+                List<TousseInstance> tousseInstanceResultList = new ArrayList<TousseInstance>();
+                tousseInstanceResultList.addAll(tousseInstanceList2);
+                Collections.sort(tousseInstanceResultList);
+                for (TousseInstance tousseInstance : tousseInstanceResultList) {
+                    // 外来器械包去掉下划线ID
+                    String tousseName = tousseInstance.getTousseName();
+                    JSONObject tousseObj = new JSONObject();
+                    tousseObj.put("isParentNode", false);
+                    tousseObj.put("barcode", tousseInstance.getBarcode());
+                    tousseObj.put("name", tousseName);
+                    tousseObj.put("typeForSterilizationStatistics", getTypeForSterilizationStatistics(tousseInstance));
+                    tousseObj.put("depart", StringUtils.defaultString(tousseInstance.getDepart(), ""));
+                    tousseObj.put("type", "器械包");
+                    tousseObj.put("amount", 1);
+                    tousseObj.put("uiProvider", "col");
+                    tousseObj.put("leaf", true);
+                    tousseObj.put("iconCls", "task");
+                    tousseInBasketArray.add(tousseObj);
+                }
+                jsonObj.put("children", tousseInBasketArray);
+                jsonArray.add(jsonObj);
+
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+        }
+        return jsonArray;
+    }
 }