Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/tousseBatchModify.js
===================================================================
diff -u -r38228 -r39845
--- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/tousseBatchModify.js	(.../tousseBatchModify.js)	(revision 38228)
+++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/tousseBatchModify.js	(.../tousseBatchModify.js)	(revision 39845)
@@ -617,6 +617,43 @@
 						triggerClass: 'x-form-search-trigger',
 						anchor: '100%'
 					}]
+                },{
+                    columnWidth: 1,
+                    layout: 'form',
+                    labelWidth: fontSize == 12 ? 90 : 120,
+                    labelAlign: "right",
+                    hidden: !sstsConfig.enableAvailableWashProgramsOfTousseFunction,
+                    items: [{
+						xtype: 'hidden',
+						id: 'optionCleanMethodIds',
+						name: 'optionCleanMethodIds'
+					}, {
+						xtype: 'trigger',
+						fieldLabel: "可选清洗程序",
+						allowBlank: true,
+						name: "optionCleanMethod",
+						id: "optionCleanMethod",
+						msgTarget: 'side',
+						readOnly: true,
+						style: "cursor: pointer;",
+						disabled:SSTS_TousseDefinitionWash_Manager,
+						onTriggerClick: function () {
+							if(!SSTS_TousseDefinitionWash_Manager){
+								optionalcleanMethodWin();
+							}
+						},
+						listeners: {
+							render: function (item) {
+								item.getEl().on('click', function (p) {
+									if(!SSTS_TousseDefinitionWash_Manager){
+										optionalcleanMethodWin();
+									}
+								});
+							}
+						},
+						triggerClass: 'x-form-search-trigger',
+						anchor: '100%'
+					}]
                 }]
             }]
         }],
@@ -703,6 +740,12 @@
         optionalSterilization = optionalSterilization.substring(0, 500) + '......';
     }
 
+    var optionCleanMethodIds = top.Ext.getCmp('optionCleanMethodIds').getValue(); //可选清洗程序
+    var optionCleanMethod = top.Ext.getCmp('optionCleanMethod').getValue(); //可选清洗程序名称
+    if(optionCleanMethod.length > 500){
+        optionCleanMethod = optionCleanMethod.substring(0, 500) + '......';
+    }
+
     var needBatchModify = {
         tousseDefinitionIds:tousseDefinitionIDs
     }
@@ -788,6 +831,12 @@
         needBatchModify.optionalSterilizationIds = optionalSterilizationIds;
 	}
 
+     //DGSETYY-97：批量修改新增字段“可选灭菌程序”
+     if (!isUndefinedOrNullOrEmpty(optionCleanMethodIds) && sstsConfig.enableAvailableWashProgramsOfTousseFunction) {
+	    message += "可选清洗程序:(" + optionCleanMethod + ");";
+        needBatchModify.optionCleanMethodIds = optionCleanMethodIds;
+	}
+
      //ZJYY-153：批量修改新增字段“配包注意事项提醒”
      var showTousseNote = top.Ext.getCmp('showTousseNote').getValue();
      if (!isUndefinedOrNullOrEmpty(showTousseNote)) {
Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/tousseView.jsp
===================================================================
diff -u -r39437 -r39845
--- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/tousseView.jsp	(.../tousseView.jsp)	(revision 39437)
+++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/tousseView.jsp	(.../tousseView.jsp)	(revision 39845)
@@ -123,14 +123,26 @@
 	SSTS_TousseInstanceManager_Note_update = true;
 </operation:authorize>
 
-//《器械包定义灭菌程序管理》权限
+/**
+ * <ZSRY-20：器械包定义灭菌程序管理》权限
+ */
 var SSTS_TousseDefinitionSterilisation_Manager = true;
 <operation:authorize ifAnyGranted="SSTS_TousseDefinitionSterilisation_Manager">
-    if (!notInWhiteList(sstsConfig, 'enableAvailableSterilizationProgramsOfTousseFunction')) {
-		SSTS_TousseDefinitionSterilisation_Manager = false;
-	}
+    if(sstsConfig.enableAvailableSterilizationProgramsOfTousseFunction){
+        SSTS_TousseDefinitionSterilisation_Manager = false
+    }
 </operation:authorize>
 
+/**
+ * <DGSETYY-78：器械包定义清洗程序管理》权限
+ */
+ var SSTS_TousseDefinitionWash_Manager = false;
+<operation:authorize ifAnyGranted="SSTS_TousseDefinitionWash_Manager">
+    if(sstsConfig.enableAvailableWashProgramsOfTousseFunction){
+        SSTS_TousseDefinitionWash_Manager = false
+    }
+</operation:authorize>
+
 var enableEditBtn = false;
 var enableSaveBtn = false;
 var enableSaveAndNewBtn = false;
Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplyroomtype/supplyRoomTypeForm.js
===================================================================
diff -u -r38597 -r39845
--- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplyroomtype/supplyRoomTypeForm.js	(.../supplyRoomTypeForm.js)	(revision 38597)
+++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/supplyroomtype/supplyRoomTypeForm.js	(.../supplyRoomTypeForm.js)	(revision 39845)
@@ -1372,6 +1372,30 @@
 								anchor: '100%',
 								allowBlank: true
 							}]
