Index: ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washAndDisinfectForm.js
===================================================================
diff -u -r33860 -r33886
--- ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washAndDisinfectForm.js	(.../washAndDisinfectForm.js)	(revision 33860)
+++ ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washAndDisinfectForm.js	(.../washAndDisinfectForm.js)	(revision 33886)
@@ -419,7 +419,7 @@
 										number: 1
 									}
 
-									openModalWindowForExt(WWWROOT + "/disinfectsystem/touchScreen/recycle/tousseImage.jsp", params, '器械包图片', 1110, 600,99999);
+									openModalWindowForExt(WWWROOT + "/disinfectsystem/touchScreen/recycle/tousseImage.jsp", params, '器械包图片', 1110, 600, 99999);
 								}
 							}
 						});
@@ -1910,38 +1910,18 @@
 
 	var disinfectProgram = top.Ext.getCmp("disinfectProgram").getRawValue();
 	var classifyBasketInfo = top.Ext.getCmp("classifyBasketInfo").getRawValue();
+	var validateDisinfectProgram = '否';
 
-	if(sstsConfig.enableValidationOfDisinfectProgram && !isStopSave){
-		Ext.Ajax.request({
-			url: WWWROOT + '/disinfectSystem/washAndDisinfect/washAndDisinfectRecordAction!validateDisinfectProgram.do',
-			params: {
-				disinfectProgram: disinfectProgram,
-				classifyBasketInfo: classifyBasketInfo
-			},
-			success: function (response, options) {
-				var result = Ext.decode(response.responseText);
-				if(result.success){
-					doSubmit(true);
-				}else {
-					top.Ext.MessageBox.confirm("请确认", result.msg,function (button, text) {
-						if ("no" == button) {
-							return false;
-						} else {
-							doSubmit(true);
-						}
-					});
-				}
-			}
-		});
-		return;
+	if (sstsConfig.enableValidationOfDisinfectProgram && !isStopSave) {
+		validateDisinfectProgram = '是';
 	}
 
 
 	Ext.getCmp('washSaveSubmitResult').setValue("0");
 	top.Ext.getCmp("disinfectProgram").setValue(disinfectProgram);
 	formObj.form.submit({
 		url: WWWROOT + '/disinfectSystem/washAndDisinfect/washAndDisinfectRecordAction!saveWashAndDisinfectRecord.do',
-		params: { conCurrent: conCurrent, orgWashStartTime: orgWashStartTime, orgWashEndTime: orgWashEndTime, washPersonInCharge: washPersonInCharge, washPersonInChargeCode: washPersonInChargeCode },
+		params: { conCurrent: conCurrent, orgWashStartTime: orgWashStartTime, orgWashEndTime: orgWashEndTime, washPersonInCharge: washPersonInCharge, washPersonInChargeCode: washPersonInChargeCode, validateDisinfectProgram: validateDisinfectProgram },
 		method: 'POST',
 		waitMsg: '正在保存数据，请稍候',
 		waitTitle: '提交表单',
@@ -1961,6 +1941,16 @@
 			oldPersonCode = null;
 		},
 		failure: function (form, action) {
+			if (action.result.cleanMethodNotTheSame) {
+				top.Ext.MessageBox.confirm("请确认", action.result.msg, function (button, text) {
+					if ("no" == button) {
+						return false;
+					} else {
+						doSubmit(true);
+					}
+				});
+				return;
+			}
 			showResult(action.result.message);
 			Ext.getCmp('washSaveSubmitResult').setValue("-1");
 			top.Ext.getCmp("saveBtn").enable();