Index: ssts-web/src/main/java/com/forgon/disinfectsystem/systemwarning/action/SystemWarningAction.java
===================================================================
diff -u -r34942 -r34943
--- ssts-web/src/main/java/com/forgon/disinfectsystem/systemwarning/action/SystemWarningAction.java	(.../SystemWarningAction.java)	(revision 34942)
+++ ssts-web/src/main/java/com/forgon/disinfectsystem/systemwarning/action/SystemWarningAction.java	(.../SystemWarningAction.java)	(revision 34943)
@@ -168,7 +168,7 @@
 			//状态为已发货或已签收时,包所在位置为当前用户所属科室
 			sqlBuilder.append(" and ((" + SqlBuilder.build_IN_Statement("status", SqlBuilder.IN, 
 					TousseInstance.STATUS_SHIPPED, TousseInstance.STATUS_SIGNED)
-					+ " and location = '" + queryDepartCode + "')"); 
+					+ " and case when location_2 is not null then location_2 else location end = '" + queryDepartCode + "')"); 
 
 			if(supplyRoomConfigManager.isFirstSupplyRoomOrgUnit(queryDepartCode)){
 				//或状态为已灭菌时,当前用户所属科室装配的包
@@ -217,6 +217,9 @@
 			}
 		}
 		
+		// 聚合包内的普通包实例不显示出来
+		sqlBuilder.append(" and po.comboTousseInstanceId is null ");
+		
 		sqlBuilder.append(" order by po.validUntil asc ");
 		String sql = sqlBuilder.toString();
 		List<TousseInstance> tis = (List<TousseInstance>) objectDao.findBySql("TousseInstance", sql);