Index: ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManager.java
===================================================================
diff -u -r15717 -r16072
--- ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManager.java	(.../PackingManager.java)	(revision 15717)
+++ ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManager.java	(.../PackingManager.java)	(revision 16072)
@@ -99,7 +99,7 @@
 	public void createWashedClassifyBasketPackingTask();
 	
 	public int loadTodayPackingRecordTotalAmount(String taskGroup);
-	public List<PackingRecord> loadTodayPackingRecord(String taskGroup,int firstIndex,int maxResults,String orderField);
+	public List<PackingRecord> loadTodayPackingRecord(String taskGroup,String tousseName,int firstIndex,int maxResults,String orderField);
 	
 	public JSONObject reviewTousseInstance(String idsStr,String basketBarcode, String taskGroup,String reviewer,String reviewerCode,Date sterileDate);
 	
Index: ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/action/PackingAction.java
===================================================================
diff -u -r15893 -r16072
--- ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/action/PackingAction.java	(.../PackingAction.java)	(revision 15893)
+++ ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/action/PackingAction.java	(.../PackingAction.java)	(revision 16072)
@@ -921,11 +921,12 @@
 	
 	public void loadPackingRecord(){
 		String taskGroup = StrutsParamUtils.getPraramValue("taskGroup", null);
+		String tousseName = StrutsParamUtils.getPraramValue("tousseName", null);
 		int page = Integer.parseInt(""+StrutsParamUtils.getPraramLongValue("page", 1L));
 		int maxResults = Integer.parseInt(""+StrutsParamUtils.getPraramLongValue("limit", 20L));
 		int firstIndex = (page-1) * maxResults;
 		String orderField = "id desc";
-		List<PackingRecord> records = packingManager.loadTodayPackingRecord(taskGroup, firstIndex, maxResults, orderField);
+		List<PackingRecord> records = packingManager.loadTodayPackingRecord(taskGroup, tousseName,firstIndex, maxResults, orderField);
 		int totalAmount = packingManager.loadTodayPackingRecordTotalAmount(taskGroup);
 		JSONObject obj = new JSONObject();
 		obj.put("items", records);
Index: ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js
===================================================================
diff -u -r15996 -r16072
--- ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js	(.../packingView.js)	(revision 15996)
+++ ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js	(.../packingView.js)	(revision 16072)
@@ -141,6 +141,14 @@
             direction: 'desc'
         }]
     })
