Index: ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/dwr/table/WashAndDisinfectRecordTableManager.java
===================================================================
diff -u -r18026 -r18068
--- ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/dwr/table/WashAndDisinfectRecordTableManager.java	(.../WashAndDisinfectRecordTableManager.java)	(revision 18026)
+++ ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/dwr/table/WashAndDisinfectRecordTableManager.java	(.../WashAndDisinfectRecordTableManager.java)	(revision 18068)
@@ -4,6 +4,8 @@
 import java.util.List;
 import java.util.Map;
 
+import net.sf.json.JSONObject;
+
 import org.apache.commons.collections.Closure;
 import org.apache.commons.lang.StringUtils;
 
@@ -142,6 +144,31 @@
 	{
 		return rinserManager.isDefineDeviceInterface(rinserName);
 	}
+	// 获取默认清洗程序信息
+	public String getDefaultWashMethodMsg(String rinserName)
+	{
+		JSONObject obj = new JSONObject();
+		Rinser rinser = rinserManager.getRinserByName(rinserName);
+		if(rinser != null){
+			obj.put("success", true);
+			String cleanMethod = rinser.getDefaultWashMethod();
+			obj.put("disinfectProgram", cleanMethod);
+			obj.put("cleanParameter", "");
+			obj.put("cleanMinutes", "");
+			if(StringUtils.isNotBlank(cleanMethod)){
+				CleanMethod cm = cleanMethodManager.getCleanMethodByName(cleanMethod);
+				if(cm != null){
+					obj.put("cleanParameter", cm.getCleanParameter());
+					obj.put("cleanMinutes", cm.getCleanMinutes());
+				}
+			}
+		}else{
+			obj.put("success", false);
+		}
+		
+		return obj.toString();
+	}
+	
 	/**
 	 * 是否有清洗机需要确认完成
 	 * @return
Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/rinser/Rinser.java
===================================================================
diff -u -r18009 -r18068
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/rinser/Rinser.java	(.../Rinser.java)	(revision 18009)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/rinser/Rinser.java	(.../Rinser.java)	(revision 18068)
@@ -91,7 +91,10 @@
 	private String contact;
 	
 	private String conCurrent = "禁止"; //同一台清洗机未清洗完成能否时间重叠，默认禁止
-
+	/**
+	 * 默认清洗程序
+	 */
+	private String defaultWashMethod;
 	//清洗程序
 	private Set<CleanMethod> cleanMethods = new HashSet<CleanMethod>();
 	
@@ -139,7 +142,15 @@
 		}
 		return "";
 	}
+	
+	public String getDefaultWashMethod() {
+		return defaultWashMethod;
+	}
 
+	public void setDefaultWashMethod(String defaultWashMethod) {
+		this.defaultWashMethod = defaultWashMethod;
+	}
+
 	public void setDeviceInterfaceName(String deviceInterfaceName) {
 		this.deviceInterfaceName = deviceInterfaceName;
 	}
Index: ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washAndDisinfectForm.js
===================================================================
diff -u -r18019 -r18068
--- ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washAndDisinfectForm.js	(.../washAndDisinfectForm.js)	(revision 18019)
+++ ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washAndDisinfectForm.js	(.../washAndDisinfectForm.js)	(revision 18068)
@@ -805,6 +805,18 @@
 													top.Ext.getCmp('cycleCounterId').show();
 												}
 											});
+											// 获取默认清洗程序信息，包括清洗程序的时间，清洗程序参数等
+											WashAndDisinfectRecordTableManager.getDefaultWashMethodMsg(value,function(responseText){
+												var result = top.Ext.decode(responseText);
+										        if(result.success){
+										        	// 清洗程序名称
+										        	top.Ext.getCmp('disinfectProgram').setValue(result.disinfectProgram);
+										        	// 清洗时间,单位为分钟
+										        	setEndDateAddCleanMinutes(result.cleanMinutes);
+										        	// 清洗参数
+										        	top.Ext.getCmp('cleanParameter').setValue(result.cleanParameter);
+										        }
+											});
 											DWREngine.setAsync(true);
 //										}
 									}
Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/rinser/rinserForm.js
===================================================================
diff -u -r17268 -r18068
--- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/rinser/rinserForm.js	(.../rinserForm.js)	(revision 17268)
+++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/rinser/rinserForm.js	(.../rinserForm.js)	(revision 18068)
@@ -398,6 +398,20 @@
 				 	mode : 'local',
 				 	triggerAction : 'all',
 				 	anchor : '95%'
+				 },{
+				 	xtype : 'combo',
+				 	fieldLabel : '默认清洗程序',
+				 	allowBlank : true,
+				 	name : 'defaultWashMethod',
+				 	id : 'defaultWashMethod',
+				 	valueField : 'cleanMethod',
+				 	displayField : 'cleanMethod',
+				 	forceSelection : false,
+				 	editable : true,
+				 	store : configStore,
+				 	mode : 'local',
+				 	triggerAction : 'all',
+				 	anchor : '95%'
 				 }]
 			}, {
 				columnWidth : 0.5,
@@ -408,7 +422,7 @@
 					store : configStore,
 					cm : cm,
 					width : 200,
-					height: 340,
+					height: 360,
 					frame : false,
 					viewConfig: {
 			            forceFit:true