+						}, {
+							layout: 'form',
+							columnWidth: .25,
+							labelWidth: fontSize == 12 ? 180 : 210,
+							hidden: !sstsConfig.enableAvailableWashProgramsOfTousseFunction,
+							items: [{
+								xtype: 'combo',
+								fieldLabel: '无可选清洗程序处理方案',
+								id: 'noOptionCleanMethodSolution',
+								name: 'noOptionCleanMethodSolution',
+								valueField: 'value',
+								displayField: 'value',
+								mode: 'local',
+								anchor: '100%',
+								editable: false,
+								store: new Ext.data.SimpleStore({
+									fields: ['value'],
+									data: [['允许使用任意清洗程序'], ['不允许使用任意清洗程序']]
+								}),
+								forceSelection: true,
+								allowBlank: true,
+								value: '允许使用任意清洗程序',
+								triggerAction: 'all'
+							}]
 						}
 					]
 				}, {
@@ -4059,6 +4083,12 @@
 						borrowRemindFrequency = Ext.getCmp("borrowRemindFrequency").getValue();
 					}
 
+					//DGSETYY-78:无可选清洗程序处理方案
+					var noOptionCleanMethodSolution = '';
+					if(sstsConfig.enableAvailableWashProgramsOfTousseFunction){
+						noOptionCleanMethodSolution = Ext.getCmp("noOptionCleanMethodSolution").getValue();
+					}
+
 					//KSDQDYRMYY-13
 					var isEnableTousseOpRecipient = '否';
 					var isEnableTousseOpDestLocation = '否';
@@ -4318,6 +4348,7 @@
 							returnExpiredDGBatchNumber:returnExpiredDGBatchNumber,
 							invoiceModeTousseRange: invoiceModeTousseRange,
 							userNoLoginDateLimit :userNoLoginDateLimit ,
+							noOptionCleanMethodSolution:noOptionCleanMethodSolution,
 							borrowRemind: borrowRemind,
 							borrowRemindFrequency: borrowRemindFrequency,
 							kardexContainerHost: kardexContainerHost,
@@ -4637,6 +4668,11 @@
 				Ext.getCmp('userNoLoginDateLimit ').setValue(supplyRoomConfig.userNoLoginDateLimit );
 			}
 
