Index: ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washAndDisinfectForm.js
===================================================================
diff -u -r33856 -r33860
--- ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washAndDisinfectForm.js	(.../washAndDisinfectForm.js)	(revision 33856)
+++ ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washAndDisinfectForm.js	(.../washAndDisinfectForm.js)	(revision 33860)
@@ -1893,7 +1893,7 @@
 		doSubmit();
 	}
 }
-function doSubmit() {
+function doSubmit(isStopSave) {
 	var conCurrent = top.Ext.getCmp("conCurrent").getValue();
 	var orgWashStartTime = top.Ext.getCmp('orgWashStartTime').getValue();
 	var orgWashEndTime = top.Ext.getCmp('orgWashEndTime').getValue();
@@ -1908,9 +1908,37 @@
 		var washPersonInChargeCode = top.Ext.getCmp('personInChargeCode').getValue();
 	}
 
+	var disinfectProgram = top.Ext.getCmp("disinfectProgram").getRawValue();
+	var classifyBasketInfo = top.Ext.getCmp("classifyBasketInfo").getRawValue();
 
+	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;
+	}
+
+
 	Ext.getCmp('washSaveSubmitResult').setValue("0");
-	top.Ext.getCmp("disinfectProgram").setValue(top.Ext.getCmp("disinfectProgram").getRawValue());
+	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 },
Index: ssts-web/src/main/webapp/disinfectsystem/config/dgsetyy/config.js
===================================================================
diff -u -r33797 -r33860
--- ssts-web/src/main/webapp/disinfectsystem/config/dgsetyy/config.js	(.../config.js)	(revision 33797)
+++ ssts-web/src/main/webapp/disinfectsystem/config/dgsetyy/config.js	(.../config.js)	(revision 33860)
@@ -243,6 +243,8 @@
   closeFormDefinition:false,
   //设备维护功能自定义
   isDeviceMaintenanceCus:true,
+  //启用清洗程序的符合性检查
+  enableValidationOfDisinfectProgram:true,
   //PDA快速回收
   enableQuickRecycleInUseRecordWithPDA:true
 }
\ No newline at end of file