Index: ssts-web/src/main/webapp/disinfectsystem/qualitymonitoring/qualitymonitoringInstanceForm.js
===================================================================
diff -u -r40968 -r40974
--- ssts-web/src/main/webapp/disinfectsystem/qualitymonitoring/qualitymonitoringInstanceForm.js	(.../qualitymonitoringInstanceForm.js)	(revision 40968)
+++ ssts-web/src/main/webapp/disinfectsystem/qualitymonitoring/qualitymonitoringInstanceForm.js	(.../qualitymonitoringInstanceForm.js)	(revision 40974)
@@ -594,7 +594,7 @@
 			firstTousseBagsList = [];
 		} else {
 			if (scope == '材料') {
-				for(var i=0;i<tousseBags.length;i++){
+				for (var i = 0; i < tousseBags.length; i++) {
 					firstMaterialInfos = firstMaterialInfos.concat(tousseBags[i].materialInfos)
 				}
 			}
@@ -1559,29 +1559,30 @@
 						triggerItemAction(oldTriggerItemIds, "hide");
 						triggerItemAction(valueTriggerItemIds, "show");
 						var fillQuantity = record.get("fillQuantity");
-						if(fillQuantity == '是'){
+						if (fillQuantity == '是') {
 							top.Ext.getCmp("quantityBox" + id).show();
-							top.Ext.getCmp('quantity'+id).setValue(1);
-						}else {
+							top.Ext.getCmp('quantity' + id).setValue(1);
+						} else {
 							top.Ext.getCmp("quantityBox" + id).hide();
-							top.Ext.getCmp('quantity'+id).setValue('');
+							top.Ext.getCmp('quantity' + id).setValue('');
 						}
 						top.Ext.getCmp("triggerItemIds" + id).setValue(valueTriggerItemIds);
 					}
 				}
 			}]
 		}]
-		if(sstsConfig.enableCSSDNursingQualityControlReport){
+		if (sstsConfig.enableCSSDNursingQualityControlReport) {
 			optionItems.push({
 				columnWidth: 0.08,
 				layout: 'form',
 				style: 'margin-left:2%',
-				id:'quantityBox'+id,
+				id: 'quantityBox' + id,
 				items: [{
-					xtype:'numberfield',
-					allowDecimals :false,
+					xtype: 'numberfield',
+					allowDecimals: false,
+					allowNegative: false,
 					hideLabel: true,
-					minValue:0,
+					minValue: 0,
 					anchor: '100%',
 					id: 'quantity' + id,
 					name: 'quantity' + id,
@@ -1617,20 +1618,20 @@
 		});
 		var columnWidth = 0.5;
 		var columnFormWidth = 1;
-		if(sstsConfig.enableRecordMaterialDetailsOfQualityMonitoring){
+		if (sstsConfig.enableRecordMaterialDetailsOfQualityMonitoring) {
 			columnWidth = 1;
 			columnFormWidth = 0.5;
-		}else if(sstsConfig.enableCSSDNursingQualityControlReport){
+		} else if (sstsConfig.enableCSSDNursingQualityControlReport) {
 			columnFormWidth = 0.5;
 		}
 		if (options != "") {
 			var optionsJson = JSON.parse(options);
 			var optionNames = [];
-			if(value != null && value !== ''){
+			if (value != null && value !== '') {
 				var newValue = value.substring(1);
-				newValue = '['+newValue+']';
+				newValue = '[' + newValue + ']';
 				var valueObj = JSON.parse(newValue);
-				for(var k=0;k<valueObj.length;k++){
+				for (var k = 0; k < valueObj.length; k++) {
 					optionNames.push(valueObj[k].name)
 				}
 			}
@@ -1643,7 +1644,7 @@
 				optionsArray.push({
 					layout: 'column',
 					columnWidth: columnWidth,
-					height:36,
+					height: 36,
 					items: [{
 						layout: 'form',
 						columnWidth: columnFormWidth,
@@ -1763,11 +1764,14 @@
 											}
 											if (optionValues && optionValues.length > 0) {
 												for (var i = 0; i < optionValues.length; i++) {
-													if(top.Ext.getCmp('configItemOptionQuantity' + id + optionValues[i].answer)){
+													if (top.Ext.getCmp('configItemOptionQuantity' + id + optionValues[i].answer)) {
 														top.Ext.getCmp('configItemOptionQuantity' + id + optionValues[i].answer).setValue(optionValues[i].quantity || '')
 													}
 												}
 											}
+											if (top.Ext.getCmp('configItemOptionQuantity' + id + optionsJson[filedIndex].name)) {
+												top.Ext.getCmp('configItemOptionQuantity' + id + optionsJson[filedIndex].name).setValue(1);
+											}
 										} else {
 											var newValue = oldElementValue.replace("," + thiz.getRawValue(), '');
 											elementObj.setValue(newValue);
@@ -1794,6 +1798,9 @@
 												}
 												top.Ext.getCmp('itemsFieldSet').doLayout();
 											}
+											if (top.Ext.getCmp('configItemOptionQuantity' + id + optionsJson[filedIndex].name)) {
+												top.Ext.getCmp('configItemOptionQuantity' + id + optionsJson[filedIndex].name).setValue('');
+											}
 										}
 									}
 								}
@@ -1806,14 +1813,15 @@
 						id: 'quantityBox' + id + '_' + j,
 						hidden: optionsJson[j].fillQuantity !== '是',
 						items: [{
-							xtype:'numberfield',
-							allowDecimals :false,
-							minValue:0,
+							xtype: 'numberfield',
+							allowDecimals: false,
+							allowNegative: false,
+							minValue: 0,
 							hideLabel: true,
 							anchor: '100%',
 							id: 'configItemOptionQuantity' + id + optionsJson[j].name,
 							name: 'configItemOptionQuantity' + id + optionsJson[j].name,
-							value:optionsJson[j].quantity || ''
+							value: optionsJson[j].quantity || ''
 						}]
 					}, {
 						layout: 'form',
@@ -2601,13 +2609,13 @@
 				top.Ext.getCmp('material').setValue(materialName);
 				top.Ext.getCmp('materialAmount').setValue(count);
 			} else {
-				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, "", "", "");
+				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, "", "", "");
 				}
 			}
 		}
@@ -2634,13 +2642,13 @@
 				top.Ext.getCmp('material').setValue(materialName);
 				top.Ext.getCmp('materialAmount').setValue(count);
 			} else {
-				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, "", "", "");
+				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, "", "", "");
 				}
 			}
 		}
