Index: ssts-web/src/main/webapp/disinfectsystem/packing/historyPackingView.jsp
===================================================================
diff -u -r23339 -r23997
--- ssts-web/src/main/webapp/disinfectsystem/packing/historyPackingView.jsp	(.../historyPackingView.jsp)	(revision 23339)
+++ ssts-web/src/main/webapp/disinfectsystem/packing/historyPackingView.jsp	(.../historyPackingView.jsp)	(revision 23997)
@@ -18,6 +18,10 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <title>装配管理</title>
+<!-- 支持多选的下拉框 -->
+<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" src="${ctx}/disinfectsystem/config/${profile}/config.js"></script>
 <script type="text/javascript" src="${ctx}/js/common.js" /></script>
 <script type="text/javascript" src="${ctx}/js/extUtils.js" /></script>
@@ -44,6 +48,7 @@
 %>
 
 <script type="text/javascript">
+var fontSize = '${fontSize}';
 var TYPE_SUPPLIER = encodeURIComponent('<%=Supplier.SUPPLIER_TYPE_RENTTOUSSE%>');
 var SSTS_Barcode_RePrint = true;
 <operation:authorize ifAnyGranted="SSTS_Barcode_RePrint">
@@ -101,6 +106,10 @@
     <input type="hidden" id="parm_s_tousseName" name="parm_s_tousseName" value="">
     <input type="hidden" id="parm_s_orgUnit" name="parm_s_orgUnit" value="">
     <input type="hidden" id="parm_s_tousseBarcode" name="parm_s_tousseBarcode" value="">
+    <!-- 新增加三个条件:器械包分组、器械包类型、装配任务组,均为可多选,采用逗号分隔 -->
+    <input type="hidden" id="parm_s_tousseGroups" name="parm_s_tousseGroups" value="">
+    <input type="hidden" id="parm_s_tousseTypes" name="parm_s_tousseTypes" value="">
+    <input type="hidden" id="parm_s_taskGroups" name="parm_s_taskGroups" value="">
 </form>
 </body>
 </html>
\ No newline at end of file
Index: ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/action/TousseDefinitionAction.java
===================================================================
diff -u -r23631 -r23997
--- ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/action/TousseDefinitionAction.java	(.../TousseDefinitionAction.java)	(revision 23631)
+++ ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/action/TousseDefinitionAction.java	(.../TousseDefinitionAction.java)	(revision 23997)
@@ -9,6 +9,7 @@
 import java.io.PrintWriter;
 import java.io.UnsupportedEncodingException;
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.Collections;
 import java.util.Comparator;
 import java.util.HashMap;
@@ -82,6 +83,7 @@
 import com.forgon.tools.json.JsonPropertyFilter;
 import com.forgon.tools.string.StringTools;
 import com.forgon.tools.util.PageUtil;
+import com.forgon.tools.util.SqlUtils;
 import com.opensymphony.xwork2.ModelDriven;
 import com.opensymphony.xwork2.Preparable;
 
