Merge pull request #537 from ItayGoren/bugfix-condition-convert-abatement

can not convert boolean abatement from dstu2 to r4
This commit is contained in:
Grahame Grieve 2021-06-17 09:19:23 +10:00 committed by GitHub
commit d0e225fdb3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 18 additions and 15 deletions

View File

@ -5,10 +5,13 @@ Validator:
* improved validation for some value sets that are based on unknown code systems * improved validation for some value sets that are based on unknown code systems
* add the -verbose parameter, and add additional verbose messages * add the -verbose parameter, and add additional verbose messages
Conversion code:
* Ignoring abatementBoolean when converting from dstu2 to r4
Other code changes: Other code changes:
* Fix rendering of slices so type on slicer is not hidden * 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 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 * Fix NPE rendering code systems with some kinds of properties
* Improve rendering of questionnaires (icons, option sets) * Improve rendering of questionnaires (icons, option sets)

View File

@ -30,7 +30,7 @@ public class Condition10_40 {
tgt.setSeverity(VersionConvertor_10_40.convertCodeableConcept(src.getSeverity())); tgt.setSeverity(VersionConvertor_10_40.convertCodeableConcept(src.getSeverity()));
if (src.hasOnset()) if (src.hasOnset())
tgt.setOnset(VersionConvertor_10_40.convertType(src.getOnset())); 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())); tgt.setAbatement(VersionConvertor_10_40.convertType(src.getAbatement()));
if (src.hasStage()) if (src.hasStage())
tgt.setStage(convertConditionStageComponent(src.getStageFirstRep())); tgt.setStage(convertConditionStageComponent(src.getStageFirstRep()));