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
commit 40c68d6e4a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 26 additions and 23 deletions

View File

@ -1,22 +1,25 @@
Validator:
* Add support for $index on aggregators in FHIRPath
* don't fail with an exception if an unknown resource type appears in contained resource
* improved validation for some value sets that are based on unknown code systems
* add the -verbose parameter, and add additional verbose messages
* CDA: Fix erroneous type validation on CDA templates
Snapshot generator:
* CDA: Suppress erroneous "Expansion" text appearing in view
* CDA: Don't delete binding information in snapshot for CDA bindable data types
Other code changes:
* Fix rendering of slices so type on slicer is not hidden
* Fix rendering for most resources - remove empty tables (e.g. text element, that shouldn't render)
* Fix NPE rendering code systems with some kinds of properties
* Improve rendering of questionnaires (icons, option sets)
* Rendering: add support for CodeableReference
* Rendering: Support binding mode and XML element information
Validator:
* Add support for $index on aggregators in FHIRPath
* don't fail with an exception if an unknown resource type appears in contained resource
* improved validation for some value sets that are based on unknown code systems
* 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
Other code changes:
* Fix rendering of slices so type on slicer is not hidden
* Fix rendering for most resources - remove empty tables (e.g. text element, that shouldn't render)
* Fix NPE rendering code systems with some kinds of properties
* Improve rendering of questionnaires (icons, option sets)
* Rendering: add support for CodeableReference
* Rendering: Support binding mode and XML element information

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()));