Index: ssts-web/src/main/webapp/disinfectsystem/qualitymonitoring/qualitymonitoringInstanceForm.js
===================================================================
diff -u -r41264 -r41266
--- ssts-web/src/main/webapp/disinfectsystem/qualitymonitoring/qualitymonitoringInstanceForm.js	(.../qualitymonitoringInstanceForm.js)	(revision 41264)
+++ ssts-web/src/main/webapp/disinfectsystem/qualitymonitoring/qualitymonitoringInstanceForm.js	(.../qualitymonitoringInstanceForm.js)	(revision 41266)
@@ -2175,8 +2175,9 @@
 		selectEmptyDo();
 		return;
 	}
-	Ext.Ajax.request({
+	Ext4.Ajax.request({
 		url: WWWROOT + '/disinfectSystem/formDefinitionAction!loadFormDefinition.do',
+		async: false,
 		params: { id: formId },
 		success: function (response, options) {
 			var result = Ext.decode(response.responseText);
@@ -2809,19 +2810,21 @@
 			var value = objArr[i].value;
 			var isChecked = objArr[i].isChecked;
 			var isDisable = objArr[i].isDisable;
-			if (value !== undefined) {
+			if (value !== undefined && Ext.getCmp(name)) {
 				Ext.getCmp(name).setValue(value);
 			}
-			if (isChecked == 'true') {
-				Ext.getCmp(checkName).setValue(true);
-			} else if (isChecked == 'false') {
-				Ext.getCmp(checkName).setValue(false);
+			if (Ext.getCmp(checkName)) {
+				if (isChecked == 'true') {
+					Ext.getCmp(checkName).setValue(true);
+				} else if (isChecked == 'false') {
+					Ext.getCmp(checkName).setValue(false);
+				}
+				if (isDisable == 'true' || isQualified == '是') {
+					Ext.getCmp(checkName).disable();
+				} else if (isDisable == 'false') {
+					Ext.getCmp(checkName).enable();
+				}
 			}
-			if (isDisable == 'true' || isQualified == '是') {
-				Ext.getCmp(checkName).disable();
-			} else if (isDisable == 'false') {
-				Ext.getCmp(checkName).enable();
-			}
 		}
 	}
 }
@@ -4499,17 +4502,12 @@
 			ids: ids
 		}
 	}
-	addQualityMonitoring('', '', '', washRecordId, tousseItems);
-	otherPartAddQM = true;
-	if ('全部环节' == responPartName) {
-		formDefinitionStore.baseParams.responsiblePerson = "";
-	} else {
-		formDefinitionStore.baseParams.responsiblePerson = responPartName;
-	}
-	//formDefinitionStore.load();
 	setTimeout(function () {
+		addQualityMonitoring('', '', '', washRecordId, tousseItems);
+		otherPartAddQM = true;
 		// 置空监测项
 		if (responPartName == '全部环节') {
+			formDefinitionStore.baseParams.responsiblePerson = "";
 			Ext.getCmp('formName').setValue("");
 			Ext.getCmp("formDefinitionId").setValue("");
 			Ext.getCmp("name").setValue("");
@@ -4590,6 +4588,8 @@
 					}
 				}
 			}
+		} else {
+			formDefinitionStore.baseParams.responsiblePerson = responPartName;
 		}
 		Ext.getCmp('responsibilityPart').setValue(responPartName);
 		if (isSterilizationComplete) {
@@ -4967,6 +4967,7 @@
 							Ext.getCmp("formDefinitionId").setValue(combo.getValue());
 							Ext.getCmp("name").setValue(combo.getRawValue());
 							addQualityMonitoringItem(combo.getValue(), combo.getRawValue());
+							Ext.getCmp('addQualityMonitoringForm').doLayout();
 						}
 					}
 				}]
@@ -5019,8 +5020,9 @@
 	if (id != null && id != 0 && id != '') {
 		Ext.getCmp('formName').addClass("fieldReadOnlyNoRemove");
 		Ext.getCmp('responsibilityPart').addClass("fieldReadOnlyNoRemove");
-		Ext.Ajax.request({
+		Ext4.Ajax.request({
 			url: WWWROOT + '/disinfectSystem/qualityMonitoringInstanceAction!loadQualityMonitoringInstance.do',
+			async: false,
 			params: { id: id },
 			success: function (response, options) {
 				var result = Ext.decode(response.responseText);
@@ -5141,6 +5143,7 @@
 							isDisable: 'true'
 						}]);
 						loadMaterialMsg(result.data.qualityMonitoringGoodsList);
+						Ext.getCmp('tousseInfoFieldSet').doLayout();
 					} else if ("器械包" == result.data.scope) {
 						hideFirstMaterial();
 						showFirstTousse();
@@ -5290,11 +5293,15 @@
 	} else {
 		updateId = '';
 		if (qualityMonitoringWRRecordID > 0 && (sstsConfig.hasOwnProperty('haveRinserPosition')) && sstsConfig.haveRinserPosition) {
-			Ext.getCmp('basketBarcodeC').setVisible(true);
-			Ext.getCmp('positionC').setVisible(true);
+			if (Ext.getCmp('basketBarcodeC')) {
+				Ext.getCmp('basketBarcodeC').setVisible(true);
+				Ext.getCmp('positionC').setVisible(true);
+			}
 		} else {
-			Ext.getCmp('basketBarcodeC').setVisible(false);
-			Ext.getCmp('positionC').setVisible(false);
+			if (Ext.getCmp('basketBarcodeC')) {
+				Ext.getCmp('basketBarcodeC').setVisible(false);
+				Ext.getCmp('positionC').setVisible(false);
+			}
 		}
 		setStartDate(Ext, 'yyyy/MM/dd HH:mm', 'dateTime');  //（设置抽检时间，取服务器时间 cjr）
 		disableOrEnableChecked([{
@@ -6856,6 +6863,7 @@
 		// 加载监测项对所选的项赋初值，只是从其他环节进来执行一次.
 		otherPartAddQM = false;
 	})
+	formDefinitionStore.load();
 }
 
 // 测试是否为工号，长度大于1位，小于等于6位，并且仅允许数字和字母