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' of https://github.com/hapifhir/org.hl7.fhir.core

This commit is contained in:
Grahame Grieve 2019-10-28 18:07:14 +11:00
parent efd20a22fe ca7b391b05
commit b28b8f44fa
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/VersionConvertor_10_50.java
View File

@ -10300,7 +10300,7 @@ public class VersionConvertor_10_50 {
tgt.setFhirVersion(org.hl7.fhir.r5.model.Enumerations.FHIRVersion.fromCode(src.getFhirVersion())); tgt.setFhirVersion(org.hl7.fhir.r5.model.Enumerations.FHIRVersion.fromCode(src.getFhirVersion()));
for (org.hl7.fhir.dstu2.model.StructureDefinition.StructureDefinitionMappingComponent t : src.getMapping()) for (org.hl7.fhir.dstu2.model.StructureDefinition.StructureDefinitionMappingComponent t : src.getMapping())
tgt.addMapping(convertStructureDefinitionMappingComponent(t)); tgt.addMapping(convertStructureDefinitionMappingComponent(t));
tgt.setKind(convertStructureDefinitionKind(src.getKind(), tgt.getId())); tgt.setKind(convertStructureDefinitionKind(src.getKind(), tgt.getIdElement().getIdPart()));
tgt.setAbstract(src.getAbstract()); tgt.setAbstract(src.getAbstract());
for (org.hl7.fhir.dstu2.model.StringType t : src.getContext()) { for (org.hl7.fhir.dstu2.model.StringType t : src.getContext()) {
org.hl7.fhir.r5.model.StructureDefinition.StructureDefinitionContextComponent ec = tgt.addContext(); org.hl7.fhir.r5.model.StructureDefinition.StructureDefinitionContextComponent ec = tgt.addContext();
@ -10325,7 +10325,7 @@ public class VersionConvertor_10_50 {
tgt.getDifferential().getElementFirstRep().getType().clear(); tgt.getDifferential().getElementFirstRep().getType().clear();
if (tgt.getKind() == StructureDefinitionKind.PRIMITIVETYPE && !tgt.getType().equals(tgt.getId())) { if (tgt.getKind() == StructureDefinitionKind.PRIMITIVETYPE && !tgt.getType().equals(tgt.getIdElement().getIdPart())) {
tgt.setDerivation(TypeDerivationRule.SPECIALIZATION); tgt.setDerivation(TypeDerivationRule.SPECIALIZATION);
tgt.setBaseDefinition("http://hl7.org/fhir/StructureDefinition/"+tgt.getType()); tgt.setBaseDefinition("http://hl7.org/fhir/StructureDefinition/"+tgt.getType());
// for (ElementDefinition ed : tgt.getSnapshot().getElement()) { // for (ElementDefinition ed : tgt.getSnapshot().getElement()) {
@ -10334,7 +10334,7 @@ public class VersionConvertor_10_50 {
// for (ElementDefinition ed : tgt.getDifferential().getElement()) { // for (ElementDefinition ed : tgt.getDifferential().getElement()) {
// ed.setPath(ed.getPath().replace(tgt.getType()+".", tgt.getId()+".")); // ed.setPath(ed.getPath().replace(tgt.getType()+".", tgt.getId()+"."));
// } // }
tgt.setType(tgt.getId()); tgt.setType(tgt.getIdElement().getIdPart());
} }
if (tgt.getDerivation() == TypeDerivationRule.SPECIALIZATION) { if (tgt.getDerivation() == TypeDerivationRule.SPECIALIZATION) {
for (ElementDefinition ed : tgt.getSnapshot().getElement()) { for (ElementDefinition ed : tgt.getSnapshot().getElement()) {