Index: ssts-web/src/main/webapp/disinfectsystem/toussemanager/tousseinstancemanager/tousseInstanceView.jsp
===================================================================
diff -u -r16308 -r16731
--- ssts-web/src/main/webapp/disinfectsystem/toussemanager/tousseinstancemanager/tousseInstanceView.jsp	(.../tousseInstanceView.jsp)	(revision 16308)
+++ ssts-web/src/main/webapp/disinfectsystem/toussemanager/tousseinstancemanager/tousseInstanceView.jsp	(.../tousseInstanceView.jsp)	(revision 16731)
@@ -69,6 +69,9 @@
 <script type="text/javascript" src="tousseInstanceView.js"></script>
 <script type="text/javascript" src="${ctx }/disinfectsystem/useRecord/tabs/tousseInstanceInfoTab.js"></script>
 <script type="text/javascript" src="${ctx}/disinfectsystem/config/${profile}/config.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 language="javascript" src="${ctx}/disinfectsystem/print/LodopFuncs.js"></script>
@@ -101,6 +104,7 @@
     <input type="hidden" id="parm_s_sterilizationEndDate" name="parm_s_sterilizationEndDate">
     <input type="hidden" id="parm_s_sterilizerName" name="parm_s_sterilizerName">
     <input type="hidden" id="parm_s_frequency" name="parm_s_frequency">
+    <input type="hidden" id="parm_s_tousseGroupName" name="parm_s_tousseGroupName">
     <!-- 用于名名称精确匹配的情况,优先考虑精确的条件 -->
     <input type="hidden" id="parm_s_tousseName" name="parm_s_tousseName">
     <!-- 用于包名称模糊匹配的情况,无精确匹配时,考虑此情况 -->
Index: ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/dwr/table/TousseInstanceTableManager.java
===================================================================
diff -u -r16298 -r16731
--- ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/dwr/table/TousseInstanceTableManager.java	(.../TousseInstanceTableManager.java)	(revision 16298)
+++ ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/dwr/table/TousseInstanceTableManager.java	(.../TousseInstanceTableManager.java)	(revision 16731)
@@ -194,6 +194,21 @@
 		if (StringUtils.isNotBlank(frequency)) {
 			sqlBuilder.append(String.format(" AND po.sterileFrequency = '%s'" ,frequency));
 		}
+		
+		String tousseGroupName = sqlWhereParamMap.get("tousseGroupName");  //器械包分组
+		if (StringUtils.isNotBlank(tousseGroupName)
+				&& tousseGroupName.indexOf("全部") == -1) {  //没选或者选择全部就不过滤
+			String[] tousseGroupNameArray = tousseGroupName.split(",");
+			
+			StringBuilder tempBuilder = new StringBuilder();
+			for (String temp : tousseGroupNameArray) {
+				tempBuilder.append(String.format("po.tousseDefinition.tousseGroupName = '%s' or " ,temp.trim()));
+			}
+			
+			int length = tempBuilder.length();
+			tempBuilder.delete(length - 4, length);
+			sqlBuilder.append(String.format(" AND (%s) " ,tempBuilder));
+		}
 
 		//通过在器械包下拉框选项中选中的名称(采用精确匹配)
 		String tousseName = sqlWhereParamMap.get("tousseName");
Index: ssts-web/src/main/webapp/disinfectsystem/toussemanager/tousseinstancemanager/tousseInstanceView.js
===================================================================
diff -u -r16553 -r16731
--- ssts-web/src/main/webapp/disinfectsystem/toussemanager/tousseinstancemanager/tousseInstanceView.js	(.../tousseInstanceView.js)	(revision 16553)
+++ ssts-web/src/main/webapp/disinfectsystem/toussemanager/tousseinstancemanager/tousseInstanceView.js	(.../tousseInstanceView.js)	(revision 16731)
@@ -7,6 +7,7 @@
 	$Id('parm_s_sterilizationEndDate').value = $Id('sterilizationEndDate').value;
 	$Id('parm_s_sterilizerName').value = $Id('sterilizerName').value;
 	$Id('parm_s_frequency').value = $Id('frequency').value;
