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 branch 'master' into gg-20210617-cda

This commit is contained in:
Grahame Grieve 2021-06-17 16:56:47 +10:00 committed by GitHub
parent a77ae61616 d0e225fdb3
commit 40c68d6e4a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 26 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
RELEASE_NOTES.md
View File

@ -6,7 +6,12 @@ Validator:
* add the -verbose parameter, and add additional verbose messages
* CDA: Fix erroneous type validation on CDA templates
Conversion code:
* Ignoring abatementBoolean when converting from dstu2 to r4
Snapshot generator:
* CDA: Suppress erroneous "Expansion" text appearing in view
* CDA: Don't delete binding information in snapshot for CDA bindable data types
@ -18,5 +23,3 @@ Other code changes:
* Improve rendering of questionnaires (icons, option sets)
* Rendering: add support for CodeableReference
* Rendering: Support binding mode and XML element information

2
org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv10_40/Condition10_40.java
View File

@ -30,7 +30,7 @@ public class Condition10_40 {
tgt.setSeverity(VersionConvertor_10_40.convertCodeableConcept(src.getSeverity()));
if (src.hasOnset())
tgt.setOnset(VersionConvertor_10_40.convertType(src.getOnset()));
if (src.hasAbatement())
if (src.hasAbatement() && !(src.getAbatement() instanceof org.hl7.fhir.r4.model.BooleanType))
tgt.setAbatement(VersionConvertor_10_40.convertType(src.getAbatement()));
if (src.hasStage())
tgt.setStage(convertConditionStageComponent(src.getStageFirstRep()));