Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/disinfectionTousseItems.jsp
===================================================================
diff -u -r26276 -r26286
--- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/disinfectionTousseItems.jsp	(.../disinfectionTousseItems.jsp)	(revision 26276)
+++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/disinfectionTousseItems.jsp	(.../disinfectionTousseItems.jsp)	(revision 26286)
@@ -62,18 +62,17 @@
 
 var btSave=false;
 function submit(){
-	var materialItems = null;
+	var materialItems = [];
     $("#materialItemsTable").children().first().children().each(function(i,element){
-        if(materialItems == null){
-        	materialItems = '[{"materialId":' + $('#materialDefinitionId'+i).val()+',"materialName":"'+$('#materialName'+i).text() + '"';
-        }else{
-        	materialItems += ',{"materialId":' + $('#materialDefinitionId'+i).val()+',"materialName":"'+$('#materialName'+i).text() + '"';
-        }
-        materialItems += ',"count":' + $('#count'+i).text() + '}';
+    	var materialItem = {};
+    	materialItem.materialId = $('#materialDefinitionId'+i).val();
+    	materialItem.materialName = $('#materialName'+i).text();
+    	materialItem.count = $('#count'+i).text();
+    	materialItems.push(materialItem);
     });
-    materialItems += ']';
-    var materialItemsJson = JSON.parse(materialItems);
-    window.parent.createMaterialInfo(materialItemsJson,row);
+    if(window.parent){
+    	window.parent.createMaterialInfo(materialItems,row);
+    }
     alert('修改成功。');
 	closeLayer();
 }
Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/toussedefinition/service/TousseInstanceUtils.java
===================================================================
diff -u -r26283 -r26286
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/toussedefinition/service/TousseInstanceUtils.java	(.../TousseInstanceUtils.java)	(revision 26283)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/toussedefinition/service/TousseInstanceUtils.java	(.../TousseInstanceUtils.java)	(revision 26286)
@@ -131,7 +131,7 @@
 				timeType = "审核时间";
 				break;
 			case TousseInstance.STATUS_STERILED:
-				timeType = "菌结束时间";
+				timeType = "灭菌结束时间";
 				break;
 			case TousseInstance.STATUS_SHIPPED:
 				timeType = "发货时间";