Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/sterilizer/action/SterilizerAction.java
===================================================================
diff -u -r25826 -r27083
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/sterilizer/action/SterilizerAction.java	(.../SterilizerAction.java)	(revision 25826)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/sterilizer/action/SterilizerAction.java	(.../SterilizerAction.java)	(revision 27083)
@@ -221,6 +221,27 @@
 		}
 	}
 	/**
+	 * 获取所有灭菌炉的灭菌程序,供多选框使用
+	 */
+	public void getSterilizerTypeForMultiSelect(){
+		try {
+			List<Sterilisation> list = barcodeManager.getSterilizationType();
+			JSONObject jsonObject = new JSONObject();
+			if (list != null && list.size() > 0) {
+				JSONArray arr = new JSONArray();
+				for (int i = 0; i < list.size(); i++) {
+					JSONObject obj = new JSONObject();
+					obj.put("sterilisation", list.get(i).getSterilisation());
+					arr.add(obj);
+				}
+				jsonObject.put("data", arr);
+			}
+			StrutsResponseUtils.output(jsonObject);
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+	}
+	/**
 	 * 获取灭菌程序名称，包括灭菌目的
 	 */
 	public void getSterilizerTypeAndSterilizationPurpose() {
Index: ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java
===================================================================
diff -u -r27080 -r27083
--- ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java	(.../JasperreportsAction.java)	(revision 27080)
+++ ssts-reports/src/main/java/com/forgon/disinfectsystem/jasperreports/action/JasperreportsAction.java	(.../JasperreportsAction.java)	(revision 27083)
@@ -3320,7 +3320,9 @@
 		String month = StrutsParamUtils.getPraramValue("month", "");
 		String goodsSearch = StrutsParamUtils.getPraramValue("goodsSearch", "");
 		String tousseType = StrutsParamUtils.getPraramValue("tousseType", "");
-		
+		if(StringUtils.isNotBlank(tousseType) && tousseType.contains("全部")){
+			tousseType = tousseType.replaceFirst("全部,", "");
+		}
 		String title = "发货物品统计月报【灭菌程序：" + tousseType + "】"
 				+ (StringUtils.isNotBlank(month) ? "（" + month + "）" : "");
 		Map<String, String> monthMap = getMonthStartAndEndDate(month);
@@ -3344,8 +3346,12 @@
 		if (StringUtils.isNotBlank(goodsSearch)) {
 			sql += " and t.tousseName like '%" + goodsSearch + "%' ";
 		}
-		if (StringUtils.isNotBlank(tousseType)) {
-			sql += " and t.sterilingType = '" + tousseType + "'";
+		if (StringUtils.isNotBlank(tousseType) && !tousseType.contains("全部")) {
+			if(!tousseType.contains(",")){
+				sql += " and t.sterilingType = '" + tousseType + "'";
+			}else{
+				sql += " and "+ SqlUtils.getStringFieldInLargeCollectionsPredicate("t.sterilingType", SqlUtils.splitStringToSet(tousseType, ","));
+			}
 		}
 		map.put("sql", sql);
 	}
Index: ssts-web/src/main/webapp/disinfectsystem/reportforms/EOGoodsDetailView.jsp
===================================================================
diff -u -r12331 -r27083
--- ssts-web/src/main/webapp/disinfectsystem/reportforms/EOGoodsDetailView.jsp	(.../EOGoodsDetailView.jsp)	(revision 12331)
+++ ssts-web/src/main/webapp/disinfectsystem/reportforms/EOGoodsDetailView.jsp	(.../EOGoodsDetailView.jsp)	(revision 27083)
@@ -12,9 +12,11 @@
 <script type="text/javascript" src="${ctx}/disinfectsystem/reportforms/js/monthDatePicker.js"></script>
 <script type="text/javascript" src="${ctx}/disinfectsystem/reportforms/js/monthDateField.js"></script>
 <script type="text/javascript" src="${ctx}/disinfectsystem/reportforms/EOGoodsDetailView.js"></script>
-
+<!-- 支持多选的下拉框 -->
+<script type="text/javascript" src="${ctx}/ext/js/multiSelectCombo.js"></script>
+<link rel="stylesheet" type="text/css" href="${ctx}/ext/resources/css/multiSelectCombo.css"/>
 <script type="text/javascript">
-
+var ALL = '全部';
 var SSTS_WashRecord_Create = true;
 <operation:authorize ifAnyGranted="SSTS_WashRecord_Create">
 SSTS_WashRecord_Create = false;
Index: ssts-web/src/main/webapp/disinfectsystem/reportforms/EOGoodsDetailView.js
===================================================================
diff -u -r12599 -r27083
--- ssts-web/src/main/webapp/disinfectsystem/reportforms/EOGoodsDetailView.js	(.../EOGoodsDetailView.js)	(revision 12599)
+++ ssts-web/src/main/webapp/disinfectsystem/reportforms/EOGoodsDetailView.js	(.../EOGoodsDetailView.js)	(revision 27083)
@@ -5,6 +5,29 @@
 Ext.onReady(function() {
 	Ext.QuickTips.init();
 	// 记录cookie（3步）
+	//灭菌程序数据源
+	var sterilisationStore = new Ext.data.Store({
+		proxy : new Ext.data.HttpProxy({
+			url : WWWROOT + '/disinfectSystem/baseData/sterilizerAction!getSterilizerTypeForMultiSelect.do',
+			method : 'POST'
+		}),
+		reader : new Ext.data.JsonReader({
+			totalProperty : 'totalCount',
+			root : 'data'
+		}, [
+		    {name : 'sterilisation',mapping : 'sterilisation'}
+		]),
+		listeners : {
+			load :function (thiz,records,options ){
+				if(sterilisationStore.getCount() > 1){
+					sterilisationStore.insert(0 , new testRecord({'sterilisation':ALL}));
+				}
+			}
+		}
+	});
+	var testRecord = Ext.data.Record.create([
+	                                		{name: 'sterilisation', type: 'string'}
+	                                	]);
 	
 	function reloadReport(){
 		var monthSearch= $Id('monthSearch').value;
@@ -44,17 +67,6 @@
 		)
 	});
 	
-	var foldersJsonStore = new Ext.data.SimpleStore({
-		fields : [ 'id','cleaningMethod' ],
-		url : WWWROOT + '/disinfectSystem/baseData/sterilizerAction!getSterilizerType.do',
-		listeners : {
-			beforeload : function(thiz, options){
-				thiz.baseParams['type'] = 'sterilizationRecord';
-			} 
-		}
-	});
-	foldersJsonStore.load();
-	
 	var tousseAndDiposableGoodsStore = new Ext.data.Store({
 		proxy : new Ext.data.HttpProxy({
 			url : WWWROOT + '/disinfectSystem/baseData/tousseDefinitionAction!searchInsideTousseAndDiposableGoods.do?showUnAppDiposableGoods=true',
@@ -135,25 +147,61 @@
 					allowBlank : true,
 					anchor : '70%'
 				}]
-			}, {
+			},{
 				columnWidth : .3,
 				layout : 'form',
 				labelWidth : 60,
 				items : [{
-						xtype : 'combo',
-						id : 'tousseType',
-						name : 'tousseType',
-						fieldLabel : '灭菌程序',
-						valueField : 'id',
-						displayField : 'cleaningMethod',
-						store : foldersJsonStore,
-						forceSelection : true,
-						editable : false,
-						mode : 'local',
-						triggerAction : 'all',
-						anchor : '95%'
-					}]
-			}, {
+	        	    fieldLabel:'灭菌程序',
+					xtype : 'multiSelect',
+					id : 'tousseType',
+					name : 'tousseType',
+					queryParam : 'spell',
+					minChars : 0,
+					valueField : 'sterilisation',
+					displayField : 'sterilisation',
+					matchFieldWidth: false,
+					listConfig: {width : 600},
+					store : sterilisationStore,
+					forceSelection : false,
+					lazyInit : true,
+					triggerAction : 'all',
+					hideTrigger : false,
+					typeAhead : false,
+					editable: false,
+					allowBlank : true,
+					anchor : '95%',
+					listeners: {
+						select: function (combo, record, index) {
+							//1、如果选中“全部”的项，则把所有的项选中，反之全部取消选择
+							if (record.get('sterilisation') == ALL) {
+								if (record.get('checked')) {
+									combo.selectAll();
+								} else {
+									combo.deselectAll();
+								}
+							}
+							
+							//2、如果已经选中所有的项，则把“全部”项选中，反之把“全部”项取消选择
+							var selectAll = true;
+							combo.store.each(function(record) {
+								if (record.get('sterilisation') != ALL && !record.get(this.checkField)) {
+									selectAll = false;
+									return;
+								}
+							}, combo);
+							
+							var all = combo.store.getAt(0);
+							if (selectAll) {
+								all.set(combo.checkField, true);
+							} else {
+								all.set(combo.checkField, false);
+							}
+							combo.setValue(combo.getCheckedValue());
+						}
+					}
+				}]
+			},{
 				columnWidth : .6,
 				width : 300,
 				layout : 'form',
@@ -203,7 +251,6 @@
 	});
 	
 	Ext.getCmp('departSearch').setValue("全部");
-	Ext.getCmp('tousseType').setValue("EO低温");
 	
 	var reportForm = new Ext.Panel({
          frame:false,//渲染面板