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 into gg-work

This commit is contained in:
Grahame Grieve 2020-06-19 11:37:14 +10:00
parent b6a3a54d12 7bbc3876fd
commit 35be964dd4
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -95,3 +95,5 @@ This project is maintained by [Grahame Grieve][Link-grahameGithub] and [James Ag
[Badge-r5SonatypeSnapshot]: https://img.shields.io/nexus/s/https/oss.sonatype.org/ca.uhn.hapi.fhir/org.hl7.fhir.r5.svg "Sonatype Snapshots"
[Badge-cliSonatypeRelease]: https://img.shields.io/nexus/r/https/oss.sonatype.org/ca.uhn.hapi.fhir/org.hl7.fhir.validation.cli.svg "Sonatype Releases"
[Badge-cliSonatypeSnapshot]: https://img.shields.io/nexus/s/https/oss.sonatype.org/ca.uhn.hapi.fhir/org.hl7.fhir.validation.cli.svg "Sonatype Snapshots"

9
org.hl7.fhir.convertors/src/main/java/org/hl7/fhir/convertors/conv30_40/MedicationAdministration30_40.java
View File

@ -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;
}