Index: ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/dwr/table/TousseInstanceTableManager.java
===================================================================
diff -u -r15228 -r16183
--- ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/dwr/table/TousseInstanceTableManager.java	(.../TousseInstanceTableManager.java)	(revision 15228)
+++ ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/dwr/table/TousseInstanceTableManager.java	(.../TousseInstanceTableManager.java)	(revision 16183)
@@ -193,11 +193,19 @@
 			sqlBuilder.append(String.format(" AND po.sterileFrequency = '%s'" ,frequency));
 		}
 
+		//通过在器械包下拉框选项中选中的名称(采用精确匹配)
 		String tousseName = sqlWhereParamMap.get("tousseName");
+		//通过在器械包下拉里输入但未从下拉选项选中的物品名称(采用模糊匹配)
+		String tousseNameFuzzy = sqlWhereParamMap.get("tousseNameFuzzy");
 		if (StringUtils.isNotBlank(tousseName)) {
-			sqlBuilder.append(" AND po.tousseDefinition.name like '" + tousseName
+			sqlBuilder.append(" AND po.tousseDefinition.name = '" + tousseName
+					+ "'");
+		}else if (StringUtils.isNotBlank(tousseNameFuzzy)) {
+			sqlBuilder.append(" AND po.tousseDefinition.name like '" + tousseNameFuzzy
 					+ "%'");
 		}
+		
+		
 		LoginUserData userData = AcegiHelper.getLoginUser();
 		String currentOrgUnitCode = userData
 				.getCurrentOrgUnitCode();
Index: ssts-web/src/main/webapp/disinfectsystem/toussemanager/tousseinstancemanager/tousseInstanceView.jsp
===================================================================
diff -u -r16002 -r16183
--- ssts-web/src/main/webapp/disinfectsystem/toussemanager/tousseinstancemanager/tousseInstanceView.jsp	(.../tousseInstanceView.jsp)	(revision 16002)
+++ ssts-web/src/main/webapp/disinfectsystem/toussemanager/tousseinstancemanager/tousseInstanceView.jsp	(.../tousseInstanceView.jsp)	(revision 16183)
@@ -70,7 +70,10 @@
     <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_tousseName" name="parm_s_tousseName">
+    <!-- 用于包名称模糊匹配的情况,无精确匹配时,考虑此情况 -->
+    <input type="hidden" id="parm_s_tousseNameFuzzy" name="parm_s_tousseNameFuzzy">
 </form>
 </body>
 </html>
\ No newline at end of file
Index: ssts-web/src/main/webapp/disinfectsystem/toussemanager/tousseinstancemanager/tousseInstanceView.js
===================================================================
diff -u -r16002 -r16183
--- ssts-web/src/main/webapp/disinfectsystem/toussemanager/tousseinstancemanager/tousseInstanceView.js	(.../tousseInstanceView.js)	(revision 16002)
+++ ssts-web/src/main/webapp/disinfectsystem/toussemanager/tousseinstancemanager/tousseInstanceView.js	(.../tousseInstanceView.js)	(revision 16183)
@@ -1,12 +1,20 @@
 var grid;
-
+//物品名称选择下拉框的当前所选中的值
+var currentSelectedTousseName;
 function initQueryValueAndReload() {
 	$Id('parm_s_barcodeSearch').value = $Id('barcodeSearch').value;
 	$Id('parm_s_sterilizationDate').value = $Id('sterilizationDate').value;
 	$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_tousseName').value = Ext.getCmp('tousseName').getRawValue();
+	
+	//如果当前所选中值与下拉框的值相同时,则采用精确匹配.否则采用模糊匹配
+	if(currentSelectedTousseName == Ext.getCmp('tousseName').getRawValue()){
+		$Id('parm_s_tousseName').value = Ext.getCmp('tousseName').getRawValue();
+	}else{
+		$Id('parm_s_tousseName').value = '';
+		$Id('parm_s_tousseNameFuzzy').value = Ext.getCmp('tousseName').getRawValue();
+	}
 	grid.getStore().lastOptions.params['start'] = 0;
 //	Ext.getCmp('barcodeSearch').setValue('');
 	grid.dwrReload();
@@ -231,6 +239,8 @@
 					listeners : {
 						select : function(combo, record, index) {
 							combo.setValue(record.data.name);
+							//存储当前所选中的值
+							currentSelectedTousseName = record.data.name;
 						}
 					}
 				}]
@@ -396,6 +406,7 @@
 		id : 'tousseInstanceGrid',
 		pageSize : 20,
 		renderTo : 'gridDiv',
+		showLoadMask : true,
 		tbar : tbar,
 		defaultSortField : 'operationTime',
 		defaultSortDirection : 'DESC',