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 pull request #1626 from hapifhir/2024-05-gg-snapshot-extension 

Fix bug processing extension with explicit type slicing
This commit is contained in:
Grahame Grieve 2024-05-20 03:05:17 -05:00 committed by GitHub
parent b82b6dedf5 2d226fdf51
commit ac11a1c5cd
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
org.hl7.fhir.r4/src/main/java/org/hl7/fhir/r4/utils/client/network/FhirRequestBuilder.java
View File

@ -284,7 +284,7 @@ public class FhirRequestBuilder {
reqid = response.header("X-Request-Id"); reqid = response.header("X-Request-Id");
} }
if (reqid != null) { if (reqid != null) {
s = s + " ["+reqid+"]"; s = s + " [x-request-id: "+reqid+"]";
} }
System.out.println("Error from "+source+": " + s); System.out.println("Error from "+source+": " + s);
throw new EFhirClientException("Error from "+source+": " + ResourceUtilities.getErrorDescription(error), error); throw new EFhirClientException("Error from "+source+": " + ResourceUtilities.getErrorDescription(error), error);

2
org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/conformance/profile/ProfilePathProcessor.java
View File

@ -559,7 +559,7 @@ public class ProfilePathProcessor {
} }
} }
if (!allowedTypes.isEmpty()) { if (!allowedTypes.isEmpty()) {
if (currentBasePath.contains("xtension.value")) { if (currentBasePath.contains("xtension.value") && shortCut) {
for (Iterator<ElementDefinition.TypeRefComponent> iter = elementDefinition.getType().iterator(); iter.hasNext(); ) { for (Iterator<ElementDefinition.TypeRefComponent> iter = elementDefinition.getType().iterator(); iter.hasNext(); ) {
ElementDefinition.TypeRefComponent tr = iter.next(); ElementDefinition.TypeRefComponent tr = iter.next();
if (allowedTypes.contains(tr.getCode())) { if (allowedTypes.contains(tr.getCode())) {

2
org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/renderers/DataRenderer.java
View File

@ -327,7 +327,7 @@ public class DataRenderer extends Renderer implements CodeResolver {
if (JurisdictionUtilities.isJurisdiction(system)) { if (JurisdictionUtilities.isJurisdiction(system)) {
return JurisdictionUtilities.displayJurisdiction(system+"#"+code); return JurisdictionUtilities.displayJurisdiction(system+"#"+code);
} }
ValidationResult t = getContext().getWorker().validateCode(getContext().getTerminologyServiceOptions().withLanguage(context.getLocale().toString()).withVersionFlexible(true), system, version, code, null); ValidationResult t = getContext().getWorker().validateCode(getContext().getTerminologyServiceOptions().withLanguage(context.getLocale().toString().replace("_", "-")).withVersionFlexible(true), system, version, code, null);
if (t != null && t.getDisplay() != null) if (t != null && t.getDisplay() != null)
return t.getDisplay(); return t.getDisplay();