From 34ac72ab9339d58e8c7e427aa91c24fbb39cc6cd Mon Sep 17 00:00:00 2001 From: Augustas Vilcinskas Date: Mon, 4 Dec 2023 17:31:35 +0100 Subject: [PATCH] Fix StringType conversion in HumanName convertors --- .../complextypes10_30/HumanName10_30.java | 16 ++++++++-------- .../complextypes10_40/HumanName10_40.java | 16 ++++++++-------- .../complextypes10_50/HumanName10_50.java | 16 ++++++++-------- .../complextypes14_30/HumanName14_30.java | 16 ++++++++-------- .../complextypes14_40/HumanName14_40.java | 16 ++++++++-------- .../complextypes14_50/HumanName14_50.java | 16 ++++++++-------- .../complextypes30_40/HumanName30_40.java | 12 ++++++------ .../complextypes30_50/HumanName30_50.java | 12 ++++++------ 8 files changed, 60 insertions(+), 60 deletions(-) diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv10_30/datatypes10_30/complextypes10_30/HumanName10_30.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv10_30/datatypes10_30/complextypes10_30/HumanName10_30.java index 8ebeefd0e..918e5702e 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv10_30/datatypes10_30/complextypes10_30/HumanName10_30.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv10_30/datatypes10_30/complextypes10_30/HumanName10_30.java @@ -11,10 +11,10 @@ public class HumanName10_30 { ConversionContext10_30.INSTANCE.getVersionConvertor_10_30().copyElement(src, tgt); if (src.hasUse()) tgt.setUseElement(convertNameUse(src.getUseElement())); if (src.hasTextElement()) tgt.setTextElement(String10_30.convertString(src.getTextElement())); - for (org.hl7.fhir.dstu2.model.StringType t : src.getFamily()) tgt.setFamily(t.getValue()); - for (org.hl7.fhir.dstu2.model.StringType t : src.getGiven()) tgt.addGiven(t.getValue()); - for (org.hl7.fhir.dstu2.model.StringType t : src.getPrefix()) tgt.addPrefix(t.getValue()); - for (org.hl7.fhir.dstu2.model.StringType t : src.getSuffix()) tgt.addSuffix(t.getValue()); + for (org.hl7.fhir.dstu2.model.StringType t : src.getFamily()) tgt.setFamilyElement(String10_30.convertString(t)); + for (org.hl7.fhir.dstu2.model.StringType t : src.getGiven()) tgt.getGiven().add(String10_30.convertString(t)); + for (org.hl7.fhir.dstu2.model.StringType t : src.getPrefix()) tgt.getPrefix().add(String10_30.convertString(t)); + for (org.hl7.fhir.dstu2.model.StringType t : src.getSuffix()) tgt.getSuffix().add(String10_30.convertString(t)); if (src.hasPeriod()) tgt.setPeriod(Period10_30.convertPeriod(src.getPeriod())); return tgt; } @@ -25,10 +25,10 @@ public class HumanName10_30 { ConversionContext10_30.INSTANCE.getVersionConvertor_10_30().copyElement(src, tgt); if (src.hasUse()) tgt.setUseElement(convertNameUse(src.getUseElement())); if (src.hasTextElement()) tgt.setTextElement(String10_30.convertString(src.getTextElement())); - if (src.hasFamily()) tgt.addFamily(src.getFamily()); - for (org.hl7.fhir.dstu3.model.StringType t : src.getGiven()) tgt.addGiven(t.getValue()); - for (org.hl7.fhir.dstu3.model.StringType t : src.getPrefix()) tgt.addPrefix(t.getValue()); - for (org.hl7.fhir.dstu3.model.StringType t : src.getSuffix()) tgt.addSuffix(t.getValue()); + if (src.hasFamily()) tgt.getFamily().add(String10_30.convertString(src.getFamilyElement())); + for (org.hl7.fhir.dstu3.model.StringType t : src.getGiven()) tgt.getGiven().add(String10_30.convertString(t)); + for (org.hl7.fhir.dstu3.model.StringType t : src.getPrefix()) tgt.getPrefix().add(String10_30.convertString(t)); + for (org.hl7.fhir.dstu3.model.StringType t : src.getSuffix()) tgt.getSuffix().add(String10_30.convertString(t)); if (src.hasPeriod()) tgt.setPeriod(Period10_30.convertPeriod(src.getPeriod())); return tgt; } diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv10_40/datatypes10_40/complextypes10_40/HumanName10_40.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv10_40/datatypes10_40/complextypes10_40/HumanName10_40.java index 60b6c8831..80508d9a5 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv10_40/datatypes10_40/complextypes10_40/HumanName10_40.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv10_40/datatypes10_40/complextypes10_40/HumanName10_40.java @@ -11,10 +11,10 @@ public class HumanName10_40 { ConversionContext10_40.INSTANCE.getVersionConvertor_10_40().copyElement(src, tgt); if (src.hasUse()) tgt.setUseElement(convertNameUse(src.getUseElement())); if (src.hasTextElement()) tgt.setTextElement(String10_40.convertString(src.getTextElement())); - for (org.hl7.fhir.dstu2.model.StringType t : src.getFamily()) tgt.setFamily(t.getValue()); - for (org.hl7.fhir.dstu2.model.StringType t : src.getGiven()) tgt.addGiven(t.getValue()); - for (org.hl7.fhir.dstu2.model.StringType t : src.getPrefix()) tgt.addPrefix(t.getValue()); - for (org.hl7.fhir.dstu2.model.StringType t : src.getSuffix()) tgt.addSuffix(t.getValue()); + for (org.hl7.fhir.dstu2.model.StringType t : src.getFamily()) tgt.setFamilyElement(String10_40.convertString(t)); + for (org.hl7.fhir.dstu2.model.StringType t : src.getGiven()) tgt.getGiven().add(String10_40.convertString(t)); + for (org.hl7.fhir.dstu2.model.StringType t : src.getPrefix()) tgt.getPrefix().add(String10_40.convertString(t)); + for (org.hl7.fhir.dstu2.model.StringType t : src.getSuffix()) tgt.getSuffix().add(String10_40.convertString(t)); if (src.hasPeriod()) tgt.setPeriod(Period10_40.convertPeriod(src.getPeriod())); return tgt; } @@ -25,10 +25,10 @@ public class HumanName10_40 { ConversionContext10_40.INSTANCE.getVersionConvertor_10_40().copyElement(src, tgt); if (src.hasUse()) tgt.setUseElement(convertNameUse(src.getUseElement())); if (src.hasTextElement()) tgt.setTextElement(String10_40.convertString(src.getTextElement())); - if (src.hasFamily()) tgt.addFamily(src.getFamily()); - for (org.hl7.fhir.r4.model.StringType t : src.getGiven()) tgt.addGiven(t.getValue()); - for (org.hl7.fhir.r4.model.StringType t : src.getPrefix()) tgt.addPrefix(t.getValue()); - for (org.hl7.fhir.r4.model.StringType t : src.getSuffix()) tgt.addSuffix(t.getValue()); + if (src.hasFamily()) tgt.getFamily().add(String10_40.convertString(src.getFamilyElement())); + for (org.hl7.fhir.r4.model.StringType t : src.getGiven()) tgt.getGiven().add(String10_40.convertString(t)); + for (org.hl7.fhir.r4.model.StringType t : src.getPrefix()) tgt.getPrefix().add(String10_40.convertString(t)); + for (org.hl7.fhir.r4.model.StringType t : src.getSuffix()) tgt.getSuffix().add(String10_40.convertString(t)); if (src.hasPeriod()) tgt.setPeriod(Period10_40.convertPeriod(src.getPeriod())); return tgt; } diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv10_50/datatypes10_50/complextypes10_50/HumanName10_50.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv10_50/datatypes10_50/complextypes10_50/HumanName10_50.java index 4d4ba2a94..fde818d51 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv10_50/datatypes10_50/complextypes10_50/HumanName10_50.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv10_50/datatypes10_50/complextypes10_50/HumanName10_50.java @@ -11,10 +11,10 @@ public class HumanName10_50 { ConversionContext10_50.INSTANCE.getVersionConvertor_10_50().copyElement(src, tgt); if (src.hasUse()) tgt.setUseElement(convertNameUse(src.getUseElement())); if (src.hasTextElement()) tgt.setTextElement(String10_50.convertString(src.getTextElement())); - for (org.hl7.fhir.dstu2.model.StringType t : src.getFamily()) tgt.setFamily(t.getValue()); - for (org.hl7.fhir.dstu2.model.StringType t : src.getGiven()) tgt.addGiven(t.getValue()); - for (org.hl7.fhir.dstu2.model.StringType t : src.getPrefix()) tgt.addPrefix(t.getValue()); - for (org.hl7.fhir.dstu2.model.StringType t : src.getSuffix()) tgt.addSuffix(t.getValue()); + for (org.hl7.fhir.dstu2.model.StringType t : src.getFamily()) tgt.setFamilyElement(String10_50.convertString(t)); + for (org.hl7.fhir.dstu2.model.StringType t : src.getGiven()) tgt.getGiven().add(String10_50.convertString(t)); + for (org.hl7.fhir.dstu2.model.StringType t : src.getPrefix()) tgt.getPrefix().add(String10_50.convertString(t)); + for (org.hl7.fhir.dstu2.model.StringType t : src.getSuffix()) tgt.getSuffix().add(String10_50.convertString(t)); if (src.hasPeriod()) tgt.setPeriod(Period10_50.convertPeriod(src.getPeriod())); return tgt; } @@ -25,10 +25,10 @@ public class HumanName10_50 { ConversionContext10_50.INSTANCE.getVersionConvertor_10_50().copyElement(src, tgt); if (src.hasUse()) tgt.setUseElement(convertNameUse(src.getUseElement())); if (src.hasTextElement()) tgt.setTextElement(String10_50.convertString(src.getTextElement())); - if (src.hasFamily()) tgt.addFamily(src.getFamily()); - for (org.hl7.fhir.r5.model.StringType t : src.getGiven()) tgt.addGiven(t.getValue()); - for (org.hl7.fhir.r5.model.StringType t : src.getPrefix()) tgt.addPrefix(t.getValue()); - for (org.hl7.fhir.r5.model.StringType t : src.getSuffix()) tgt.addSuffix(t.getValue()); + if (src.hasFamily()) tgt.getFamily().add(String10_50.convertString(src.getFamilyElement())); + for (org.hl7.fhir.r5.model.StringType t : src.getGiven()) tgt.getGiven().add(String10_50.convertString(t)); + for (org.hl7.fhir.r5.model.StringType t : src.getPrefix()) tgt.getPrefix().add(String10_50.convertString(t)); + for (org.hl7.fhir.r5.model.StringType t : src.getSuffix()) tgt.getSuffix().add(String10_50.convertString(t)); if (src.hasPeriod()) tgt.setPeriod(Period10_50.convertPeriod(src.getPeriod())); return tgt; } diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv14_30/datatypes14_30/complextypes14_30/HumanName14_30.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv14_30/datatypes14_30/complextypes14_30/HumanName14_30.java index 4c2ef82c2..7f16bc7c3 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv14_30/datatypes14_30/complextypes14_30/HumanName14_30.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv14_30/datatypes14_30/complextypes14_30/HumanName14_30.java @@ -11,10 +11,10 @@ public class HumanName14_30 { ConversionContext14_30.INSTANCE.getVersionConvertor_14_30().copyElement(src, tgt); if (src.hasUse()) tgt.setUseElement(convertNameUse(src.getUseElement())); if (src.hasText()) tgt.setTextElement(String14_30.convertString(src.getTextElement())); - for (org.hl7.fhir.dstu2016may.model.StringType t : src.getFamily()) tgt.setFamily(t.getValue()); - for (org.hl7.fhir.dstu2016may.model.StringType t : src.getGiven()) tgt.addGiven(t.getValue()); - for (org.hl7.fhir.dstu2016may.model.StringType t : src.getPrefix()) tgt.addPrefix(t.getValue()); - for (org.hl7.fhir.dstu2016may.model.StringType t : src.getSuffix()) tgt.addSuffix(t.getValue()); + for (org.hl7.fhir.dstu2016may.model.StringType t : src.getFamily()) tgt.setFamilyElement(String14_30.convertString(t)); + for (org.hl7.fhir.dstu2016may.model.StringType t : src.getGiven()) tgt.getGiven().add(String14_30.convertString(t)); + for (org.hl7.fhir.dstu2016may.model.StringType t : src.getPrefix()) tgt.getPrefix().add(String14_30.convertString(t)); + for (org.hl7.fhir.dstu2016may.model.StringType t : src.getSuffix()) tgt.getSuffix().add(String14_30.convertString(t)); if (src.hasPeriod()) tgt.setPeriod(Period14_30.convertPeriod(src.getPeriod())); return tgt; } @@ -25,10 +25,10 @@ public class HumanName14_30 { ConversionContext14_30.INSTANCE.getVersionConvertor_14_30().copyElement(src, tgt); if (src.hasUse()) tgt.setUseElement(convertNameUse(src.getUseElement())); if (src.hasText()) tgt.setTextElement(String14_30.convertString(src.getTextElement())); - if (src.hasFamily()) tgt.addFamily(src.getFamily()); - for (org.hl7.fhir.dstu3.model.StringType t : src.getGiven()) tgt.addGiven(t.getValue()); - for (org.hl7.fhir.dstu3.model.StringType t : src.getPrefix()) tgt.addPrefix(t.getValue()); - for (org.hl7.fhir.dstu3.model.StringType t : src.getSuffix()) tgt.addSuffix(t.getValue()); + if (src.hasFamily()) tgt.getFamily().add(String14_30.convertString(src.getFamilyElement())); + for (org.hl7.fhir.dstu3.model.StringType t : src.getGiven()) tgt.getGiven().add(String14_30.convertString(t)); + for (org.hl7.fhir.dstu3.model.StringType t : src.getPrefix()) tgt.getPrefix().add(String14_30.convertString(t)); + for (org.hl7.fhir.dstu3.model.StringType t : src.getSuffix()) tgt.getSuffix().add(String14_30.convertString(t)); if (src.hasPeriod()) tgt.setPeriod(Period14_30.convertPeriod(src.getPeriod())); return tgt; } diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv14_40/datatypes14_40/complextypes14_40/HumanName14_40.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv14_40/datatypes14_40/complextypes14_40/HumanName14_40.java index 4b7783be3..2dd46dbe7 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv14_40/datatypes14_40/complextypes14_40/HumanName14_40.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv14_40/datatypes14_40/complextypes14_40/HumanName14_40.java @@ -11,10 +11,10 @@ public class HumanName14_40 { ConversionContext14_40.INSTANCE.getVersionConvertor_14_40().copyElement(src, tgt); if (src.hasUse()) tgt.setUseElement(convertNameUse(src.getUseElement())); if (src.hasText()) tgt.setTextElement(String14_40.convertString(src.getTextElement())); - for (org.hl7.fhir.dstu2016may.model.StringType t : src.getFamily()) tgt.setFamily(t.getValue()); - for (org.hl7.fhir.dstu2016may.model.StringType t : src.getGiven()) tgt.addGiven(t.getValue()); - for (org.hl7.fhir.dstu2016may.model.StringType t : src.getPrefix()) tgt.addPrefix(t.getValue()); - for (org.hl7.fhir.dstu2016may.model.StringType t : src.getSuffix()) tgt.addSuffix(t.getValue()); + for (org.hl7.fhir.dstu2016may.model.StringType t : src.getFamily()) tgt.setFamilyElement(String14_40.convertString(t)); + for (org.hl7.fhir.dstu2016may.model.StringType t : src.getGiven()) tgt.getGiven().add(String14_40.convertString(t)); + for (org.hl7.fhir.dstu2016may.model.StringType t : src.getPrefix()) tgt.getPrefix().add(String14_40.convertString(t)); + for (org.hl7.fhir.dstu2016may.model.StringType t : src.getSuffix()) tgt.getSuffix().add(String14_40.convertString(t)); if (src.hasPeriod()) tgt.setPeriod(Period14_40.convertPeriod(src.getPeriod())); return tgt; } @@ -25,10 +25,10 @@ public class HumanName14_40 { ConversionContext14_40.INSTANCE.getVersionConvertor_14_40().copyElement(src, tgt); if (src.hasUse()) tgt.setUseElement(convertNameUse(src.getUseElement())); if (src.hasText()) tgt.setTextElement(String14_40.convertString(src.getTextElement())); - if (src.hasFamily()) tgt.addFamily(src.getFamily()); - for (org.hl7.fhir.r4.model.StringType t : src.getGiven()) tgt.addGiven(t.getValue()); - for (org.hl7.fhir.r4.model.StringType t : src.getPrefix()) tgt.addPrefix(t.getValue()); - for (org.hl7.fhir.r4.model.StringType t : src.getSuffix()) tgt.addSuffix(t.getValue()); + if (src.hasFamily()) tgt.getFamily().add(String14_40.convertString(src.getFamilyElement())); + for (org.hl7.fhir.r4.model.StringType t : src.getGiven()) tgt.getGiven().add(String14_40.convertString(t)); + for (org.hl7.fhir.r4.model.StringType t : src.getPrefix()) tgt.getPrefix().add(String14_40.convertString(t)); + for (org.hl7.fhir.r4.model.StringType t : src.getSuffix()) tgt.getSuffix().add(String14_40.convertString(t)); if (src.hasPeriod()) tgt.setPeriod(Period14_40.convertPeriod(src.getPeriod())); return tgt; } diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv14_50/datatypes14_50/complextypes14_50/HumanName14_50.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv14_50/datatypes14_50/complextypes14_50/HumanName14_50.java index e70bdb965..1bb1226be 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv14_50/datatypes14_50/complextypes14_50/HumanName14_50.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv14_50/datatypes14_50/complextypes14_50/HumanName14_50.java @@ -11,10 +11,10 @@ public class HumanName14_50 { ConversionContext14_50.INSTANCE.getVersionConvertor_14_50().copyElement(src, tgt); if (src.hasUse()) tgt.setUseElement(convertNameUse(src.getUseElement())); if (src.hasText()) tgt.setTextElement(String14_50.convertString(src.getTextElement())); - for (org.hl7.fhir.dstu2016may.model.StringType t : src.getFamily()) tgt.setFamily(t.getValue()); - for (org.hl7.fhir.dstu2016may.model.StringType t : src.getGiven()) tgt.addGiven(t.getValue()); - for (org.hl7.fhir.dstu2016may.model.StringType t : src.getPrefix()) tgt.addPrefix(t.getValue()); - for (org.hl7.fhir.dstu2016may.model.StringType t : src.getSuffix()) tgt.addSuffix(t.getValue()); + for (org.hl7.fhir.dstu2016may.model.StringType t : src.getFamily()) tgt.setFamilyElement(String14_50.convertString(t)); + for (org.hl7.fhir.dstu2016may.model.StringType t : src.getGiven()) tgt.getGiven().add(String14_50.convertString(t)); + for (org.hl7.fhir.dstu2016may.model.StringType t : src.getPrefix()) tgt.getPrefix().add(String14_50.convertString(t)); + for (org.hl7.fhir.dstu2016may.model.StringType t : src.getSuffix()) tgt.getSuffix().add(String14_50.convertString(t)); if (src.hasPeriod()) tgt.setPeriod(Period14_50.convertPeriod(src.getPeriod())); return tgt; } @@ -25,10 +25,10 @@ public class HumanName14_50 { ConversionContext14_50.INSTANCE.getVersionConvertor_14_50().copyElement(src, tgt); if (src.hasUse()) tgt.setUseElement(convertNameUse(src.getUseElement())); if (src.hasText()) tgt.setTextElement(String14_50.convertString(src.getTextElement())); - if (src.hasFamily()) tgt.addFamily(src.getFamily()); - for (org.hl7.fhir.r5.model.StringType t : src.getGiven()) tgt.addGiven(t.getValue()); - for (org.hl7.fhir.r5.model.StringType t : src.getPrefix()) tgt.addPrefix(t.getValue()); - for (org.hl7.fhir.r5.model.StringType t : src.getSuffix()) tgt.addSuffix(t.getValue()); + if (src.hasFamily()) tgt.getFamily().add(String14_50.convertString(src.getFamilyElement())); + for (org.hl7.fhir.r5.model.StringType t : src.getGiven()) tgt.getGiven().add(String14_50.convertString(t)); + for (org.hl7.fhir.r5.model.StringType t : src.getPrefix()) tgt.getPrefix().add(String14_50.convertString(t)); + for (org.hl7.fhir.r5.model.StringType t : src.getSuffix()) tgt.getSuffix().add(String14_50.convertString(t)); if (src.hasPeriod()) tgt.setPeriod(Period14_50.convertPeriod(src.getPeriod())); return tgt; } diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_40/datatypes30_40/complextypes30_40/HumanName30_40.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_40/datatypes30_40/complextypes30_40/HumanName30_40.java index 8cc7d1227..51f9702b5 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_40/datatypes30_40/complextypes30_40/HumanName30_40.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_40/datatypes30_40/complextypes30_40/HumanName30_40.java @@ -12,9 +12,9 @@ public class HumanName30_40 { if (src.hasUse()) tgt.setUseElement(convertNameUse(src.getUseElement())); if (src.hasText()) tgt.setTextElement(String30_40.convertString(src.getTextElement())); if (src.hasFamily()) tgt.setFamilyElement(String30_40.convertString(src.getFamilyElement())); - for (org.hl7.fhir.dstu3.model.StringType t : src.getGiven()) tgt.addGiven(t.getValue()); - for (org.hl7.fhir.dstu3.model.StringType t : src.getPrefix()) tgt.addPrefix(t.getValue()); - for (org.hl7.fhir.dstu3.model.StringType t : src.getSuffix()) tgt.addSuffix(t.getValue()); + for (org.hl7.fhir.dstu3.model.StringType t : src.getGiven()) tgt.getGiven().add(String30_40.convertString(t)); + for (org.hl7.fhir.dstu3.model.StringType t : src.getPrefix()) tgt.getPrefix().add(String30_40.convertString(t)); + for (org.hl7.fhir.dstu3.model.StringType t : src.getSuffix()) tgt.getSuffix().add(String30_40.convertString(t)); if (src.hasPeriod()) tgt.setPeriod(Period30_40.convertPeriod(src.getPeriod())); return tgt; } @@ -26,9 +26,9 @@ public class HumanName30_40 { if (src.hasUse()) tgt.setUseElement(convertNameUse(src.getUseElement())); if (src.hasText()) tgt.setTextElement(String30_40.convertString(src.getTextElement())); if (src.hasFamily()) tgt.setFamilyElement(String30_40.convertString(src.getFamilyElement())); - for (org.hl7.fhir.r4.model.StringType t : src.getGiven()) tgt.addGiven(t.getValue()); - for (org.hl7.fhir.r4.model.StringType t : src.getPrefix()) tgt.addPrefix(t.getValue()); - for (org.hl7.fhir.r4.model.StringType t : src.getSuffix()) tgt.addSuffix(t.getValue()); + for (org.hl7.fhir.r4.model.StringType t : src.getGiven()) tgt.getGiven().add(String30_40.convertString(t)); + for (org.hl7.fhir.r4.model.StringType t : src.getPrefix()) tgt.getPrefix().add(String30_40.convertString(t)); + for (org.hl7.fhir.r4.model.StringType t : src.getSuffix()) tgt.getSuffix().add(String30_40.convertString(t)); if (src.hasPeriod()) tgt.setPeriod(Period30_40.convertPeriod(src.getPeriod())); return tgt; } diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/datatypes30_50/complextypes30_50/HumanName30_50.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/datatypes30_50/complextypes30_50/HumanName30_50.java index fd454f453..e1cd4d69f 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/datatypes30_50/complextypes30_50/HumanName30_50.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_50/datatypes30_50/complextypes30_50/HumanName30_50.java @@ -12,9 +12,9 @@ public class HumanName30_50 { if (src.hasUse()) tgt.setUseElement(convertNameUse(src.getUseElement())); if (src.hasText()) tgt.setTextElement(String30_50.convertString(src.getTextElement())); if (src.hasFamily()) tgt.setFamilyElement(String30_50.convertString(src.getFamilyElement())); - for (org.hl7.fhir.dstu3.model.StringType t : src.getGiven()) tgt.addGiven(t.getValue()); - for (org.hl7.fhir.dstu3.model.StringType t : src.getPrefix()) tgt.addPrefix(t.getValue()); - for (org.hl7.fhir.dstu3.model.StringType t : src.getSuffix()) tgt.addSuffix(t.getValue()); + for (org.hl7.fhir.dstu3.model.StringType t : src.getGiven()) tgt.getGiven().add(String30_50.convertString(t)); + for (org.hl7.fhir.dstu3.model.StringType t : src.getPrefix()) tgt.getPrefix().add(String30_50.convertString(t)); + for (org.hl7.fhir.dstu3.model.StringType t : src.getSuffix()) tgt.getSuffix().add(String30_50.convertString(t)); if (src.hasPeriod()) tgt.setPeriod(Period30_50.convertPeriod(src.getPeriod())); return tgt; } @@ -26,9 +26,9 @@ public class HumanName30_50 { if (src.hasUse()) tgt.setUseElement(convertNameUse(src.getUseElement())); if (src.hasText()) tgt.setTextElement(String30_50.convertString(src.getTextElement())); if (src.hasFamily()) tgt.setFamilyElement(String30_50.convertString(src.getFamilyElement())); - for (org.hl7.fhir.r5.model.StringType t : src.getGiven()) tgt.addGiven(t.getValue()); - for (org.hl7.fhir.r5.model.StringType t : src.getPrefix()) tgt.addPrefix(t.getValue()); - for (org.hl7.fhir.r5.model.StringType t : src.getSuffix()) tgt.addSuffix(t.getValue()); + for (org.hl7.fhir.r5.model.StringType t : src.getGiven()) tgt.getGiven().add(String30_50.convertString(t)); + for (org.hl7.fhir.r5.model.StringType t : src.getPrefix()) tgt.getPrefix().add(String30_50.convertString(t)); + for (org.hl7.fhir.r5.model.StringType t : src.getSuffix()) tgt.getSuffix().add(String30_50.convertString(t)); if (src.hasPeriod()) tgt.setPeriod(Period30_50.convertPeriod(src.getPeriod())); return tgt; }