+			//DGSETYY-78:无可选清洗程序处理方案
+			if(sstsConfig.enableAvailableWashProgramsOfTousseFunction){
+				Ext.getCmp("noOptionCleanMethodSolution").setValue(supplyRoomConfig.noOptionCleanMethodSolution);
+			}
+
 			//ZSWY-233:借物单弹窗提醒
 			if(sstsConfig.enableCardinalityManagementOfBorrow){
 				Ext.getCmp('borrowRemind').setValue(supplyRoomConfig.borrowRemind );
Index: ssts-web/src/main/resources/systemset/operationDefine.xml
===================================================================
diff -u -r39836 -r39845
--- ssts-web/src/main/resources/systemset/operationDefine.xml	(.../operationDefine.xml)	(revision 39836)
+++ ssts-web/src/main/resources/systemset/operationDefine.xml	(.../operationDefine.xml)	(revision 39845)
@@ -453,6 +453,7 @@
       <operation operationId="SSTS_InstrumentRepair_list" operationName="��еά�޼�¼�鿴" mappingConfigPropertyName="enableInstrumentRepairManagement"></operation>
       <operation operationId="SSTS_InstrumentRepair_handle" operationName="��еά�޼�¼ά��" mappingConfigPropertyName="enableInstrumentRepairManagement"></operation>
       <operation operationId="SSTS_TousseDefinitionSterilisation_Manager" operationName="�����������������" mappingConfigPropertyName="enableAvailableSterilizationProgramsOfTousseFunction"></operation>
+      <operation operationId="SSTS_TousseDefinitionWash_Manager" operationName="��е��������ϴ�������" mappingConfigPropertyName="enableAvailableWashProgramsOfTousseFunction"></operation>
     </modelName>
     
     <modelName modleName="��Ԥģ��">
Index: ssts-web/src/main/webapp/disinfectsystem/config/dgsetyy/config.js
===================================================================
diff -u -r39629 -r39845
--- ssts-web/src/main/webapp/disinfectsystem/config/dgsetyy/config.js	(.../config.js)	(revision 39629)
+++ ssts-web/src/main/webapp/disinfectsystem/config/dgsetyy/config.js	(.../config.js)	(revision 39845)
@@ -328,6 +328,8 @@
   enableNotAllowedToAddOrDeleteToussesDuringSterilizationFunction:true,
   //启用可追溯的器械包发货回原申请单功能
   enableTraceableToussesShippedBackToTheOriginalApplyInfoFunction:true,
+  //启用器械包的可选清洗程序功能
+  enableAvailableWashProgramsOfTousseFunction:true,
  //提取诊疗号的正则表达式 
   regExpForExtractingClinicNumber:"[0-9]+"
 }
\ No newline at end of file
Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/tousseForm.js
===================================================================
diff -u -r39789 -r39845
--- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/tousseForm.js	(.../tousseForm.js)	(revision 39789)
+++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/tousseForm.js	(.../tousseForm.js)	(revision 39845)
@@ -28,6 +28,21 @@
 	}
 });
 
+//清洗程序
+var cleanMethodStore = new Ext.data.SimpleStore({
+	fields: ['id', 'cleanMethod'],
+	url: WWWROOT + '/disinfectSystem/baseData/cleanMethodAction!findCleanMethodArrClone.do',
+	listeners: {
+		load: function (store, records) {
+			if (records.length > 0 && id == 0) {
+				if (top.Ext.getCmp('cleanMethod') && top.Ext.getCmp('cleanMethod').getValue() == '') {
+					top.Ext.getCmp('cleanMethod').setValue(records[0].data.cleanMethod);
+				}
+			}
+		}
+	}
+});
+
 //定义首篮筐的label变量
 var beginBarcodeLabel = '扫描条码:';
 var hiddenEndBarcode = true;//隐藏尾篮筐
@@ -255,7 +270,7 @@
 	}
 }
 
