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

#1723 fix R3 Quantity.copyValues()

This commit is contained in:
Grahame Grieve 2024-09-18 14:07:09 +10:00
parent f3bd5b9be8
commit 69525144f3
2 changed files with 46 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
org.hl7.fhir.dstu3/src/main/java/org/hl7/fhir/dstu3/model/Quantity.java
View File

@ -1,6 +1,7 @@
package org.hl7.fhir.dstu3.model; package org.hl7.fhir.dstu3.model;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.util.ArrayList;
/* /*
Copyright (c) 2011+, HL7, Inc. Copyright (c) 2011+, HL7, Inc.
@ -668,12 +669,16 @@ public class Quantity extends Type implements ICompositeType {
public Quantity copy() { public Quantity copy() {
Quantity dst = new Quantity(); Quantity dst = new Quantity();
copyValues(dst); copyValues(dst);
return dst;
}
public void copyValues(Quantity dst) {
super.copyValues(dst);
dst.value = value == null ? null : value.copy(); dst.value = value == null ? null : value.copy();
dst.comparator = comparator == null ? null : comparator.copy(); dst.comparator = comparator == null ? null : comparator.copy();
dst.unit = unit == null ? null : unit.copy(); dst.unit = unit == null ? null : unit.copy();
dst.system = system == null ? null : system.copy(); dst.system = system == null ? null : system.copy();
dst.code = code == null ? null : code.copy(); dst.code = code == null ? null : code.copy();
return dst;
} }
protected Quantity typedCopy() { protected Quantity typedCopy() {

40
org.hl7.fhir.dstu3/src/test/java/org/hl7/fhir/dstu3/model/MedicationAdministrationCopyTest.java Normal file
View File

@ -0,0 +1,40 @@
package org.hl7.fhir.dstu3.model;
import static org.junit.Assert.assertTrue;
import java.io.IOException;
import org.hl7.fhir.dstu3.formats.JsonParser;
import org.junit.jupiter.api.DisplayName;
import org.junit.jupiter.api.Test;
public class MedicationAdministrationCopyTest {
@DisplayName("Test MedicationAdministration copy")
@Test
public void test() throws IOException {
MedicationAdministration beforeCopy = createMedAdminWithDosageDurationExtension();
MedicationAdministration afterCopy = beforeCopy.copy();
System.out.println("---- BEFORE COPY (BEGIN)");
System.out.println(new JsonParser().composeString(beforeCopy));
System.out.println("---- BEFORE COPY (END)");
System.out.println();
System.out.println("---- AFTER COPY (BEGIN)");
System.out.println(new JsonParser().composeString(afterCopy));
System.out.println("---- AFTER COPY (END)");
assertTrue(beforeCopy.equalsDeep(afterCopy));
}
private static MedicationAdministration createMedAdminWithDosageDurationExtension() {
MedicationAdministration resource = new MedicationAdministration();
resource.setId("12345");
var dosage = new MedicationAdministration.MedicationAdministrationDosageComponent();
dosage.setDose((SimpleQuantity) new SimpleQuantity().setValue(40))
.addExtension(new Extension()
.setUrl("http://duration")
.setValue(new Duration().setValue(5340000)));
resource.setDosage(dosage);
return resource;
}
}