Index: ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
===================================================================
diff -u -r41020 -r41044
--- ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java	(.../PackingManagerImpl.java)	(revision 41020)
+++ ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java	(.../PackingManagerImpl.java)	(revision 41044)
@@ -3224,11 +3224,17 @@
 	}
 	
 	/**
+	 * 一般出现装配任务不显示的排除做法
+	 * 1 查询数据库装配任务是否存在  PackingTask.unPackAmount是否大于0
+	 * 2 查询包定义是否隐藏装配任务  tousseDefinition.hidePackingTask
+	 * 3 查询包定义处理科室配置  CssdHandleTousses
+	 * 4 查询 确认沟通是否隐藏装配任务 PackingTask.recycleAmountNeedConfirm 不等于是
 	 * 查询器械包、消毒物品、敷料包的待装配装配任务集合(v4.1代码新的方法,按供应室处理器械包配置的任务组查询)
 	 * 适合器械包、消毒物品、敷料包的装配任务查询
 	 * @param taskGroup
 	 * @param basketBarcode
 	 * @param tousseNamesAndTaskTypes 包名称和装配任务类型
+	 * @param recyclingAmountConfirmSql 确认沟通是否隐藏装配任务的过滤条件
 	 * @return 同时返回PackingTask和TousseDefintion两个实体类，避免多次查询
 	 */
 	private List<Object[]> findPackingTaskFromCssdHandleToussesConfig(Long packingTaskId, boolean showRecyclingPeopleColumnInPackingTasksList, String taskGroup,String basketBarcode,SupplyRoomConfig config, List<Object[]> tousseNamesAndTaskTypes, String tousseOrDepart, String recyclingAmountConfirmSql, boolean enableUrgentFunction