Index: ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
===================================================================
diff -u -r38113 -r38229
--- ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java	(.../PackingManagerImpl.java)	(revision 38113)
+++ ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java	(.../PackingManagerImpl.java)	(revision 38229)
@@ -2320,7 +2320,7 @@
 			tdIdSet.add(td.getId());
 		}
 		//查询包定义的配包注意事项
-		String hql = String.format("select po from %s po where %s", TousseDefinitionNote.class.getSimpleName(), SqlUtils.getNonStringFieldInLargeCollectionsPredicate("po.tousseDefinitionId", tdIdSet));
+		String hql = String.format("select po from %s po where %s and exists (select 1 from "+ TousseDefinition.class.getSimpleName() +" td where td.id=po.tousseDefinitionId and td.showTousseNote='是')", TousseDefinitionNote.class.getSimpleName(), SqlUtils.getNonStringFieldInLargeCollectionsPredicate("po.tousseDefinitionId", tdIdSet));
 		List<TousseDefinitionNote> notes = objectDao.findByHql(hql);
 		if(CollectionUtils.isEmpty(notes)){
 			return result;