+	$Id('parm_s_tousseGroupName').value = $Id('tousseGroupName').value;
 	
 	//如果当前所选中值与下拉框的值相同时,则采用精确匹配.否则采用模糊匹配
 	if(currentSelectedTousseName == Ext.getCmp('tousseName').getRawValue()){
@@ -190,10 +191,10 @@
 		layoutConfig : {columns : 2},
 		height : 88,
 		items : [{
-			width :700,
+			width :840,
 			layout : 'column',
 			items:[{
-				columnWidth : .33,
+				columnWidth : .25,
 				layout : 'form',
 				labelWidth : 40,
 				items : [{
@@ -212,7 +213,7 @@
 					}
 				}]
 			},{
-				columnWidth : .33,
+				columnWidth : .25,
 				layout : 'form',
 				labelWidth : 85,
 				items : [{
@@ -255,7 +256,7 @@
 					}
 				}]
 			},{
-				columnWidth : .33,
+				columnWidth : .25,
 				layout : 'form',
 				labelWidth : 60,
 				items : [{
@@ -277,7 +278,7 @@
 					anchor : '95%'
 	             }]
 			},{
-				columnWidth : .33,
+				columnWidth : .25,
 				layout : 'form',
 				labelWidth : 40,
 				items : [{
@@ -288,7 +289,7 @@
 					anchor : '90%'
 				}]
 			},{
-				columnWidth : .33,
+				columnWidth : .25,
 				layout : 'form',
 				labelWidth : 85,
 				items : [{
@@ -304,7 +305,7 @@
 					anchor : '95%'
 				}]
 			},{
-				columnWidth : .33,
+				columnWidth : .25,
 				layout : 'form',
 				labelWidth : 85,
 				items : [{
@@ -319,6 +320,48 @@
 //					value:new Date(),
 					anchor : '95%'
 				}]
+			},{
+				
+				////////////////
+				
+				columnWidth : .25,
+				layout : 'form',
+				labelWidth : 70,
+				items : [{
+					xtype : 'multiSelect',
+					id : 'tousseGroupName',
+					name : 'tousseGroupName',
+					valueField : 'tousseGroupName',
+					displayField : 'tousseGroupName',
+					allowBlank : true,
+					editable : false,
+					fieldLabel:'器械包分组',
+					triggerAction : 'all',
+					
+					//--------------------//
+//					mode:'local',
+					store : new Ext.data.SimpleStore({
+						url : WWWROOT + '/disinfectSystem/baseData/tousseGroupAction!getAllTousseGroupName.do',
+						fields:['tousseGroupName']
+					}),
+					
+//					store : new Ext.data.Store({
+//						proxy : new Ext.data.HttpProxy({
+//							url : WWWROOT + '/disinfectSystem/baseData/tousseGroupAction!getAllTousseGroupName.do',
+//							method : 'POST'
+//						}),
+//						reader : new Ext.data.JsonReader({
+//							fields : [{name : 'tousseGroupId', name : 'tousseGroupName'}]
+//						}),
+//						listeners : {
+//						}
+//					}),
+					//---------------------------//
+					anchor : '95%'
+				}]
+				
+				
+				////////////////
 			}]
 		},{
 			width :120,
Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/tousseGroup/action/TousseGroupAction.java
===================================================================
diff -u -r16585 -r16731
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/tousseGroup/action/TousseGroupAction.java	(.../TousseGroupAction.java)	(revision 16585)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedatamanager/tousseGroup/action/TousseGroupAction.java	(.../TousseGroupAction.java)	(revision 16731)
@@ -10,6 +10,8 @@
 
 import com.forgon.tools.StrutsResponseUtils;
 import com.forgon.tools.util.PageUtil;
+
+import net.sf.json.JSONArray;
 import net.sf.json.JSONObject;
 
 import org.apache.commons.lang.StringUtils;
@@ -142,6 +144,38 @@
 			e.printStackTrace();
 		}
 	}
+	
+	/**
+	 * 获取所有器械包分组的名称
+	 * 
+	 */
+	public void getAllTousseGroupName(){
+		
+		List<TousseGroup> allTousseGroup = tousseGroupManager.findAllTousseGroup();
+		if(allTousseGroup == null){
+			allTousseGroup = new ArrayList<TousseGroup>();
+		}
+		
+		JSONArray jSONArray = new JSONArray();
+		JSONArray all = new JSONArray();
+		all.add("全部");
+		jSONArray.add(all);
+		for (TousseGroup tousseGroup : allTousseGroup) {
+			JSONArray temp = new JSONArray();
+			temp.add(tousseGroup.getTousseGroupName());
+			jSONArray.add(temp);
+		}
+		
+		HttpServletResponse httpServletResponse = StrutsParamUtils
+				.getResponse();
+		httpServletResponse.setCharacterEncoding("UTF-8");
+		try {
+			httpServletResponse.getWriter().print(jSONArray.toString());
+		} catch (IOException e) {
+			e.printStackTrace();
+		}
+		
+	}
 
 	/**
 	 * 按器械包分组下拉选项