Index: ssts-web/src/main/java/com/forgon/disinfectsystem/directory/dwr/table/OrgUnitTableManager.java =================================================================== diff -u -r12668 -r13969 --- ssts-web/src/main/java/com/forgon/disinfectsystem/directory/dwr/table/OrgUnitTableManager.java (.../OrgUnitTableManager.java) (revision 12668) +++ ssts-web/src/main/java/com/forgon/disinfectsystem/directory/dwr/table/OrgUnitTableManager.java (.../OrgUnitTableManager.java) (revision 13969) @@ -15,6 +15,7 @@ import com.forgon.directory.service.OrgUnitManager; import com.forgon.directory.vo.LoginUserData; import com.forgon.disinfectsystem.basedatamanager.supplyroomconfig.service.SupplyRoomConfigManager; +import com.forgon.disinfectsystem.entity.basedatamanager.toussedefinition.TousseDefinition; import com.forgon.reflect.ReflectUtil; import com.forgon.tools.hibernate.ObjectDao; import com.forgon.tools.json.JSONUtil; @@ -212,6 +213,11 @@ // 科室必须有申领科室配置(科室供应室配置) String orgCoding = orgUnit.getOrgUnitCoding(); if (recyclingDepartMap.get(orgCoding) != null) { + //判断当前科室是否配置所选科室 + if(objectDao.getBySql(CssdServiceDepts.class.getSimpleName(), " where cssdOrgUnitCode='" + AcegiHelper.getCurrentOrgUnitCode() + + "' and clinicOrgUnitCode='" + orgUnit.getOrgUnitCoding() + "' and tousseType='" + TousseDefinition.PACKAGE_TYPE_INSIDE + "' ") == null){ + continue; + } String orgUnitName = orgUnit.getName(); buffer.append(orgUnit.getOrgUnitCoding() + "," + orgUnitName + "," + orgUnit.getBarcode() + ";");