Index: ssts-web/src/main/java/com/forgon/disinfectsystem/systemwarning/service/SystemWarningManagerImpl.java
===================================================================
diff -u -r30747 -r30832
--- ssts-web/src/main/java/com/forgon/disinfectsystem/systemwarning/service/SystemWarningManagerImpl.java	(.../SystemWarningManagerImpl.java)	(revision 30747)
+++ ssts-web/src/main/java/com/forgon/disinfectsystem/systemwarning/service/SystemWarningManagerImpl.java	(.../SystemWarningManagerImpl.java)	(revision 30832)
@@ -232,6 +232,8 @@
 			    +" or (po.orgUnitCoding = '" + orgUnitCoding + "'"
 				+ " and po.status='" + TousseInstance.STATUS_STERILED + "'))"
 				+ " and (tdAcestor.warningType is null or tdAcestor.warningType not in ('" + TousseDefinition.WARNING_TYPE_NEVERWARN + "','" + TousseDefinition.WARNING_TYPE_DISABLED_TOUSSE + "'))"
+				//聚合包内的普通包实例不显示出来
+				+ " and po.comboTousseInstanceId is null "
 				;
 		return sql;
 	}
@@ -255,7 +257,9 @@
 			    +" or (po.orgUnitCoding = '" + orgUnitCoding + "'"
 				+ " and po.status='" + TousseInstance.STATUS_STERILED + "'))"
 				+ " and td.ancestorID not in (select ancestorID from " + TousseDefinition.class.getSimpleName()
-				+ " where (warningType in ('" + TousseDefinition.WARNING_TYPE_NEVERWARN + "','" + TousseDefinition.WARNING_TYPE_TOUSSE + "'))) ";
+				+ " where (warningType in ('" + TousseDefinition.WARNING_TYPE_NEVERWARN + "','" + TousseDefinition.WARNING_TYPE_TOUSSE + "'))) "
+				// 聚合包内的普通包实例不显示出来
+				+ " and po.comboTousseInstanceId is null ";
 		return sql;
 				
 	}
Index: ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/dwr/table/TousseInstanceTableManager.java
===================================================================
diff -u -r30827 -r30832
--- ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/dwr/table/TousseInstanceTableManager.java	(.../TousseInstanceTableManager.java)	(revision 30827)
+++ ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/dwr/table/TousseInstanceTableManager.java	(.../TousseInstanceTableManager.java)	(revision 30832)
@@ -1001,7 +1001,7 @@
 
 		StringBuilder sqlBuilder = new StringBuilder("WHERE 1=1 ");
 		//状态为已发货或已签收时,包所在位置为当前用户所属科室
-		sqlBuilder.append(" and po.id in (select id from TousseInstance where ((" + SqlBuilder.build_IN_Statement("status", SqlBuilder.IN, 
+		sqlBuilder.append(" and po.id in (select id from TousseInstance where comboTousseInstanceId is null and ((" + SqlBuilder.build_IN_Statement("status", SqlBuilder.IN, 
 				TousseInstance.STATUS_SHIPPED, TousseInstance.STATUS_SIGNED)
 				+ " and location = '" + queryDepartCode + "')"); 
 			
@@ -1046,6 +1046,8 @@
 		if(StringUtils.isNotBlank(tousseType)){
 			sqlBuilder.append(" AND po.tousseDefinition.tousseType = '").append(tousseType).append("'");
 		}
+		// 聚合包内的普通包实例不显示出来
+		sqlBuilder.append(" and po.comboTousseInstanceId is null ");//用于查询数量的sql语句条件(聚合包内的普通包实例不显示出来)
 		String sql = sqlBuilder.toString();
 		return gridManager.renderGrid(parameterMap,
 				TousseInstance.class.getSimpleName(), sql,