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 #1403 from hapifhir/2023-08-gg-more-tx-test-fixes-2 

2023 08 gg more tx test fixes 2
This commit is contained in:
Grahame Grieve 2023-08-22 14:30:42 +10:00 committed by GitHub
parent 504e02bd32 e11f03bd8a
commit f3d6541eef
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
RELEASE_NOTES.md
View File

@ -9,6 +9,8 @@
* Fix issue in FHIRPath .combine focus handling * Fix issue in FHIRPath .combine focus handling
* Check Extension fixed values for URLs - enforce consistency * Check Extension fixed values for URLs - enforce consistency
* Fix R4 FML parser problem * 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 ## Other code changes
@ -24,8 +26,11 @@
* Remove spurious logging in FHIRPath engine * Remove spurious logging in FHIRPath engine
* Fix addChild error in PEBuilder (#1343) + Add test case * Fix addChild error in PEBuilder (#1343) + Add test case
* CPT Importer * CPT Importer
* Dependencies fixed: okhttp, thymeleaf, and commonmark * Dependencies fixed/updated: okhttp, thymeleaf, commonmark & UCUM
* Xhtml fluent improvements + related XHtmlNode improvements * Xhtml fluent improvements + related XHtmlNode improvements
* Release new pubpack for new icons * Release new pubpack for new icons
* Json Object comparison: fix bug in arrays with multiple optional elements + improved error messages + support for external strings * 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 * 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

7
org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/terminologies/expansion/ValueSetExpander.java
View File

@ -207,7 +207,12 @@ public class ValueSetExpander extends ValueSetProcessBase {
String dstLang = focus.getLanguage(); String dstLang = focus.getLanguage();
boolean usedDisplay = false; 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) { if (tu != null) {
n.setDisplay(tu.getValue()); n.setDisplay(tu.getValue());
} else if (display != null && (srcLang == null || dstLang == null || LanguageUtils.langsMatch(dstLang, srcLang))) { } else if (display != null && (srcLang == null || dstLang == null || LanguageUtils.langsMatch(dstLang, srcLang))) {