honeymoose
/
org.hl7.fhir.core
mirror of https://github.com/hapifhir/org.hl7.fhir.core.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

merge

This commit is contained in:
Grahame Grieve 2022-01-30 07:57:39 +11:00
parent ccfd715a5a f7c146f1ff
commit 1aa1e288ec
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/utils/FHIRPathEngine.java
View File

@ -2367,7 +2367,7 @@ public class FHIRPathEngine {
if (vs != null) { if (vs != null) {
for (Base l : left) { for (Base l : left) {
if (Utilities.existsInList(l.fhirType(), "code", "string", "uri")) { if (Utilities.existsInList(l.fhirType(), "code", "string", "uri")) {
if (worker.validateCode(terminologyServiceOptions.guessSystem(), TypeConvertor.castToCoding(l), vs).isOk()) { if (worker.validateCode(terminologyServiceOptions.guessSystem() , TypeConvertor.castToCoding(l), vs).isOk()) {
ans = true; ans = true;
} }
} else if (l.fhirType().equals("Coding")) { } else if (l.fhirType().equals("Coding")) {
@ -5734,4 +5734,4 @@ public class FHIRPathEngine {
} }
} }

7
org.hl7.fhir.utilities/src/main/java/org/hl7/fhir/utilities/VersionUtilities.java
View File

@ -75,6 +75,10 @@ public class VersionUtilities {
if (isR4BVer(v)) { if (isR4BVer(v)) {
return "hl7.fhir.r4b.core"; return "hl7.fhir.r4b.core";
} }
if (isR5Ver(v)) {
return "hl7.fhir.r5.core";
}
if ("current".equals(v)) { if ("current".equals(v)) {
return "hl7.fhir.r5.core"; return "hl7.fhir.r5.core";
@ -101,6 +105,9 @@ public class VersionUtilities {
if (isR4Ver(v)) { if (isR4Ver(v)) {
return "4.0.1"; return "4.0.1";
} }
if (isR5Ver(v)) {
return "5.0.0";
}
if (v != null && v.startsWith(CURRENT_VERSION)) { if (v != null && v.startsWith(CURRENT_VERSION)) {
return "current"; return "current";
} }