-function deleteItem(id){
+function deleteSterilingMethodItem(id){
 	var sterilingMethodItemStore = top.Ext.getCmp('sterilingMethodGrid').getStore();
 	for(var j=0;j<sterilingMethodItemStore.getCount();j++){
 		var item = sterilingMethodItemStore.getAt(j);
@@ -266,9 +281,15 @@
 	}
 }
 
-//删除
-function renderDeleteButton(v,p,record){
-	return "<a href=\"#\" target=\"_self\" onclick=\"getCurrentTab().deleteItem('"+record.data.id+"');\"><img src=\""+WWWROOT +"/images/web/stop.png\"></img></a>";
+function deletecleanMethodItem(id){
+	var cleanMethodItemStore = top.Ext.getCmp('cleanMethodGrid').getStore();
+	for(var j=0;j<cleanMethodItemStore.getCount();j++){
+		var item = cleanMethodItemStore.getAt(j);
+		var itemId = item.data.id;
+		if(itemId == id){
+			cleanMethodItemStore.remove(cleanMethodItemStore.getAt(j));
+		}
+	}
 }
 
 //ZSRY-20:可选灭菌程序管理
@@ -289,7 +310,9 @@
 		autoScroll : true,
 		cm : new top.Ext.grid.ColumnModel([
 			{header : "灭菌程序",width : 400,dataIndex : 'sterilingMethod',menuDisabled:true},
-			{header : "删除",width : 50,menuDisabled : true,renderer:renderDeleteButton}
+			{header : "删除",width : 50,menuDisabled : true,renderer:function(v,p,record){
+				return "<a href=\"#\" target=\"_self\" onclick=\"getCurrentTab().deleteSterilingMethodItem('"+record.data.id+"');\"><img src=\""+WWWROOT +"/images/web/stop.png\"></img></a>";
+			}}
 		]),
 		frame : false
 	});
@@ -441,6 +464,178 @@
 	}
 }
 
