honeymoose/org.hl7.fhir.core
1
0
Fork 0
mirror of https://github.com/hapifhir/org.hl7.fhir.core.git synced 2025-02-09 14:24:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Do not supercede R4 terminology when loading R5 IGs

Browse Source
This commit is contained in:
Grahame Grieve 2023-08-04 18:42:40 +10:00
parent e0b9a6dcc7
commit f1571ea2b4
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/conformance/R5ExtensionsLoader.java
View File

@ -192,13 +192,17 @@ public class R5ExtensionsLoader {
for (CanonicalType t : inc.getValueSet()) { for (CanonicalType t : inc.getValueSet()) {
loadValueSet(t.asStringValue(), context, valueSets, codeSystems); loadValueSet(t.asStringValue(), context, valueSets, codeSystems);
} }
if (inc.hasSystem() && !inc.hasVersion()) { if (inc.hasSystem()) {
if (codeSystems.containsKey(inc.getSystem())) { if (!inc.hasVersion()) {
CodeSystem cs = codeSystems.get(inc.getSystem()).getResource(); if (codeSystems.containsKey(inc.getSystem())) {
inc.setVersion(cs.getVersion()); CodeSystem cs = codeSystems.get(inc.getSystem()).getResource();
context.cacheResourceFromPackage(cs, cs.getSourcePackage()); CodeSystem csAlready = context.fetchCodeSystem(inc.getSystem());
} else if (!context.hasResource(CodeSystem.class, inc.getSystem()) && codeSystems.containsKey(inc.getSystem())) { if (csAlready == null) {
CodeSystem cs1 = codeSystems.get(inc.getSystem()).getResource(); context.cacheResourceFromPackage(cs, cs.getSourcePackage());
}
}
} else if (context.fetchResource(CodeSystem.class, inc.getSystem(), inc.getVersion()) == null && codeSystems.containsKey(inc.getSystem()+"|"+inc.getVersion())) {
CodeSystem cs1 = codeSystems.get(inc.getSystem()+"|"+inc.getVersion()).getResource();
context.cacheResourceFromPackage(cs1, cs1.getSourcePackage()); context.cacheResourceFromPackage(cs1, cs1.getSourcePackage());
} }
} }