Index: ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washAndDisinfectForm.js
===================================================================
diff -u -r36571 -r38298
--- ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washAndDisinfectForm.js	(.../washAndDisinfectForm.js)	(revision 36571)
+++ ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washAndDisinfectForm.js	(.../washAndDisinfectForm.js)	(revision 38298)
@@ -598,11 +598,16 @@
 
 
 function showFrequency(barcode, isRetrospectTousse) {
+	var disinfectIdentification = top.Ext.getCmp('disinfectIdentification').getValue();
+	var params = {
+		barcode: barcode
+	}
+	if(disinfectIdentification !== ''){
+		params.rinserName = disinfectIdentification
+	}
 	Ext.Ajax.request({
 		url: WWWROOT + '/disinfectSystem/washAndDisinfect/washAndDisinfectRecordAction!getWashingFrequencyOfBasket.do',
-		params: {
-			barcode: barcode
-		},
+		params: params,
 		success: function (response, options) {
 			var result = response.responseText;
 			if (!isRetrospectTousse) {
@@ -616,7 +621,9 @@
 						resultTail = ",已进行手工清洗！";
 					}
 				}
-				showResult("此篮筐为第" + result + "次清洗" + resultTail);
+				if(result !== 0){
+					showResult("此篮筐为第" + result + "次清洗" + resultTail);
+				}
 			} else {
 				showResult("此条码为器械包固定条码！");
 			}
Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/rinser/rinserForm.js
===================================================================
diff -u -r38135 -r38298
--- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/rinser/rinserForm.js	(.../rinserForm.js)	(revision 38135)
+++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/rinser/rinserForm.js	(.../rinserForm.js)	(revision 38298)
@@ -496,6 +496,41 @@
 						}
 					} 
 				 },{
+					columnWidth : 0.5,
+					layout : 'form',
+					hidden:!sstsConfig.enablesThePurposePropertyOfRinser,
+					items:[{
+						xtype : 'combo',
+						fieldLabel : "用途",
+						store : new Ext.data.SimpleStore({
+							fields : ['value'],
+							data : [['清洗'],['吹干']]
+						}),
+						valueField : 'value',
+						displayField : 'value',
+						mode : 'local',
+						value:'清洗',
+						forceSelection : true,
+						allowBlank : true,
+						triggerAction : 'all',
+						name : "purpose",
+						id : "purpose",
+						anchor : '95%',
+						editable : false,
+						listeners:{
+							select:function(combo, record, index){
+								var value = record.data.value;
+								if(value == '清洗'){
+									top.Ext.getCmp('defaultWashMethodBox').show();
+									top.Ext.getCmp('isManualCleanBox').show();
+								}else {
+									top.Ext.getCmp('defaultWashMethodBox').hide();
+									top.Ext.getCmp('isManualCleanBox').hide();
+								}
+							}
+						} 
+					}]
+				},{
 					xtype : 'combo',
 					fieldLabel : '是否清洗时间结束后装配',
 					name : 'isPackingAfterWashTimeEnd',
@@ -538,35 +573,45 @@
 						}
 					}]
 				},{
-				 	xtype : 'combo',
-				 	fieldLabel : '默认清洗程序',
-				 	allowBlank : true,
-				 	name : 'defaultWashMethod',
-				 	id : 'defaultWashMethod',
-				 	valueField : 'cleanMethod',
-				 	displayField : 'cleanMethod',
-				 	forceSelection : false,
-				 	editable : false,
-				 	store : configStore,
-				 	mode : 'local',
-				 	triggerAction : 'all',
-				 	anchor : '95%'
+					columnWidth : 0.5,
+					layout : 'form',
+					id:'defaultWashMethodBox',
+					items:[{
+						xtype : 'combo',
+						fieldLabel : '默认清洗程序',
+						allowBlank : true,
+						name : 'defaultWashMethod',
+						id : 'defaultWashMethod',
+						valueField : 'cleanMethod',
+						displayField : 'cleanMethod',
+						forceSelection : false,
+						editable : false,
+						store : configStore,
+						mode : 'local',
+						triggerAction : 'all',
+						anchor : '95%'
+					}]
 				 },{
-				 	xtype : 'combo',
-				 	fieldLabel : '手工清洗机',
-				 	name : 'isManualClean',
-				 	id : 'isManualClean',
-				 	valueField : 'value',
-				 	displayField : 'value',
-				 	forceSelection : true,
-				 	editable : false,
-				 	store : yesNoStore,
-				 	mode : 'local',
-					triggerAction : 'all',
-				 	anchor : '95%'
-				},{
 					columnWidth : 0.5,
 					layout : 'form',
+					id:'isManualCleanBox',
+					items:[{
+						xtype : 'combo',
+						fieldLabel : '手工清洗机',
+						name : 'isManualClean',
+						id : 'isManualClean',
+						valueField : 'value',
+						displayField : 'value',
+						forceSelection : true,
+						editable : false,
+						store : yesNoStore,
+						mode : 'local',
+						triggerAction : 'all',
+						anchor : '95%'
+					}]
+				 },{
+					columnWidth : 0.5,
+					layout : 'form',
 					labelWidth : 80,
 					hidden:!sstsConfig.enablePromptUploadDeviceParameterPicture,
 					items:[{
@@ -791,6 +836,12 @@
 							top.Ext.getCmp('orgUnitIds').setValue(action.result.data.orgUnitIds);
 						}
 					}
+					if(sstsConfig.enablesThePurposePropertyOfRinser){
+						if(action.result.data.purpose == '吹干'){
+							top.Ext.getCmp('defaultWashMethodBox').hide();
+							top.Ext.getCmp('isManualCleanBox').hide();
+						}
+					}
 				}else{
 					foldersCompanyJsonStore.load();
 					departmentJsonStore.load();
Index: ssts-web/src/main/webapp/disinfectsystem/config/zsyy/config.js
===================================================================
diff -u -r38271 -r38298
--- ssts-web/src/main/webapp/disinfectsystem/config/zsyy/config.js	(.../config.js)	(revision 38271)
+++ ssts-web/src/main/webapp/disinfectsystem/config/zsyy/config.js	(.../config.js)	(revision 38298)
@@ -347,6 +347,8 @@
 doNotNeedValidateOperationRoomToShowInOperationReservationList:true,
    //启用灭菌交接单转换代理灭菌单的功能
   enableSterilizationTransitionFormToProxyDisinfection:true,
+  //清洗机启用用途属性
+  enablesThePurposePropertyOfRinser:true,
   //外来器械包申请单扩展列
   extendedColumnConfigOfForeignTousseApplicationForm:["packingState", "sterilizationState"]