@@ -1223,26 +1225,55 @@
 	 * @throws Exception
 	 */
 	public String getAllTousseDefinitionData() {
-		if (spell == null) {
-			return null;
-		}
 		try {
-			spell = java.net.URLDecoder.decode(spell, "UTF-8");
-
-			JSONObject json = tousseDefinitionManager.searchTousseDefinition(
-					spell, "all", null,true);
-			HttpServletResponse response = StrutsParamUtils.getResponse();
-			response.setCharacterEncoding("UTF-8");
-			PrintWriter out;
-			try {
-				out = response.getWriter();
-				out.print(json);
-				out.close();
-			} catch (IOException e) {
-				e.printStackTrace();
+			//下拉框分页(开始记录数及每页记录数)
+			int start = StrutsParamUtils.getPraramValue("start", 0);
+			int limit = StrutsParamUtils.getPraramValue("limit", 0);
+			String tousseTypes = StrutsParamUtils.getPraramValue("tousseTypes", null);
+			String tousseGroups = StrutsParamUtils.getPraramValue("tousseGroups", null);
+			logger.debug("start=" + start);
+			logger.debug("limit=" + limit);
+			logger.debug("tousseTypes=" + tousseTypes);
+			logger.debug("tousseGroups=" + tousseGroups);
+			/*JSONObject json = tousseDefinitionManager.searchTousseDefinition(
+					spell, "all", null,true);*/
+			JSONObject json = new JSONObject();
+			json.put("totalCount", 0);
+			String condition = " where 1=1 ";
+			if(StringUtils.isNotBlank(tousseTypes)){
+				Collection<String> tousseTypeList = StringTools.toCollectionIgnoreNullAndBlank(tousseTypes);
+				if(tousseTypeList.contains(TousseDefinition.PACKAGE_TYPE_CUSTOM)){
+					tousseTypeList.remove(TousseDefinition.PACKAGE_TYPE_CUSTOM);
+					condition += " and (" + SqlUtils.getStringFieldInLargeCollectionsPredicate("tousseType", tousseTypeList) + " or tousseType = '"+ TousseDefinition.PACKAGE_TYPE_CUSTOM +"')";
+				}else{
+					condition += " and " + SqlUtils.getStringFieldInLargeCollectionsPredicate("tousseType", tousseTypeList);
+				}
+			}else{
+				condition += " and ((fordisplay=1 and tousseType in ('"+ TousseDefinition.PACKAGE_TYPE_INSIDE +"','"+ TousseDefinition.PACKAGE_TYPE_DISINFECTION +"','"+ TousseDefinition.PACKAGE_TYPE_DRESSING +"','"+ TousseDefinition.PACKAGE_TYPE_FOREIGN +"','"+ TousseDefinition.PACKAGE_TYPE_FOREIGNPROXY +"')) or (fordisplay=0 and tousseType = '"+ TousseDefinition.PACKAGE_TYPE_CUSTOM +"'))";
 			}
-
-		} catch (UnsupportedEncodingException e) {
+			if(StringUtils.isNotBlank(tousseGroups)){
+				condition += " and " + SqlUtils.getStringFieldInLargeCollectionsPredicate("tousseGroupName", StringTools.toCollectionIgnoreNullAndBlank(tousseGroups));
+			}
+			if (StringUtils.isNotBlank(spell)) {
+				spell = java.net.URLDecoder.decode(spell, "UTF-8").trim();
+				condition += " and (name like '%"+ spell +"%' or spelling like '%"+ spell +"%' or wbCode like '%"+ spell +"%')";
+			}
+			JSONArray jsonArray = new JSONArray();
+			int totalCount = objectDao.countBySql("select count(0) from " + TousseDefinition.class.getSimpleName() + condition);
+			if(totalCount > 0){
+				json.put("totalCount", totalCount);
+				List<TousseDefinition> list = objectDao.findBySql(TousseDefinition.class.getSimpleName(), condition, start, limit, "name");
+				for (TousseDefinition tousseDefinition : list) {
+					JSONObject jsonObject = new JSONObject();
+					jsonObject.put("id", tousseDefinition.getId());
+					jsonObject.put("name", tousseDefinition.getName());
+					jsonObject.put("displayName", tousseDefinition.getName());
+					jsonArray.add(jsonObject);
+				}
+			}
+			json.put("data", jsonArray);
+			StrutsResponseUtils.output(json);
+		} catch (Exception e) {
 			e.printStackTrace();
 		}
 		return null;
Index: ssts-web/src/main/webapp/disinfectsystem/packing/historyPackingView.js
===================================================================
diff -u -r23339 -r23997
--- ssts-web/src/main/webapp/disinfectsystem/packing/historyPackingView.js	(.../historyPackingView.js)	(revision 23339)
+++ ssts-web/src/main/webapp/disinfectsystem/packing/historyPackingView.js	(.../historyPackingView.js)	(revision 23997)
@@ -78,25 +78,46 @@
 	});
 	
 	Ext.BLANK_IMAGE_URL = WWWROOT + '/ext/resources/images/default/s.gif';
