Index: ssts-web/src/main/webapp/disinfectsystem/reportforms/sterilizationRecordInfoView.jsp
===================================================================
diff -u -r31312 -r34285
--- ssts-web/src/main/webapp/disinfectsystem/reportforms/sterilizationRecordInfoView.jsp	(.../sterilizationRecordInfoView.jsp)	(revision 31312)
+++ ssts-web/src/main/webapp/disinfectsystem/reportforms/sterilizationRecordInfoView.jsp	(.../sterilizationRecordInfoView.jsp)	(revision 34285)
@@ -6,6 +6,9 @@
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <%@ include file="/common/includeExtJsAndCss.jsp"%>
 <%@ include file="/common/includeExtJs4_2.jsp"%>
+<!-- 支持多选的下拉框 -->
+<script type="text/javascript" src="${ctx}/ext/js/multiSelectCombo.js?version=${svnRevision}"></script>
+<link rel="stylesheet" type="text/css" href="${ctx}/ext/resources/css/multiSelectCombo.css"/>
 <script type="text/javascript" src="${ctx}/js/common.js?version=${svnRevision}"></script>
 <script type="text/javascript" src="${ctx }/ext/grid/ForgonGrid.js?version=${svnRevision}"></script>
 <script type="text/javascript" src="${ctx }/dwr/interface/ReportFormsCenterTableManager.js?version=${svnRevision}"></script>
Index: ssts-web/src/main/webapp/disinfectsystem/reportforms/sterilizationRecordInfoView.js
===================================================================
diff -u -r31312 -r34285
--- ssts-web/src/main/webapp/disinfectsystem/reportforms/sterilizationRecordInfoView.js	(.../sterilizationRecordInfoView.js)	(revision 31312)
+++ ssts-web/src/main/webapp/disinfectsystem/reportforms/sterilizationRecordInfoView.js	(.../sterilizationRecordInfoView.js)	(revision 34285)
@@ -37,6 +37,43 @@
 	)
 });
 
