diff --git a/src/main/java/org/snomed/snowstorm/core/data/domain/Concepts.java b/src/main/java/org/snomed/snowstorm/core/data/domain/Concepts.java index b533312d3..7fe2f3b7e 100644 --- a/src/main/java/org/snomed/snowstorm/core/data/domain/Concepts.java +++ b/src/main/java/org/snomed/snowstorm/core/data/domain/Concepts.java @@ -14,6 +14,7 @@ public class Concepts { public static final String CORE_MODULE = "900000000000207008"; public static final String MODEL_MODULE = "900000000000012004"; public static final String ICD10_MODULE = "449080006"; + public static final String ICD11_MODULE = "1204363008"; public static final String COMMON_FRENCH_MODULE = "11000241103"; public static final String MODULE = "900000000000443000"; diff --git a/src/main/java/org/snomed/snowstorm/core/data/services/ModuleDependencyService.java b/src/main/java/org/snomed/snowstorm/core/data/services/ModuleDependencyService.java index 3263e4c19..c6e6140c8 100644 --- a/src/main/java/org/snomed/snowstorm/core/data/services/ModuleDependencyService.java +++ b/src/main/java/org/snomed/snowstorm/core/data/services/ModuleDependencyService.java @@ -42,7 +42,7 @@ public class ModuleDependencyService extends ComponentService { public static final Set CORE_MODULES = Set.of(Concepts.CORE_MODULE, Concepts.MODEL_MODULE); - public Set SI_MODULES = new HashSet<>(Set.of(Concepts.CORE_MODULE, Concepts.MODEL_MODULE, Concepts.ICD10_MODULE)); + public Set SI_MODULES = new HashSet<>(Set.of(Concepts.CORE_MODULE, Concepts.MODEL_MODULE, Concepts.ICD10_MODULE, Concepts.ICD11_MODULE)); @Autowired private BranchService branchService; @@ -94,10 +94,13 @@ public synchronized void refreshCache() { cacheValidAt = currentTime; logger.info("MDR cache of International Modules refreshed for HEAD time: {}", currentTime); - //During unit tests, or in non-standard installations we might not see the ICD-10 Module + //During unit tests, or in non-standard installations we might not see the ICD-10 and ICD-11 Modules if (!cachedInternationalModules.contains(Concepts.ICD10_MODULE)) { SI_MODULES.remove(Concepts.ICD10_MODULE); } + if (!cachedInternationalModules.contains(Concepts.ICD11_MODULE)) { + SI_MODULES.remove(Concepts.ICD11_MODULE); + } derivativeModules = cachedInternationalModules.stream() .filter(m -> !SI_MODULES.contains(m))