-	
+
+	//器械包分组combo的store
+	var tousseGroupStore = new Ext.data.JsonStore({
+		fields : [ 'tousseGroupName','id' ],
+		url : WWWROOT + '/disinfectSystem/baseData/tousseGroupAction!getAllTousseGroup.do'
+	});
+
+	//器械包类型
+	var tousseTypeStore = new Ext.data.SimpleStore({
+		fields : [ 'value' ],
+		data : [['器械包'],[ '敷料包'],['消毒物品'],['外部代理灭菌'],['外来器械包'],['自定义器械包']]
+	});
+
+	//任务组combo的store
+	var taskGroupJsonStore = new Ext.data.SimpleStore({
+		fields : [ 'taskGroupName' ],
+		url : WWWROOT + '/disinfectSystem/baseData/tousseDefinitionAction!getTaskGroupName.do'
+	});
+
+	//器械包名称store
 	var tousseStore = new Ext.data.Store({
 		proxy : new Ext.data.HttpProxy({
-			url : WWWROOT + '/disinfectSystem/baseData/tousseDefinitionAction!searchInsideTousseData.do',
-			method : 'GET'
+			url : WWWROOT + '/disinfectSystem/baseData/tousseDefinitionAction!getAllTousseDefinitionData.do',
+			method : 'POST'
 		}),
 		reader : new Ext.data.JsonReader({
 			totalProperty : 'totalCount',
 			root : 'data'
 		}, [
-			{name : 'id',mapping : 'id'}, 
+		    {name : 'id',mapping : 'id'}, 
 		    {name : 'spelling',mapping : 'spelling'}, 
 		    {name : 'name',mapping : 'name'}, 
-		    {name : 'externalCode',mapping : 'externalCode'}, 
 		    {name : 'displayName',mapping : 'displayName'}, 
-		    {name : 'minApplyAmount',mapping : 'minApplyAmount'}, 
-		    {name : 'unit',mapping : 'unit'}, 
-		    {name : 'amount',mapping : 'amount'}
-		])
+		    {name : 'amount',mapping : 'amount'}]
+		),listeners : {
+			beforeload : function (){
+				tousseStore.baseParams["tousseGroups"] = Ext.getCmp("tousseGroups").getValue();
+				tousseStore.baseParams["tousseTypes"] = Ext.getCmp("tousseTypes").getValue();
+			}
+		}
 	});
 	
 	var recordColumns = [
@@ -220,7 +241,10 @@
 	dt_start.setSeconds(0);
 	dt_start.setMilliseconds(0);
 	var startDayofMonth = dt_start.getFullYear() + "/" + (dt_start.getMonth() + 1) + "/01";
-	
+	//表单元素的label标签宽度
+	var commonLabelWidth = 100;
+	//表单元素的宽度
+	var commonFormElementWidth = 150;
 	var form = new Ext.form.FormPanel({
 		id:'form_historyPacking',
 		title : '历史装配记录',
@@ -233,74 +257,82 @@
 		border : 0,
 		frame : true,
 		bodyStyle : 'padding:0px auto;margin:0px',
-		height : 120,
+		height : 150,
 		items : [{
 			layout : 'column',
 			height : 88,
 			labelWidth : 70,
+			width: fontSize == 12 ? 1100 : 1300,
 			items : [{
-				width : 220,
+				columnWidth : .25,
+				//width : 220,
 				layout : 'form',
-				labelWidth : 80,
+				//labelWidth : 80,
+				labelWidth : commonLabelWidth,
 				items : [{
 					xtype : 'datefieldWithMin',
 					id : 'startDateSearch',
 					name : 'startDateSearch',
 					fieldLabel : '开始时间',
 					altFormats:'Y-m-d|Y-n-j|y-n-j|y-m-j|y-m-d|y-n-d|Y-n-d|Y-m-j|Ymd|Ynj|ynj|ymj|ymd|ynd|Ynd|Ymj|Y/m/d|Y/n/j|y/n/j|y/m/j|y/m/d|y/n/d|Y/n/d|Y/m/j',
 					readOnly : false,
-					width : 130,
+					width : commonFormElementWidth,
 					format : 'Y-m-d H:i',
 					value : dt_start
 				}]
 			}, {
-				width : 220,
+				columnWidth : .25,
+				//width : 220,
 				layout : 'form',
-				labelWidth : 80,
+				//labelWidth : 80,
+				labelWidth : commonLabelWidth,
 				items : [{
 					xtype : 'datefieldWithMin',
 					id : 'endDateSearch',
 					name : 'endDateSearch',
 					fieldLabel : '结束时间',
 					altFormats:'Y-m-d|Y-n-j|y-n-j|y-m-j|y-m-d|y-n-d|Y-n-d|Y-m-j|Ymd|Ynj|ynj|ymj|ymd|ynd|Ynd|Ymj|Y/m/d|Y/n/j|y/n/j|y/m/j|y/m/d|y/n/d|Y/n/d|Y/m/j',
 					readOnly : false,
-					width : 130,
+					width : commonFormElementWidth,
 					value : new Date(),
 					format : 'Y-m-d H:i'
 				}]
-			}, {
-				width : 250,
+			},{
+				columnWidth : .25,
+				//width : 300,
 				layout : 'form',
-				labelWidth : 80,
+				//labelWidth : 35,
+				labelWidth : commonLabelWidth,
 				items : [{
-					xtype : 'textfield',
-					id : 'packer',
-					name : 'packer',
-					fieldLabel : '配包者',
-					width : 150
+					xtype : 'combo',
+					id : 'orgUnit',
+					name : 'orgUnit',
+					fieldLabel : '科室',
+					queryParam : 'spell',
+					minChars : 0,
+					valueField : 'name',
+					displayField : 'name',
+					store : appDepartJsonStoreExt2,
+					forceSelection : false,
+					lazyInit : true,
+					triggerAction : 'all',
+					hideTrigger : true,
+					typeAhead : false,
+					anchor : '93%'
 				}]
-			}, {
-				width : 250,
-				layout : 'form',
-				labelWidth : 80,
-				items : [{
-					xtype : 'textfield',
-					id : 'packerNumber',
-					name : 'packerNumber',
-					fieldLabel : '工号',
-					width : 150
-				}]
 			},{
-				width : 300,
+				columnWidth : .25,
+				//width : 300,
 				layout : 'form',
-				labelWidth : 120,
+				//labelWidth : 120,
+				labelWidth : commonLabelWidth,
 				items : [{
 					xtype : 'textfield',
 					fieldLabel : '灭菌篮筐条码',
 					allowBlank : true,
 					name : "inputBarcode",
 					id : "inputBarcode",
-					width : 150,
+					width : commonFormElementWidth,
 //					anchor : '100%',
 					listeners : {
 						render : function(p) {
@@ -339,78 +371,110 @@
 					}
 				}]
 			},{
-				width : 300,
+				columnWidth : .25,
+				//width : 300,
 				layout : 'form',
-				labelWidth : 70,
+				//labelWidth : 70,
+				labelWidth : commonLabelWidth,
 				items : [{
-					xtype : 'combo',
-					id : 'tousseName',
-					name : 'tousseName',
-					fieldLabel : '器械包名称',
+					xtype : 'multiSelect',
+					id : 'tousseGroups',
+					name : 'tousseGroups',
+					fieldLabel : '器械包分组',
 					queryParam : 'spell',
 					minChars : 0,
-					valueField : 'name',
-					displayField : 'displayName',
-					store : new Ext.data.Store({
-						proxy : new Ext.data.HttpProxy({
-							url : WWWROOT + '/disinfectSystem/baseData/tousseDefinitionAction!getAllTousseDefinitionData.do',
-							method : 'POST'
-						}),
-						reader : new Ext.data.JsonReader({
-							totalProperty : 'totalCount',
-							root : 'data'
-						}, [
-						    {name : 'id',mapping : 'id'}, 
-						    {name : 'spelling',mapping : 'spelling'}, 
-						    {name : 'name',mapping : 'name'}, 
-						    {name : 'displayName',mapping : 'displayName'}, 
-						    {name : 'amount',mapping : 'amount'}]
-						)
-					}),
+					valueField : 'tousseGroupName',
+					displayField : 'tousseGroupName',
+					store : tousseGroupStore,
 					forceSelection : false,
 					lazyInit : true,
 					triggerAction : 'all',
 					hideTrigger : true,
 					typeAhead : false,
-					anchor : '95%',
+					anchor : '93%',
 					listeners : {
-						select : function(combo, record, index) {
-							combo.setValue(record.data.name);
+						select : function (store){
+							//清空器械包名称
+							Ext.getCmp("tousseName").setValue("");
+							tousseStore.load();
 						}
 					}
 				}]
 			},{
-				width : 300,
+				columnWidth : .25,
+				//width : 300,
 				layout : 'form',
-				labelWidth : 35,
+				//labelWidth : 70,
+				labelWidth : commonLabelWidth,
 				items : [{
+					xtype : 'multiSelect',
+					id : 'tousseTypes',
+					name : 'tousseTypes',
+					fieldLabel : '器械包类型',
+					queryParam : 'spell',
+					minChars : 0,
+					valueField : 'value',
+					displayField : 'value',
+					store : tousseTypeStore,
+					mode : 'local',
+					forceSelection : false,
+					lazyInit : true,
+					triggerAction : 'all',
+					hideTrigger : false,
+					editable : false,
+					typeAhead : false,
+					anchor : '93%',
+					listeners : {
+						select : function (store){
+							//清空器械包名称
+							Ext.getCmp("tousseName").setValue("");
+							tousseStore.load();
+						}
+					}
+				}]
+			},{
+				columnWidth : .25,
+				//width : 300,
+				layout : 'form',
+				//labelWidth : 70,
+				labelWidth : commonLabelWidth,
+				items : [{
 					xtype : 'combo',
-					id : 'orgUnit',
-					name : 'orgUnit',
-					fieldLabel : '科室',
+					id : 'tousseName',
+					name : 'tousseName',
+					fieldLabel : '器械包名称',
 					queryParam : 'spell',
 					minChars : 0,
 					valueField : 'name',
-					displayField : 'name',
-					store : appDepartJsonStoreExt2,
+					displayField : 'displayName',
+					store : tousseStore,
+					pageSize : 100,
+					listWidth : 300,
 					forceSelection : false,
 					lazyInit : true,
 					triggerAction : 'all',
 					hideTrigger : true,
 					typeAhead : false,
-					anchor : '95%'
+					anchor : '93%',
+					listeners : {
+						select : function(combo, record, index) {
+							combo.setValue(record.data.name);
+						}
+					}
 				}]
 			},{
-				width : 300,
+				columnWidth : .25,
+				//width : 300,
 				layout : 'form',
-				labelWidth : 120,
+				//labelWidth : 120,
+				labelWidth : commonLabelWidth,
 				items : [{
 					xtype : 'textfield',
 					fieldLabel : '器械包条码',
 					allowBlank : true,
 					name : "scanTousseBarcode",
 					id : "scanTousseBarcode",
-					width : 150,
+					width : commonFormElementWidth,
 //					anchor : '100%',
 					listeners : {
 						render : function(p) {
@@ -428,10 +492,61 @@
 						}
 					}
 				}]
+			},{
+				columnWidth : .25,
+				//width : 300,
+				layout : 'form',
+				//labelWidth : 70,
+				labelWidth : commonLabelWidth,
+				items : [{
+					xtype : 'multiSelect',
+					id : 'taskGroups',
+					name : 'taskGroups',
+					fieldLabel : '装配任务组',
+					queryParam : 'spell',
+					minChars : 0,
+					valueField : 'taskGroupName',
+					displayField : 'taskGroupName',
+					store : taskGroupJsonStore,
+					forceSelection : false,
+					lazyInit : true,
+					triggerAction : 'all',
+					hideTrigger : true,
+					typeAhead : false,
+					anchor : '93%'
+				}]
 			}, {
-				width : 80,
+				columnWidth : .25,
+				//width : 250,
 				layout : 'form',
+				//labelWidth : 80,
+				labelWidth : commonLabelWidth,
 				items : [{
+					xtype : 'textfield',
+					id : 'packer',
+					name : 'packer',
+					fieldLabel : '配包人',
+					width : commonFormElementWidth
+				}]
+			}, {
+				columnWidth : .25,
+				//width : 250,
+				layout : 'form',
+				//labelWidth : 80,
+				labelWidth : commonLabelWidth,
+				items : [{
+					xtype : 'textfield',
+					id : 'packerNumber',
+					name : 'packerNumber',
+					fieldLabel : '工号',
+					width : commonFormElementWidth
+				}]
+			}/*, {
+				columnWidth : .25,
+				//width : 80,
+				layout : 'form',
+				labelWidth : commonLabelWidth,
+				items : [{
 					xtype : 'button',
 					text : '查询',
 					minWidth : 70,
@@ -441,8 +556,10 @@
 					}
 				}]
 			}, {
-				width : 80,
+				columnWidth : .25,
+				//width : 80,
 				layout : 'form',
+				labelWidth : commonLabelWidth,
 				items : [{
 					xtype : 'button',
 					text : '重置',
@@ -457,8 +574,21 @@
 						$Id('scanTousseBarcode').value = "";
 					}
 				}]
-			}]
-		}]
+			}*/]
+		}],
+		buttons : [
+			{text : '查询',	handler : initQueryValueAndReload},
+			{text : '重置',
+				handler : function() {
+					$Id('startDateSearch').value = "";
+					$Id('endDateSearch').value = "";
+					$Id('packer').value = "";
+					$Id('tousseName').value = "";
+					$Id('orgUnit').value = "";
+					$Id('scanTousseBarcode').value = "";
+				}
+			}
+		]
 	});
 	
 	recordGrid.on("rowclick",function(thiz, rowIndex, e){
@@ -525,6 +655,9 @@
 		var packerNumber = Ext.getCmp('packerNumber').getValue();
 		var tousseName = $Id('tousseName').value;
 		var barcode = Ext.getCmp('scanTousseBarcode').getValue();
+		var tousseGroups = Ext.getCmp('tousseGroups').getValue();
+		var tousseTypes = Ext.getCmp('tousseTypes').getValue();
+		var taskGroups = Ext.getCmp('taskGroups').getValue();
 		if(startDate || endDate){
 			if(!startDate){
 				showResult("请录入开始时间");
@@ -545,6 +678,9 @@
 		$Id('parm_s_tousseName').value = tousseName;
 		$Id('parm_s_orgUnit').value = $Id('orgUnit').value;
 		$Id('parm_s_tousseBarcode').value = barcode;
+		$Id('parm_s_tousseGroups').value = tousseGroups;
+		$Id('parm_s_tousseTypes').value = tousseTypes;
+		$Id('parm_s_taskGroups').value = taskGroups;
 		return true;
 	}
 	function initQueryValueAndReload() {
