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

fix issue with converting Communication between R4 and R5

This commit is contained in:
Grahame Grieve 2020-01-24 17:18:34 +11:00
parent 2b1021adbd
commit ce28b6d1eb
1 changed files with 23 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv40_50/Communication.java
View File

@ -22,7 +22,10 @@ package org.hl7.fhir.convertors.conv40_50;
import org.hl7.fhir.exceptions.FHIRException;
import org.hl7.fhir.r4.model.StringType;
import org.hl7.fhir.r5.model.CodeableConcept;
import org.hl7.fhir.r5.model.CodeableReference;
import org.hl7.fhir.r5.model.DataType;
import org.hl7.fhir.convertors.VersionConvertor_40_50;
@ -231,8 +234,16 @@ public class Communication extends VersionConvertor_40_50 {
return null;
org.hl7.fhir.r5.model.Communication.CommunicationPayloadComponent tgt = new org.hl7.fhir.r5.model.Communication.CommunicationPayloadComponent();
copyElement(src, tgt);
if (src.hasContent())
tgt.setContent(convertType(src.getContent()));
if (src.hasContent()) {
if (src.getContent() instanceof StringType) {
CodeableConcept tgtc = new CodeableConcept();
copyElement(src.getContent(), tgtc);
tgtc.setText(src.getContentStringType().getValue());
tgt.setContent(tgtc);
} else {
tgt.setContent(convertType(src.getContent()));
}
}
return tgt;
}
@ -241,8 +252,16 @@ public class Communication extends VersionConvertor_40_50 {
return null;
org.hl7.fhir.r4.model.Communication.CommunicationPayloadComponent tgt = new org.hl7.fhir.r4.model.Communication.CommunicationPayloadComponent();
copyElement(src, tgt);
if (src.hasContent())
tgt.setContent(convertType(src.getContent()));
if (src.hasContent()) {
if (src.hasContentCodeableConcept()) {
StringType tgts = new StringType();
copyElement(src.getContent(), tgts);
tgts.setValue(src.getContentCodeableConcept().getText());
tgt.setContent(tgts);
} else {
tgt.setContent(convertType(src.getContent()));
}
}
return tgt;
}