Index: ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
===================================================================
diff -u -r33489 -r33494
--- ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java	(.../PackingManagerImpl.java)	(revision 33489)
+++ ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java	(.../PackingManagerImpl.java)	(revision 33494)
@@ -1930,7 +1930,7 @@
 		List<Object[]> tousseNamesAndTasks = objectDao.findByHql(String.format("select po.tousseDefinition.name,case when po.taskType="+ PackingTask.TASK_RECYCLINGRECORD +" then 1 else 0 end from %s po left join po.urgentLevelObj where 1=1 %s %s group by po.tousseDefinition.name,case when po.taskType=1 then 1 else 0 end order by max(po.urgentLevelObj.grade) desc, case when po.taskType=1 then 1 else 0 end desc, po.tousseDefinition.name desc "				
 				, PackingTask.class.getSimpleName()
 				,StringUtils.isBlank(basketBarcode)?"":" and po.basketBarcode like '%" + basketBarcode + "%' "
-				,StringUtils.isBlank(taskGroup)?"":" and po.tousseDefinition.ancestorID in (select id from TousseDefinition where forDisplay=1 and taskGroup='"+ taskGroup +"') ")
+				,StringUtils.isBlank(taskGroup)?"":" and po.tousseDefinition.ancestorID in (select id from TousseDefinition where (hidePackingTask is null or hidePackingTask<>'是') and forDisplay=1 and taskGroup='"+ taskGroup +"') ")
 				, (pageIndex - 1) * pageSize, pageSize);
 		return tousseNamesAndTasks;
 	}
@@ -1939,7 +1939,7 @@
 		String sql = "select count(distinct td.name) from PackingTask po "
 				+ " join TousseDefinition td on td.id=po.tousseDefinition_id "
 				+ " join TousseDefinition tdc on tdc.id=td.ancestorID "
-				+ " where tdc.forDisplay=1 ";
+				+ " where (tdc.hidePackingTask is null or tdc.hidePackingTask<>'是') and tdc.forDisplay=1 ";
 		if(StringUtils.isNotBlank(taskGroup)){
 			sql += " and tdc.taskGroup='"+ taskGroup +"'";
 		}