work around loading issue for R2B

This commit is contained in:
Grahame Grieve 2020-06-03 09:31:53 +10:00
parent 7ac1b1f0e0
commit 47c7dfd5e5
1 changed files with 36 additions and 33 deletions

View File

@ -1482,6 +1482,8 @@ public class VersionConvertor_14_50 {
tgt.setBase(convertElementDefinitionBaseComponent(src.getBase())); tgt.setBase(convertElementDefinitionBaseComponent(src.getBase()));
if (src.hasContentReference()) if (src.hasContentReference())
tgt.setContentReferenceElement(convertUri(src.getContentReferenceElement())); tgt.setContentReferenceElement(convertUri(src.getContentReferenceElement()));
// work around for problem in R2B definitions:
if (!src.hasContentReference()) {
for (org.hl7.fhir.dstu2016may.model.ElementDefinition.TypeRefComponent t : src.getType()) convertTypeRefComponent(t, tgt.getType()); for (org.hl7.fhir.dstu2016may.model.ElementDefinition.TypeRefComponent t : src.getType()) convertTypeRefComponent(t, tgt.getType());
if (src.hasDefaultValue()) if (src.hasDefaultValue())
tgt.setDefaultValue(convertType(src.getDefaultValue())); tgt.setDefaultValue(convertType(src.getDefaultValue()));
@ -1516,6 +1518,7 @@ public class VersionConvertor_14_50 {
if (src.hasBinding()) if (src.hasBinding())
tgt.setBinding(convertElementDefinitionBindingComponent(src.getBinding())); tgt.setBinding(convertElementDefinitionBindingComponent(src.getBinding()));
for (org.hl7.fhir.dstu2016may.model.ElementDefinition.ElementDefinitionMappingComponent t : src.getMapping()) tgt.addMapping(convertElementDefinitionMappingComponent(t)); for (org.hl7.fhir.dstu2016may.model.ElementDefinition.ElementDefinitionMappingComponent t : src.getMapping()) tgt.addMapping(convertElementDefinitionMappingComponent(t));
}
return tgt; return tgt;
} }