+//DGSETYY-78:可选清洗程序管理
+function optionalcleanMethodWin() {
+	var cleanMethodItemStore = new top.Ext.data.Store({
+		reader : new top.Ext.data.JsonReader({
+			fields : [
+				{name : 'id'},
+				{name : 'cleanMethod'}
+			]
+		})
+	});
+	var grid = new top.Ext.grid.GridPanel({
+		id :'cleanMethodGrid',
+		store : cleanMethodItemStore,
+		height : 250,
+		bodyStyle : 'border:1px solid #afd7af;',
+		autoScroll : true,
+		cm : new top.Ext.grid.ColumnModel([
+			{header : "清洗程序",width : 400,dataIndex : 'cleanMethod',menuDisabled:true},
+			{header : "删除",width : 50,menuDisabled : true,renderer:function(v,p,record){
+				return "<a href=\"#\" target=\"_self\" onclick=\"getCurrentTab().deletecleanMethodItem('"+record.data.id+"');\"><img src=\""+WWWROOT +"/images/web/stop.png\"></img></a>";
+			}}
+		]),
+		frame : false
+	});
+	var cleanMethodItemRecord = Ext.data.Record.create([
+		{name : 'id'}, 
+		{name : 'cleanMethod'}
+	]);
+	cleanMethodStore.load();
+	var win = new top.Ext.Window({
+		id: 'optionalcleanMethodWin',
+		layout: 'fit',
+		title: '可选清洗程序管理',
+		width: 500,
+		height: 300,
+		modal: true,
+		border: false,
+		plain: true,
+		buttonAlign: 'center',
+		tbar: [{
+			text: '选择清洗程序:'
+		},{
+			xtype: 'combo',
+			emptyText: '选择清洗程序',
+			id: 'cleanMethod2',
+			name: 'cleanMethod2',
+			valueField: 'cleanMethod',
+			displayField: 'cleanMethod',
+			editable: false,
+			store: cleanMethodStore,
+			forceSelection: true,
+			allowBlank: true,
+			triggerAction: 'all',
+			anchor: '100%',
+			listeners:{
+				select:function(combo, record, index){
+					var id = record.data.id;
+					var value = record.data.cleanMethod;
+					var count = cleanMethodItemStore.getCount();
+					if(count > 0){
+						var isReturn = false;
+						for(var i=0;i<count;i++){
+							var item = cleanMethodItemStore.getAt(i);
+							var itemId = item.data.id;
+							if(itemId == id){
+								isReturn = true;
+								break;
+							}
+						}
+						if(isReturn){
+							showResult(value+'在列表中已存在！');
+							return
+						}
+					}
+					var cleanMethodItem = new cleanMethodItemRecord({
+						id:id,
+						cleanMethod : value
+					});
+					cleanMethodItemStore.add(cleanMethodItem);
+				}
+			}
+		}, '-',
+		new Ext.Action({
+			text: '全部添加',
+			handler: function () {
+				var count = cleanMethodStore.getCount();
+				if(count > 0){
+					for(var i=0;i<count;i++){
+						var item = cleanMethodStore.getAt(i);
+						var id = item.data.id;
+						var value = item.data.cleanMethod;
+						var isReturn = false;
+						for(var j=0;j<cleanMethodItemStore.getCount();j++){
+							var item = cleanMethodItemStore.getAt(j);
+							var itemId = item.data.id;
+							if(itemId == id){
+								isReturn = true;
+								break;
+							}
+						}
+						if(isReturn){
+							continue;
+						}
+						var cleanMethodItem = new cleanMethodItemRecord({
+							id:id,
+							cleanMethod : value
+						});
+						cleanMethodItemStore.add(cleanMethodItem);
+					}
+				}
+			}
+		}), '-',
+		new Ext.Action({
+			text: '<span style="color:red;cursor: pointer;">全部删除</span>',
+			handler: function () {
+				cleanMethodItemStore.removeAll();
+			}
+		})],
+		items:[grid],
+		buttons: [{
+			text: '确定',
+			handler: function () {
+				var count = cleanMethodItemStore.getCount();
+				if(count > 0){
+					var arr = [];
+					var name = [];
+					var ids = [];
+					for(var i=0;i<count;i++){
+						var item = cleanMethodItemStore.getAt(i);
+						var id = item.data.id;
+						var cleanMethod = item.data.cleanMethod;
+						arr.push({
+							id:id,
+							cleanMethod:cleanMethod
+						});
+						name[i] = cleanMethod;
+						ids[i] = id;
+					}
+					top.Ext.getCmp('optionCleanMethod').setValue(name.join('；'))
+					top.Ext.getCmp('optionCleanMethodIds').setValue(ids.join(';'))
+					win.close();
+				}else {
+					top.Ext.getCmp('optionCleanMethod').setValue('')
+					top.Ext.getCmp('optionCleanMethodIds').setValue('')
+					win.close();
+				}
+			}
+		}, {
+			text: '取消',
+			handler: function () {
+				win.close();
+			}
+		}]
+	});
+	win.show();
+	var optionCleanMethodIds = top.Ext.getCmp('optionCleanMethodIds').getValue();
+	var optionCleanMethod = top.Ext.getCmp('optionCleanMethod').getValue();
+	if(optionCleanMethodIds !== ''){ 
+		var idsArr = optionCleanMethodIds.split(';');
+		var nameArr = optionCleanMethod.split('；');
+		for(var i=0;i<idsArr.length;i++){
+			var id = idsArr[i];
+			var cleanMethod = nameArr[i];
+			var cleanMethodItem = new cleanMethodItemRecord({
+				id:id,
+				cleanMethod : cleanMethod
+			});
+			cleanMethodItemStore.add(cleanMethodItem);
+		}
+	}
+}
+
 /**
  * 设置“审核是否算工作量”属性（如果是否审核的值为“是”，则启用之并且设置为“是”，如果是否审核的值为“否”，则禁用之并且设置为“否”）
  */
@@ -768,7 +963,7 @@
 			}
 			//ZSRY-20：可选灭菌程序
 			if(sstsConfig.enableAvailableSterilizationProgramsOfTousseFunction){
-				var optionalSterilizationJsonArr = tousseDefinition.optionalSterilizationJsonArr;
+				var optionalSterilizationJsonArr = tousseDefinition.optionalSterilizationJsonArr || [];
 				if(optionalSterilizationJsonArr.length > 0){
 					var names = [];
 					var ids = [];
@@ -780,6 +975,20 @@
 					top.Ext.getCmp('optionalSterilizationIds').setValue(ids.join(';'))
 				}
 			}
