From 013cff09b7074f60ea4ee04f5c3405d103ade754 Mon Sep 17 00:00:00 2001 From: Grahame Grieve Date: Tue, 22 Aug 2023 10:55:25 +1000 Subject: [PATCH 1/2] release notes --- RELEASE_NOTES.md | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md index 4e2c73bec..e15efa97b 100644 --- a/RELEASE_NOTES.md +++ b/RELEASE_NOTES.md @@ -9,6 +9,8 @@ * Fix issue in FHIRPath .combine focus handling * Check Extension fixed values for URLs - enforce consistency * Fix R4 FML parser problem +* Track and report inactive status when reported from terminology server +* Add defense against large terminology operations causing obscure java errors ## Other code changes @@ -24,8 +26,11 @@ * Remove spurious logging in FHIRPath engine * Fix addChild error in PEBuilder (#1343) + Add test case * CPT Importer -* Dependencies fixed: okhttp, thymeleaf, and commonmark +* Dependencies fixed/updated: okhttp, thymeleaf, commonmark & UCUM * Xhtml fluent improvements + related XHtmlNode improvements * Release new pubpack for new icons * Json Object comparison: fix bug in arrays with multiple optional elements + improved error messages + support for external strings * fix cross-version extensions web references where possible +* Don't suppress exceptions in terminology clients +* Add first cut of Profile Generation code +* Stop putting invalid codes in expansions if they are not in the code system \ No newline at end of file From e11f03bd8a2b0f9fed0cefdcde0bd895ec47b65a Mon Sep 17 00:00:00 2001 From: Grahame Grieve Date: Tue, 22 Aug 2023 12:08:53 +1000 Subject: [PATCH 2/2] Fix erroneous handling of designations with a matching language to the base display --- .../fhir/r5/terminologies/expansion/ValueSetExpander.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/terminologies/expansion/ValueSetExpander.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/terminologies/expansion/ValueSetExpander.java index bb6c813ea..d5db1aa38 100644 --- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/terminologies/expansion/ValueSetExpander.java +++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/terminologies/expansion/ValueSetExpander.java @@ -207,7 +207,12 @@ public class ValueSetExpander extends ValueSetProcessBase { String dstLang = focus.getLanguage(); boolean usedDisplay = false; - ConceptDefinitionDesignationComponent tu = expParams.hasParameter("displayLanguage") ? getMatchingLang(designations, expParams.getParameterString("displayLanguage")) : null; + ConceptDefinitionDesignationComponent tu; + if (LanguageUtils.langsMatch(dstLang, dispLang)) { + tu = null; // use display + } else { + tu = expParams.hasParameter("displayLanguage") ? getMatchingLang(designations, expParams.getParameterString("displayLanguage")) : null; + } if (tu != null) { n.setDisplay(tu.getValue()); } else if (display != null && (srcLang == null || dstLang == null || LanguageUtils.langsMatch(dstLang, srcLang))) {