Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/service/ForeignTousseApplicationManagerImpl.java =================================================================== diff -u -r34164 -r34266 --- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/service/ForeignTousseApplicationManagerImpl.java (.../ForeignTousseApplicationManagerImpl.java) (revision 34164) +++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/service/ForeignTousseApplicationManagerImpl.java (.../ForeignTousseApplicationManagerImpl.java) (revision 34266) @@ -2433,7 +2433,7 @@ //按照科室分组,分开打印外来器械包申请单;没有选中科室分组时,默认为打印全部科室分组的申请单 List orgUnitGroupList = new ArrayList(); if(StringUtils.isBlank(orgUnitGroupIDs)){ - orgUnitGroupList = objectDao.findAllObjects(OrgUnitGroup.class.getSimpleName()); + orgUnitGroupList = objectDao.findByProperty(OrgUnitGroup.class.getSimpleName(), "groupType", OrgUnitGroup.GROUP_TYPE_ORG_GROUP); }else{ Collection idCollect = StringTools.toCollectionIgnoreNullAndBlank(orgUnitGroupIDs, ";"); orgUnitGroupList = objectDao.findByIds(OrgUnitGroup.class.getSimpleName(), new ArrayList(idCollect));