+			//ZSRY-20：可选清洗程序
+			if(sstsConfig.enableAvailableWashProgramsOfTousseFunction){
+				var optionCleanMethodJsonArr = tousseDefinition.optionCleanMethodJsonArr || [];
+				if(optionCleanMethodJsonArr.length > 0){
+					var names = [];
+					var ids = [];
+					for(var i=0;i<optionCleanMethodJsonArr.length;i++){
+						names[i] = optionCleanMethodJsonArr[i].cleanMethod;
+						ids[i] = optionCleanMethodJsonArr[i].id;
+					}
+					top.Ext.getCmp('optionCleanMethod').setValue(names.join('；'))
+					top.Ext.getCmp('optionCleanMethodIds').setValue(ids.join(';'))
+				}
+			}
 			top.Ext.getCmp('hiddenNoteValue').setValue(tousseDefinition.note || '');
 			//初始化此包定义的所有材料
 			for (var i = 0; i < tousseDefinition.tousseDefinitionMaterials.length; i++) {
@@ -1039,21 +1248,6 @@
 		}
 	});
 
-	//清洗程序
-	var cleanMethodStore = new Ext.data.SimpleStore({
-		fields: ['id', 'cleaningMethod'],
-		url: WWWROOT + '/disinfectSystem/baseData/cleanMethodAction!findCleanMethodArrClone.do',
-		listeners: {
-			load: function (store, records) {
-				if (records.length > 0 && id == 0) {
-					if (top.Ext.getCmp('cleanMethod') && top.Ext.getCmp('cleanMethod').getValue() == '') {
-						top.Ext.getCmp('cleanMethod').setValue(records[0].data.cleaningMethod);
-					}
-				}
-			}
-		}
-	});
-
 	var packTypeStore = new Ext.data.SimpleStore({
 		fields: ['typeName'],
 		url: WWWROOT + '/disinfectSystem/baseData/expirationDateInfoAction!getPackageType.do',
@@ -2045,24 +2239,62 @@
 						name: 'cleanMethod',
 						listWidth: 200,
 						editable: false,
-						valueField: 'cleaningMethod',
-						displayField: 'cleaningMethod',
+						valueField: 'cleanMethod',
+						displayField: 'cleanMethod',
 						store: cleanMethodStore,
 						forceSelection: true,
 						allowBlank: true,
 						triggerAction: 'all',
+						disabled:(sstsConfig.enableAvailableWashProgramsOfTousseFunction && SSTS_TousseDefinitionWash_Manager),
 						anchor: '100%'
 					}]
 				}, {
-					xtype: 'hidden',
-					id: 'assetsBelongCode',
-					name: 'assetsBelongCode'
+					columnWidth: colWidth*2,
+					layout: 'form',
+					labelWidth: fontSize == 12 ? 90 : 100,
+					labelAlign: "right",
+					hidden: !sstsConfig.enableAvailableWashProgramsOfTousseFunction,
+					items: [{
+						xtype: 'hidden',
+						id: 'optionCleanMethodIds',
+						name: 'optionCleanMethodIds'
+					}, {
+						xtype: 'trigger',
+						fieldLabel: "可选清洗程序",
+						allowBlank: true,
+						name: "optionCleanMethod",
+						id: "optionCleanMethod",
+						msgTarget: 'side',
+						readOnly: true,
+						style: "cursor: pointer;",
+						disabled:SSTS_TousseDefinitionWash_Manager,
+						onTriggerClick: function () {
+							if(!SSTS_TousseDefinitionWash_Manager){
+								optionalcleanMethodWin();
+							}
+						},
+						listeners: {
+							render: function (item) {
+								item.getEl().on('click', function (p) {
+									if(!SSTS_TousseDefinitionWash_Manager){
+										optionalcleanMethodWin();
+									}
+								});
+							}
+						},
+						triggerClass: 'x-form-search-trigger',
+						anchor: '100%'
+					}]
 				}, {
 					columnWidth: colWidth,
 					layout: 'form',
 					labelWidth: fontSize == 12 ? 90 : 100,
 					labelAlign: "right",
-					items: [{
+					items: [ {
+						xtype: 'hidden',
+						id: 'assetsBelongCode',
+						name: 'assetsBelongCode'
+					}, {
 						xtype: 'combo',
 						fieldLabel: '资产归属',
 						id: 'assetsBelong',