Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/comboTousse.jsp
===================================================================
diff -u -r16893 -r16906
--- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/comboTousse.jsp	(.../comboTousse.jsp)	(revision 16893)
+++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/comboTousse.jsp	(.../comboTousse.jsp)	(revision 16906)
@@ -118,7 +118,7 @@
 </table>
 <form name="parametersFrm">
     <input type="hidden" id="parm_s_onlyShowDisable" name="parm_s_onlyShowDisable" value="">
-    <input type="hidden" id="parm_s_tousseType" name="parm_s_tousseType" value="聚合包">
+    <input type="hidden" id="parm_s_isShowComboTousse" name="parm_s_isShowComboTousse" value="true">
 </form>
 </body>
 </html>
\ No newline at end of file
Index: ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/dwr/table/TousseDefinitionTableManager.java
===================================================================
diff -u -r16893 -r16906
--- ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/dwr/table/TousseDefinitionTableManager.java	(.../TousseDefinitionTableManager.java)	(revision 16893)
+++ ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/dwr/table/TousseDefinitionTableManager.java	(.../TousseDefinitionTableManager.java)	(revision 16906)
@@ -86,10 +86,11 @@
 				+ "' and po.tousseType != '"
 				+ TousseDefinition.PACKAGE_TYPE_FOREIGN + "'";
 		Map<String, String> sqlWhereParamMap = gridManager.getParamFromView(parameterMap);
-		String tousseType = sqlWhereParamMap.get("tousseType");
-		if (StringUtils.isNotBlank(tousseType) && TousseDefinition.PACKAGE_TYPE_COMBO.equals(tousseType)){
-			//如果类型是聚合包,则查出聚合包
-			sql += String.format(" and po.tousseType = '%s'", tousseType);
+		String isShowComboTousse = sqlWhereParamMap.get("isShowComboTousse");
+		if (StringUtils.isNotBlank(isShowComboTousse)){
+			sql += " and po.tousseType ";
+			// 聚合包定义页面要查出聚合包,器械包定义页面则不查出聚合包
+			sql += String.format("true".equals(isShowComboTousse) ? "= '%s'" : "!= '%s'", TousseDefinition.PACKAGE_TYPE_COMBO);
 		}
 
 		//现在器械包定义的handlerDepartCode这个字段已经不用了,所以去掉条件过滤,防止二级供应室用户看不到该字段值不为该用户所在科室的器械包
Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/tousseView.jsp
===================================================================
diff -u -r16101 -r16906
--- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/tousseView.jsp	(.../tousseView.jsp)	(revision 16101)
+++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/tousseView.jsp	(.../tousseView.jsp)	(revision 16906)
@@ -116,6 +116,7 @@
 </table>
 <form name="parametersFrm">
     <input type="hidden" id="parm_s_onlyShowDisable" name="parm_s_onlyShowDisable" value="">
+    <input type="hidden" id="parm_s_isShowComboTousse" name="parm_s_isShowComboTousse" value="false">
 </form>
 </body>
 </html>
\ No newline at end of file