+    
+    function initQueryValueAndReload() {
+		var tousseName = Ext4.getCmp('tousseName').getValue();
+		packingRecordStore .load({
+			params: {
+				tousseName: tousseName
+			}});
+	}
 
 // 从树种查找标识牌的装配任务
 function findIDCardPackingTask(store,idCard){
@@ -2507,42 +2515,130 @@
                     }
  	            ]
     		},{
-	            title: '今天本组装配记录',
-	            layout:'fit',
-	            items: [
-						Ext4.create('Ext4.grid.Panel', {
-						    store : packingRecordStore,
-						    columnLines: true,
-						    height: document.body.clientHeight-25,
-						    viewConfig : {loadMask : {msg : '正在加载，请稍候...'}},
-						    columns: [
-						        {header: '科室', dataIndex: 'orgUnitName',width: 200}, 
-							    {header: '装配时间', dataIndex: 'packTimeStr',width: 150}, 
-							    {header: '器械包', dataIndex: 'tousseName', width: 200,renderer:filterUnderScoreName}, 
-							    {header: '数量', dataIndex: 'amount'}, 
-							    {header: '配包人',flex: 1, dataIndex: 'packer'}
-						    ],
-						    autoExpandColumn : 'packer',
-						    dockedItems: [
-						    {
-						        xtype: 'pagingtoolbar',
-						        store: packingRecordStore,
-						        dock: 'bottom', //分页 位置
-						        emptyMsg: '没有数据',
-						        displayInfo: true,
-						        displayMsg: '当前显示{0}-{1}条记录 / 共{2}条记录 ',
-						        beforePageText: '第',
-						        afterPageText: '页/共{0}页'
-						    }],
-						    listeners: {
-						        itemclick: function (dv, record, item, index, e) {
-						        	var packingRecordId = record.get('id');
-						        	rePrintBarcodeWinForPacking(packingRecordId,SSTS_HistoryPacking_Update,SSTS_HistoryPacking_Change_Patient);
-						        }
-						    }
-						})  
-	            ]
-            }
+    			title: '今天本组装配记录',
+    			layout : 'border',
+    			height : document.body.clientHeight-25,
+    			items : [{
+    				layout : 'form',
+    				region : 'north',
+    				items :[{
+    					layout : 'column',
+    					height : 30,
+    					labelWidth : 70,
+    					items : [{
+    						width : 470,
+    						layout : 'form',
+    						labelWidth : 80,
+    						items : [{
+    							xtype : 'combo',
+    							id : 'tousseName',
+    							name : 'tousseName',
+    							fieldLabel : '器械包名称',
+    							queryParam : 'spell',
+    							minChars : 0,
+    							valueField : 'name',
+    							displayField : 'displayName',
+    							store : new Ext4.data.Store({
+//    						        //limit参数，每页显示条数，默认为25
+//    						        pageSize: isIE6OrIE7 ? 15 : 50,
+    								proxy : {
+    									type : 'ajax',
+    									url : WWWROOT + '/disinfectSystem/baseData/tousseDefinitionAction!getAllTousseDefinitionData.do',
+    									reader : {
+    										type : 'json',
+    						                totalProperty : 'totalCount',
+    										root : 'data'
+    									}
+    								},
+    								fields : [
+    								    {name : 'id',mapping : 'id'}, 
+    								    {name : 'spelling',mapping : 'spelling'}, 
+    								    {name : 'name',mapping : 'name'}, 
+    								    {name : 'displayName',mapping : 'displayName'}, 
+    								    {name : 'amount',mapping : 'amount'}
+    								  ]
+    							}),
+    							forceSelection : false,
+    							lazyInit : true,
+    							triggerAction : 'all',
+    							hideTrigger : true,
+    							typeAhead : false,
+    							anchor : '95%',
+    							listeners : {
+    								select : function(combo, record, index) {
+    									combo.setValue(record[0].data.name);
+    								}
+    							}
+    						}]
+    					}, {
+    						width : 80,
+    						layout : 'form',
+    						items : [{
+    							xtype : 'button',
+    							text : '查询',
+    							minWidth : 70,
+    							iconCls : 'icon_search',
+    							handler : function() {
+    								initQueryValueAndReload();
+    							}
+    						}]
+    					}, {
+    						width : 80,
+    						layout : 'form',
+    						items : [{
+    							xtype : 'button',
+    							text : '重置',
+    							minWidth : 70,
+    							iconCls : 'icon_set',
+    							handler : function() {
+    								Ext4.getCmp('tousseName').setValue("");
+//    								$Id('tousseName').value = "";
+    							}
+    						}]
+    					}]
+    				}]
+    			},{
+    				region : 'center',
+    				margins : '0 0 0 0',
+    				layout : 'fit',
+    				items : [{
+    		            layout:'fit',
+    		            items: [
+    							Ext4.create('Ext4.grid.Panel', {
+    							    store : packingRecordStore,
+    							    columnLines: true,
+//    							    height: document.body.clientHeight-25,
+    							    viewConfig : {loadMask : {msg : '正在加载，请稍候...'}},
+    							    columns: [
+    							        {header: '科室', dataIndex: 'orgUnitName',width: 200}, 
+    								    {header: '装配时间', dataIndex: 'packTimeStr',width: 150}, 
+    								    {header: '器械包', dataIndex: 'tousseName', width: 200,renderer:filterUnderScoreName}, 
+    								    {header: '数量', dataIndex: 'amount'}, 
+    								    {header: '配包人',flex: 1, dataIndex: 'packer'}
+    							    ],
+    							    autoExpandColumn : 'packer',
+    							    dockedItems: [
+    							    {
+    							        xtype: 'pagingtoolbar',
+    							        store: packingRecordStore,
+    							        dock: 'bottom', //分页 位置
+    							        emptyMsg: '没有数据',
+    							        displayInfo: true,
+    							        displayMsg: '当前显示{0}-{1}条记录 / 共{2}条记录 ',
+    							        beforePageText: '第',
+    							        afterPageText: '页/共{0}页'
+    							    }],
+    							    listeners: {
+    							        itemclick: function (dv, record, item, index, e) {
+    							        	var packingRecordId = record.get('id');
+    							        	rePrintBarcodeWinForPacking(packingRecordId,SSTS_HistoryPacking_Update,SSTS_HistoryPacking_Change_Patient);
+    							        }
+    							    }
+    							})  
+    		            ]
+    	            }]
+    			}]
+    		}
     ]
 });
 
@@ -2589,4 +2685,5 @@
 	});  
 });
 
-});
\ No newline at end of file
+});
+
Index: ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
===================================================================
diff -u -r15893 -r16072
--- ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java	(.../PackingManagerImpl.java)	(revision 15893)
+++ ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java	(.../PackingManagerImpl.java)	(revision 16072)
@@ -1877,8 +1877,11 @@
 		return objectDao.findBySql(PackingTask.class.getSimpleName(), sql);
 	}
 	
-	public List<PackingRecord> loadTodayPackingRecord(String taskGroup,int firstIndex,int maxResults,String orderField){
+	public List<PackingRecord> loadTodayPackingRecord(String taskGroup,String tousseName,int firstIndex,int maxResults,String orderField){
 		String sql = "where po.taskGroup = '" + taskGroup + "'";
+		if (StringUtils.isNotBlank(tousseName)) {
+			sql += " and po.tousseName like '%" + tousseName.trim() + "%' ";
+		}
 		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
 		String startDate = sdf.format(new Date()) + " 00:00:00";
 		String endDate = sdf.format(new Date()) + " 23:59:59";