Index: ssts-web/src/main/java/com/forgon/disinfectsystem/component/grid/GridManagerImpl.java
===================================================================
diff -u -r27414 -r27984
--- ssts-web/src/main/java/com/forgon/disinfectsystem/component/grid/GridManagerImpl.java	(.../GridManagerImpl.java)	(revision 27414)
+++ ssts-web/src/main/java/com/forgon/disinfectsystem/component/grid/GridManagerImpl.java	(.../GridManagerImpl.java)	(revision 27984)
@@ -257,7 +257,7 @@
 				SupplyRoomConfig supplyRoomConfig = supplyRoomConfigManager.getSystemParamsObj();
 				hqlCondition += " and (";
 				sqlCondition += " and (";
-				//器械包、消毒物品、敷料包根据任务组进行过滤
+				//器械包、消毒物品、敷料包、聚合包根据任务组进行过滤
 				hqlCondition += "(tousseDefinition.tousseType in ('"+TousseDefinition.PACKAGE_TYPE_INSIDE+"','"+
 						TousseDefinition.PACKAGE_TYPE_DISINFECTION+"','"+TousseDefinition.PACKAGE_TYPE_DRESSING+"','"+TousseDefinition.PACKAGE_TYPE_COMBO+"') "
 						+ "and tousseDefinition in (select td from TousseDefinition td where td.ancestorID in (select ct.tousseDefinitionId from CssdHandleTousses ct "
Index: ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
===================================================================
diff -u -r27971 -r27984
--- ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java	(.../PackingManagerImpl.java)	(revision 27971)
+++ ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java	(.../PackingManagerImpl.java)	(revision 27984)
@@ -4212,8 +4212,7 @@
 		WebSocketServer.noticeSendMessage(websocketSessionId,loginUser.getOrgUnitCodingFromSupplyRoomConfig(),
 				Log.MODEL_PACKING,taskGroup,NoticeType.REFRESH.getCode());
 		//调用websocket消息推送(向该审核任务组推送)
-		if(((tdOfPackingTask.isInsideTousse() || tdOfPackingTask.isDressing() || tdOfPackingTask.isDisinfection()) 
-				&& StringUtils.equals(Constants.STR_YES, tdOfPackingTask.getIsReview()))){
+		if(StringUtils.equals(Constants.STR_YES, tdOfPackingTask.getIsReview())){
 			WebSocketServer.noticeSendMessage(websocketSessionId,AcegiHelper.getCurrentOrgUnitCode(),
 					Log.MODEL_REVIEW,taskGroup,NoticeType.REFRESH.getCode());
 		}
@@ -6624,7 +6623,7 @@
 			//验证数据
 			comboTousseDataValidate(comboTousseTD,comboTousseJson,sterileDate);
 			if(StringUtils.equals(Constants.STR_YES, comboTousseTD.getIsReview())){
-				String taskGroupOfComboTousse = comboTousseTD.getTaskGroup();
+				String taskGroupOfComboTousse = comboTousseTD.getTaskGroupFromCssdHandleTousse(AcegiHelper.getCurrentOrgUnitCode(), objectDao);
 				if(StringUtils.isNotBlank(taskGroupOfComboTousse) 
 						&& !waitSendRefreshMessageTaskGroupList.contains(taskGroupOfComboTousse)){
 					waitSendRefreshMessageTaskGroupList.add(taskGroupOfComboTousse);