@@ -2840,7 +2848,7 @@
 		if (responsiblePersonValue.indexOf(hiddenUser) == -1) {
 			if (responsiblePersonValue == '') {
 				responsiblePersonValue = hiddenUser;
-			}else {
+			} else {
 				responsiblePersonValue += ';' + hiddenUser;
 			}
 		}
@@ -2849,21 +2857,21 @@
 		if (responsiblePersonValue.indexOf(newResponsiblePerson) == -1) {
 			if (responsiblePersonValue == '') {
 				responsiblePersonValue = newResponsiblePerson;
-			}else {
+			} else {
 				responsiblePersonValue += ';' + newResponsiblePerson;
 			}
 		}
-		if(domId){
+		if (domId) {
 			top.Ext.getCmp(domId).setValue(responsiblePersonValue);
-		}else {
+		} else {
 			top.Ext.getCmp('responsiblePerson').setValue(responsiblePersonValue);
 		}
 	} else {
 		var responsiblePerson2 = top.Ext.getCmp('responsiblePerson').getValue();
 		if (responsiblePerson2 == '') {
-			if(domId){
+			if (domId) {
 				top.Ext.getCmp(domId).setValue(responsiblePersonValue);
-			}else {
+			} else {
 				top.Ext.getCmp('responsiblePerson').setValue(responsiblePersonValue);
 			}
 		} else {
@@ -2874,9 +2882,9 @@
 						responsiblePersonValue += ';' + arr[i];
 					}
 				}
-				if(domId){
+				if (domId) {
 					top.Ext.getCmp(domId).setValue(responsiblePersonValue);
-				}else {
+				} else {
 					top.Ext.getCmp('responsiblePerson').setValue(responsiblePersonValue);
 				}
 			}
@@ -4665,7 +4673,7 @@
 			top.Ext.getCmp('formName').setValue('');
 			top.Ext.getCmp('responsibilityPart').disable();
 		}
-		if(remarks && remarks !== '' && top.Ext.getCmp('remark')){
+		if (remarks && remarks !== '' && top.Ext.getCmp('remark')) {
 			top.Ext.getCmp('remark').setValue(remarks)
 		}
 	}, 500);