From b828e3b27f71f4ef2245e59f9bcae5b71db78745 Mon Sep 17 00:00:00 2001 From: jamesagnew Date: Wed, 17 Jun 2020 21:06:12 -0400 Subject: [PATCH] One more 30-40 converter tweak --- .../conv30_40/MedicationAdministration30_40.java | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_40/MedicationAdministration30_40.java b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_40/MedicationAdministration30_40.java index 34936784b..a465c71e7 100644 --- a/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_40/MedicationAdministration30_40.java +++ b/org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_40/MedicationAdministration30_40.java @@ -2,6 +2,7 @@ package org.hl7.fhir.convertors.conv30_40; import org.hl7.fhir.convertors.VersionConvertor_30_40; import org.hl7.fhir.convertors.VersionConvertor_40_50; +import org.hl7.fhir.dstu3.model.SimpleQuantity; import org.hl7.fhir.exceptions.FHIRException; public class MedicationAdministration30_40 { @@ -109,8 +110,14 @@ public class MedicationAdministration30_40 { tgt.setMethod(VersionConvertor_30_40.convertCodeableConcept(src.getMethod())); if (src.hasDose()) tgt.setDose(VersionConvertor_30_40.convertSimpleQuantity(src.getDose())); - if (src.hasRate()) + if (src.hasRate()) { + if (src.hasRateQuantity()) { + tgt.setRate(new SimpleQuantity()); + VersionConvertor_30_40.copyQuantity(src.getRateQuantity(), tgt.getRateSimpleQuantity()); + } else { tgt.setRate(VersionConvertor_30_40.convertType(src.getRate())); + } + } return tgt; }