Index: ssts-web/src/main/webapp/disinfectsystem/interfere/interferewashAndDisinfectForm.js
===================================================================
diff -u -r18017 -r18026
--- ssts-web/src/main/webapp/disinfectsystem/interfere/interferewashAndDisinfectForm.js	(.../interferewashAndDisinfectForm.js)	(revision 18017)
+++ ssts-web/src/main/webapp/disinfectsystem/interfere/interferewashAndDisinfectForm.js	(.../interferewashAndDisinfectForm.js)	(revision 18026)
@@ -616,6 +616,10 @@
 							name : 'orgWashEndTime',
 							id : 'orgWashEndTime'
 						},{
+							xtype : 'hidden',
+							name : 'washRecordMsg',
+							id : 'washRecordMsg'
+						},{
 							id : 'serialNum',
 							columnWidth : 0.5,
 							layout : 'form',
@@ -1304,9 +1308,18 @@
 				washEndtimeLaterThanPacktime = result;
 			});
 	DWREngine.setAsync(true);
+	// 获取旧的清洗记录信息
+	DWREngine.setAsync(false);
+	var msg = "";
+	WashAndDisinfectRecordTableManager.getWashRecordMsg(id,
+			function(result) {
+				msg = result;
+			});
+	DWREngine.setAsync(true);
+	top.Ext.getCmp('washRecordMsg').setValue(msg);
 	if( true == washEndtimeLaterThanPacktime ){
 		// 装配时间比清洗时间晚提示
-		top.Ext.MessageBox.confirm("请确认","存在包的装配时间比清洗时间晚，确认修改？",
+		top.Ext.MessageBox.confirm("请确认","存在包的清洗时间比装配时间晚，确认修改？",
 				function(button, text) {
 			if ("no" == button){
 				return false;
@@ -1325,9 +1338,10 @@
 	var orgWashEndTime = top.Ext.getCmp('orgWashEndTime').getValue();
 	Ext.getCmp('washSaveSubmitResult').setValue("0");
 	top.Ext.getCmp("disinfectProgram").setValue(top.Ext.getCmp("disinfectProgram").getRawValue());
+	var washRecordMsg = top.Ext.getCmp('washRecordMsg').getValue();
 	formObj.form.submit({
 		url : WWWROOT + '/disinfectSystem/washAndDisinfect/washAndDisinfectRecordAction!interfereWashAndDisinfectRecord.do',
-		params : {conCurrent :conCurrent, orgWashStartTime : orgWashStartTime, orgWashEndTime : orgWashEndTime,isInterfere : true},
+		params : {conCurrent :conCurrent, orgWashStartTime : orgWashStartTime, orgWashEndTime : orgWashEndTime,washRecordMsg : washRecordMsg},
 		method : 'POST',
 		waitMsg : '正在保存数据，请稍候',
 		waitTitle : '提交表单',
Index: ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/dwr/table/WashAndDisinfectRecordTableManager.java
===================================================================
diff -u -r18018 -r18026
--- ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/dwr/table/WashAndDisinfectRecordTableManager.java	(.../WashAndDisinfectRecordTableManager.java)	(revision 18018)
+++ ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/dwr/table/WashAndDisinfectRecordTableManager.java	(.../WashAndDisinfectRecordTableManager.java)	(revision 18026)
@@ -124,7 +124,15 @@
 		return gridManager.renderGrid(parameterMap, WashAndDisinfectRecord.class
 				.getSimpleName(), sql, new String[] {"classifyBaskets","washAndDisinfectMaterials"});
 	}
-	
+	public String getWashRecordMsg(String washAndDisinfectRecordId){
+		if(StringUtils.isNotBlank(washAndDisinfectRecordId)){
+			WashAndDisinfectRecord wr = washAndDisinfectRecordManager.getWashAndDisinfectRecordById(washAndDisinfectRecordId);
+			if(wr != null){
+				return washAndDisinfectRecordManager.getWRRecordMsg(wr).toString();
+			}
+		}
+		return "";
+	}
 	public int getNextCycleCounter(String rinserName)
 	{
 		return washAndDisinfectRecordManager.getNextCycleCounter(rinserName);
Index: ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/action/WashAndDisinfectRecordAction.java
===================================================================
diff -u -r18018 -r18026
--- ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/action/WashAndDisinfectRecordAction.java	(.../WashAndDisinfectRecordAction.java)	(revision 18018)
+++ ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/action/WashAndDisinfectRecordAction.java	(.../WashAndDisinfectRecordAction.java)	(revision 18026)
@@ -128,7 +128,7 @@
 			String message = JSONUtil.buildJsonObject(false, "干预失败，添加或删除篮筐存在装配的包实例！").toString();
 			StrutsResponseUtils.output(message);
 		}else{
-			String oldRecordMsg = washAndDisinfectRecordManager.getWRRecordMsg(washAndDisinfectRecord).toString();
+			String oldRecordMsg = StrutsParamUtils.getRequest().getParameter("washRecordMsg");
 			saveWashAndDisinfectRecord();
 			String newRecordMsg = washAndDisinfectRecordManager.getWRRecordMsg(washAndDisinfectRecord).toString();
 			//写干预成功的日志信息