+//器械包分组数据源
+var tousseGroupStore = new Ext.data.JsonStore({
+	url : WWWROOT + '/disinfectSystem/baseData/tousseGroupAction!getAllTousseGroup.do',
+	fields : ['tousseGroupName','id'],
+	listeners : {
+		beforeload : function(_this, options) {
+			_this.baseParams.needAll = '是';
+		}
+	}
+});
+var tousseGroupItemArray = [];
+//器械包分组
+var tousseGroupItem = new Ext.form.MultiSelect({
+	id : 'tousseGroups',
+	name : 'tousseGroups',
+	valueField : 'tousseGroupName',
+	displayField : 'tousseGroupName',
+	allowBlank : true,
+	editable : false,
+	fieldLabel:'器械包分组',
+	listeners : {
+		select : function(combo, record, index){
+			onAllChoosedOrNot(combo, record,index,'tousseGroupName');
+		}
+	},
+	triggerAction : 'all',
+	store : tousseGroupStore,
+	anchor : '95%'
+})
+
+tousseGroupStore.on('load', function (thiz, records, options) {
+	tousseGroupItem.selectAll(); //全选
+	for(var i=1;i<records.length;i++){
+		tousseGroupItemArray.push(records[i].data.tousseGroupName);
+	}
+});
+
 var supplyRoomStore = new Ext.data.Store({
 	proxy : new Ext.data.HttpProxy({
 		url : WWWROOT + '/disinfectSystem/baseData/supplyRoomConfigAction!loadSupplyRoomConfigRoom.do',
@@ -54,6 +91,35 @@
 	}
 });
 
+function onAllChoosedOrNot(combo, record,index,nameOfFiled){
+	var choose = record.get(combo.checkField);
+	var fristRecord = combo.store.getAt(0);
+	if(index != 0){
+		if(!choose) {
+			fristRecord.set(combo.checkField, false);
+			combo.setValue(combo.getCheckedValue()); 
+		}else{
+			var isAllChoosed = true;
+			combo.store.each(function (thisRecord)
+				{
+					if(thisRecord.get(nameOfFiled) != ('全部') && !thisRecord.get(combo.checkField)){
+						isAllChoosed = false;
+					}
+				});
+			if(isAllChoosed){
+				fristRecord.set(combo.checkField, true);
+				combo.setValue(combo.getCheckedValue()); 				
+			}
+		}
+		return;
+	}
+	if(choose){
+		combo.selectAll();
+	}else{
+		combo.deselectAll();
+	}
+}
+
 var myMask;
 Ext.onReady(function() {
 	Ext.QuickTips.init();
@@ -144,6 +210,7 @@
 		var frequency = Ext.getCmp('frequency').getValue();
 		var departCoding = Ext.getCmp('querySupplyRoom').getValue();//20181225
 		var tousseTypes = $Id('tousseType').value;
+		var tousseGroups = Ext.getCmp('tousseGroups').getValue();
 		myMask = new Ext.LoadMask(Ext.getBody(), {
 			msg: '正在加载，请稍候！',
 			removeMask: true
@@ -178,6 +245,7 @@
 			frequency : frequency,
 			tousseTypes:tousseTypes,
 			sterilizationRecordInfoReportOrder:sterilizationRecordInfoReportOrder,
+			tousseGroups:tousseGroups,
 			reportName:'SterilizationRecord'
 		}
 
@@ -264,15 +332,14 @@
 			// bodyStyle : 'padding: 10px 10px 0px 10px;',
 			frame : true,
 			bodyStyle : 'padding:0px auto;margin:0px',// padding:1px;padding-top:5px;
-			height : 140,
+			height : 150,
+			labelWidth : 80,
 			items : [{
 				layout : 'column',
 				height : 100,
-				labelWidth : 70,
 				items : [{
 					columnWidth : .25,
 					layout : 'form',
-					labelWidth : 60,
 					items : [{
 						xtype : 'datefieldWithMin',
 						fieldLabel : '开始时间',
@@ -301,7 +368,6 @@
 				},{
 					columnWidth : .25,
 					layout : 'form',
-					labelWidth : 75,
 					items : [{
 						xtype : 'datefieldWithMin',
 						fieldLabel : '结束时间',
@@ -329,7 +395,6 @@
 				},{
 					columnWidth : .25,
 					layout : 'form',
-					labelWidth : 70,
 					labelSeparator : '选择供应室:',
 					items : [{
 						xtype : 'multiSelect',
@@ -396,7 +461,6 @@
 				},{
 					columnWidth : .25,
 					layout : 'form',
-					labelWidth : 60,
 					flex : 1,
 					items : [{
 						xtype : 'combo',
@@ -413,12 +477,12 @@
 						triggerAction : 'all',
 						hideTrigger : true,
 						typeAhead : false,
+						anchor : '95%',
 						allowBlank : true
 					}]
 				},{
 					columnWidth : .25,
 					layout : 'form',
-					labelWidth : 60,
 					items : [{
 						xtype : 'combo',
 						fieldLabel : "灭菌炉",
@@ -458,7 +522,6 @@
         },{
 					columnWidth : .25,
 					layout : 'form',
-					labelWidth : 75,
 					items : [{
 						xtype : 'combo',
 						fieldLabel : '灭菌炉分组',
@@ -505,22 +568,20 @@
 					}]
 				},{
 					layout:'form',
-					columnWidth : .237,
-					labelWidth : 70,
+					columnWidth : .25,
 					items:[{
 						xtype : 'textfield',
 						id : 'frequency',
 						name : 'frequency',
 						fieldLabel : '炉次',
 						regex: /^\d+$/, //正则表达式　这里假设只允许输入数字　如果输入的不是数字　就会出现下面定义的提示信息   
 						regexText:"只能够输入数字", //定义不符合正则表达式的提示信息 
-						anchor : '100%',
+						anchor : '95%',
 						allowBlank : true
 					}]
 				},{
-					columnWidth:.185,
+					columnWidth : .25,
 					layout : 'form',
-					labelWidth : 80,
 					items : [{
 						xtype : 'multiSelect',
 						fieldLabel : "器械包类型",
@@ -547,6 +608,10 @@
 							}
 						}
 					}]
+				},{
+					columnWidth : .25,
+					layout : 'form',
+					items : [tousseGroupItem]
 				}]
 			}],
 			buttons:[{