Index: ssts-web/src/main/webapp/disinfectsystem/qualitymonitoring/qualitymonitoringInstanceForm.js
===================================================================
diff -u -r40816 -r40818
--- ssts-web/src/main/webapp/disinfectsystem/qualitymonitoring/qualitymonitoringInstanceForm.js	(.../qualitymonitoringInstanceForm.js)	(revision 40816)
+++ ssts-web/src/main/webapp/disinfectsystem/qualitymonitoring/qualitymonitoringInstanceForm.js	(.../qualitymonitoringInstanceForm.js)	(revision 40818)
@@ -2517,7 +2517,7 @@
 			return;
 		}
 		if (isUndefinedOrNullOrEmpty(tousseName)) {
-			materialCountRecords = null;
+			materialCountRecords = [];
 		}
 
 		for (var i = 0; i < materialCountRecords.length; i++) {
@@ -2528,7 +2528,14 @@
 				top.Ext.getCmp('material').setValue(materialName);
 				top.Ext.getCmp('materialAmount').setValue(count);
 			} else {
-				addExtractCheckMaterial(false, materialName, count, "", "", false, "", i,"", "", 1, "", "", "");
+				if(top.Ext.getCmp('material_'+i) && top.Ext.getCmp('materialAmount'+i)){
+					top.Ext.getCmp('materialC'+i).setVisible(true);
+					top.Ext.getCmp('materialAmountC'+i).setVisible(true);
+					top.Ext.getCmp('material_'+i).setValue(materialName);
+					top.Ext.getCmp('materialAmount'+i).setValue(count);
+				}else {
+					addExtractCheckMaterial(false, materialName, count, "", "", false, "", i,"", "", 1, "", "", "");
+				}
 			}
 		}
 	}
@@ -2544,7 +2551,7 @@
 			return;
 		}
 		if (isUndefinedOrNullOrEmpty(tousseName)) {
-			materialMsg = null;
+			materialMsg = [];
 		}
 		for (var i = 0; i < materialMsg.length; i++) {
 			var materialName = materialMsg[i].materialName;
@@ -2554,7 +2561,14 @@
 				top.Ext.getCmp('material').setValue(materialName);
 				top.Ext.getCmp('materialAmount').setValue(count);
 			} else {
-				addExtractCheckMaterial(false, materialName, count, "", "", false, "", i,"", "", 1, "", "", "");
+				if(top.Ext.getCmp('material_'+i) && top.Ext.getCmp('materialAmount'+i)){
+					top.Ext.getCmp('materialC'+i).setVisible(true);
+					top.Ext.getCmp('materialAmountC'+i).setVisible(true);
+					top.Ext.getCmp('material_'+i).setValue(materialName);
+					top.Ext.getCmp('materialAmount'+i).setValue(count);
+				}else {
+					addExtractCheckMaterial(false, materialName, count, "", "", false, "", i,"", "", 1, "", "", "");
+				}
 			}
 		}
 	}
@@ -3358,7 +3372,7 @@
 				getTousseInstanceNameAndResponsiblePerson(barcode, newTousseItems[0].data['tousseDefinition.id'], materialDefinitionStore, true, tousseItemCount);
 			}
 		}
-		newTousseItems = [];
+		//newTousseItems = [];
 	} else {
 		if (top.Ext.getCmp('tousseDefinitionId').getValue() != "") {
 			top.Ext.getCmp('tousseDefinitionId').setValue("");