From f330b4ae3d54037afe74ee382e495f74996486ab Mon Sep 17 00:00:00 2001 From: ajey prasand Date: Sun, 6 Apr 2025 00:52:30 +0530 Subject: [PATCH 1/6] added java annotations by referring Order.hbm.xml --- api/src/main/java/org/openmrs/Order.java | 71 +++++++++++++++++++++++- 1 file changed, 69 insertions(+), 2 deletions(-) diff --git a/api/src/main/java/org/openmrs/Order.java b/api/src/main/java/org/openmrs/Order.java index 430d32a0871e..4e86e5ddfde0 100644 --- a/api/src/main/java/org/openmrs/Order.java +++ b/api/src/main/java/org/openmrs/Order.java @@ -16,6 +16,24 @@ import org.openmrs.util.OpenmrsUtil; import java.util.Date; +import java.util.HashSet; +import java.util.LinkedHashSet; +import java.util.Set; + +import javax.persistence.CascadeType; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.EnumType; +import javax.persistence.Enumerated; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.JoinColumn; +import javax.persistence.ManyToOne; +import javax.persistence.OneToMany; +import javax.persistence.OrderBy; +import javax.persistence.SequenceGenerator; +import javax.persistence.Table; /** * Encapsulates information about the clinical action of a provider requesting something for a @@ -32,6 +50,8 @@ * @version 1.0 */ @Audited +@Entity +@Table(name = "orders") public class Order extends BaseCustomizableData implements FormRecordable { public static final long serialVersionUID = 4334343L; @@ -69,42 +89,73 @@ public enum FulfillerStatus { COMPLETED } + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "orders_order_id") + @SequenceGenerator(name = "orders_order_id", sequenceName = "orders_order_id_seq", allocationSize = 1) + @Column(name = "order_id") private Integer orderId; + @ManyToOne + @JoinColumn(name = "patient_id", nullable = false) private Patient patient; + @ManyToOne + @JoinColumn(name = "order_type_id", nullable = false) private OrderType orderType; + + @ManyToOne + @JoinColumn(name = "concept_id", nullable = false) private Concept concept; + @Column(name = "instructions", length = 65535) private String instructions; - + + @Column(name = "date_activated", nullable = false) private Date dateActivated; - + + @Column(name = "auto_expire_date") private Date autoExpireDate; + @ManyToOne + @JoinColumn(name = "encounter_id", nullable = false) private Encounter encounter; + @ManyToOne + @JoinColumn(name = "orderer", nullable = false) private Provider orderer; + @Column(name = "date_stopped") private Date dateStopped; + @ManyToOne + @JoinColumn(name = "order_reason") private Concept orderReason; + @Column(name = "accession_number", length = 255) private String accessionNumber; + @Column(name = "order_reason_non_coded", length = 255) private String orderReasonNonCoded; + @Enumerated(EnumType.STRING) + @Column(name = "urgency", nullable = false) private Urgency urgency = Urgency.ROUTINE; + @Column(name = "order_number", nullable = false, length = 50) private String orderNumber; + @Column(name = "comment_to_fulfiller", length = 1024) private String commentToFulfiller; + @ManyToOne + @JoinColumn(name = "care_setting", nullable = false) private CareSetting careSetting; + @Column(name = "scheduled_date") private Date scheduledDate; + @Column(name = "form_namespace_and_path", length = 255) private String formNamespaceAndPath; /** @@ -112,12 +163,15 @@ public enum FulfillerStatus { * added in the group ex - for two orders of isoniazid and ampicillin, the sequence of 1 and 2 * needed to be maintained */ + @Column(name = "sort_weight") private Double sortWeight; /** * Allows orders to be linked to a previous order - e.g., an order discontinue ampicillin linked * to the original ampicillin order (the D/C gets its own order number) */ + @ManyToOne + @JoinColumn(name = "previous_order_id") private Order previousOrder; /** @@ -125,24 +179,37 @@ public enum FulfillerStatus { * * @see org.openmrs.Order.Action */ + @Enumerated(EnumType.STRING) + @Column(name = "action", nullable = false) private Action action = Action.NEW; /** * {@link org.openmrs.OrderGroup} */ + @ManyToOne + @JoinColumn(name = "order_group_id") private OrderGroup orderGroup; /** * Represents the status of an order received from a fulfiller * @see FulfillerStatus */ + @Enumerated(EnumType.STRING) + @Column(name = "fulfiller_status", nullable = false) private FulfillerStatus fulfillerStatus; /** * Represents the comment that goes along with with fulfiller status */ + @Column(name = "fulfiller_comment", length = 1024) private String fulfillerComment; + //Newly added + @OneToMany(mappedBy = "order", cascade = CascadeType.ALL, orphanRemoval = true) + @OrderBy("voided asc") + private Set attributes = new LinkedHashSet<>(); + + // Constructors /** default constructor */ From 36fa642a9d1f4fa247482eaadf888c009c199afa Mon Sep 17 00:00:00 2001 From: ajey prasand Date: Thu, 10 Apr 2025 20:37:51 +0530 Subject: [PATCH 2/6] added the changes required --- api/src/main/java/org/openmrs/DrugOrder.java | 31 ++++ api/src/main/java/org/openmrs/Order.java | 2 - .../main/java/org/openmrs/ReferralOrder.java | 5 + .../main/java/org/openmrs/ServiceOrder.java | 19 ++ api/src/main/java/org/openmrs/TestOrder.java | 5 + api/src/main/resources/hibernate.cfg.xml | 1 - .../openmrs/api/db/hibernate/Order.hbm.xml | 167 ------------------ api/src/test/java/org/openmrs/OrderTest.java | 2 +- .../org/openmrs/api/OrderServiceTest.java | 5 + 9 files changed, 66 insertions(+), 171 deletions(-) delete mode 100644 api/src/main/resources/org/openmrs/api/db/hibernate/Order.hbm.xml diff --git a/api/src/main/java/org/openmrs/DrugOrder.java b/api/src/main/java/org/openmrs/DrugOrder.java index c304f8b0e21e..8621199361f7 100644 --- a/api/src/main/java/org/openmrs/DrugOrder.java +++ b/api/src/main/java/org/openmrs/DrugOrder.java @@ -11,6 +11,12 @@ import static org.openmrs.Order.Action.DISCONTINUE; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.JoinColumn; +import javax.persistence.ManyToOne; +import javax.persistence.Table; + import org.apache.commons.lang3.StringUtils; import org.hibernate.envers.Audited; import org.openmrs.util.OpenmrsUtil; @@ -21,44 +27,69 @@ * @version 1.0 */ @Audited +@Entity +@Table(name = "drug_order") public class DrugOrder extends Order { public static final long serialVersionUID = 72232L; // Fields + @Column(name = "dose", length = 22) private Double dose; + @ManyToOne + @JoinColumn(name = "dose_units") private Concept doseUnits; + @ManyToOne + @JoinColumn(name = "frequency") private OrderFrequency frequency; + @Column(name = "as_needed", nullable = false) private Boolean asNeeded = false; + @Column(name = "quantity", length = 22) private Double quantity; + @ManyToOne + @JoinColumn(name = "quantity_units") private Concept quantityUnits; + @ManyToOne + @JoinColumn(name = "drug_inventory_id") private Drug drug; + @Column(name = "as_needed_condition", length = 255) private String asNeededCondition; + @Column(name = "dosing_type", length = 255) private Class dosingType = SimpleDosingInstructions.class; + @Column(name = "num_refills") private Integer numRefills; + @Column(name = "dosing_instructions", length = 65535) private String dosingInstructions; + @Column(name = "duration") private Integer duration; + @ManyToOne + @JoinColumn(name = "duration_units") private Concept durationUnits; + @ManyToOne + @JoinColumn(name = "route") private Concept route; + @Column(name = "brand_name", length = 255) private String brandName; + @Column(name = "dispense_as_written", nullable = false) private Boolean dispenseAsWritten = Boolean.FALSE; + @Column(name = "drug_non_coded", length = 255) private String drugNonCoded; // Constructors diff --git a/api/src/main/java/org/openmrs/Order.java b/api/src/main/java/org/openmrs/Order.java index 4e86e5ddfde0..71b7e83bb18e 100644 --- a/api/src/main/java/org/openmrs/Order.java +++ b/api/src/main/java/org/openmrs/Order.java @@ -16,7 +16,6 @@ import org.openmrs.util.OpenmrsUtil; import java.util.Date; -import java.util.HashSet; import java.util.LinkedHashSet; import java.util.Set; @@ -204,7 +203,6 @@ public enum FulfillerStatus { @Column(name = "fulfiller_comment", length = 1024) private String fulfillerComment; - //Newly added @OneToMany(mappedBy = "order", cascade = CascadeType.ALL, orphanRemoval = true) @OrderBy("voided asc") private Set attributes = new LinkedHashSet<>(); diff --git a/api/src/main/java/org/openmrs/ReferralOrder.java b/api/src/main/java/org/openmrs/ReferralOrder.java index cb1084e68671..622ba0d9f5ba 100644 --- a/api/src/main/java/org/openmrs/ReferralOrder.java +++ b/api/src/main/java/org/openmrs/ReferralOrder.java @@ -9,6 +9,9 @@ */ package org.openmrs; +import javax.persistence.Entity; +import javax.persistence.Table; + import org.hibernate.envers.Audited; /** @@ -17,6 +20,8 @@ * @since 2.5.0 */ @Audited +@Entity +@Table(name = "referral_order") public class ReferralOrder extends ServiceOrder { private static final long serialVersionUID = 1L; diff --git a/api/src/main/java/org/openmrs/ServiceOrder.java b/api/src/main/java/org/openmrs/ServiceOrder.java index 3d2a3a6cf2ec..5887b9e40fc5 100644 --- a/api/src/main/java/org/openmrs/ServiceOrder.java +++ b/api/src/main/java/org/openmrs/ServiceOrder.java @@ -9,12 +9,20 @@ */ package org.openmrs; +import javax.persistence.Column; +import javax.persistence.EnumType; +import javax.persistence.Enumerated; +import javax.persistence.JoinColumn; +import javax.persistence.ManyToOne; +import javax.persistence.MappedSuperclass; + /** * Provides properties for several order types like TestOrder , ReferralOrder * and others depending on the openmrs implementation use case as need arises * * @since 2.5.0 */ +@MappedSuperclass public abstract class ServiceOrder extends Order { public enum Laterality { @@ -25,16 +33,27 @@ public enum Laterality { public static final long serialVersionUID = 1L; + @ManyToOne + @JoinColumn(name = "specimen_source") public Concept specimenSource; + @Enumerated(EnumType.STRING) + @Column(name = "laterality", length = 20) private Laterality laterality; + @Column(name = "clinical_history", length = 65535) private String clinicalHistory; + @ManyToOne + @JoinColumn(name = "frequency") private OrderFrequency frequency; + @ManyToOne + @JoinColumn(name = "frequency") private Integer numberOfRepeats; + @ManyToOne + @JoinColumn(name = "location") private Concept location; /** diff --git a/api/src/main/java/org/openmrs/TestOrder.java b/api/src/main/java/org/openmrs/TestOrder.java index e74588894ca5..3ff062100b5c 100644 --- a/api/src/main/java/org/openmrs/TestOrder.java +++ b/api/src/main/java/org/openmrs/TestOrder.java @@ -9,6 +9,9 @@ */ package org.openmrs; +import javax.persistence.Entity; +import javax.persistence.Table; + import org.hibernate.envers.Audited; /** @@ -18,6 +21,8 @@ * @since 1.9.2, 1.10 */ @Audited +@Entity +@Table(name = "test_order") public class TestOrder extends ServiceOrder { public static final long serialVersionUID = 1L; diff --git a/api/src/main/resources/hibernate.cfg.xml b/api/src/main/resources/hibernate.cfg.xml index 1cad8cc6aa43..d666311eadcf 100644 --- a/api/src/main/resources/hibernate.cfg.xml +++ b/api/src/main/resources/hibernate.cfg.xml @@ -62,7 +62,6 @@ - diff --git a/api/src/main/resources/org/openmrs/api/db/hibernate/Order.hbm.xml b/api/src/main/resources/org/openmrs/api/db/hibernate/Order.hbm.xml deleted file mode 100644 index 3a3fba31ca0a..000000000000 --- a/api/src/main/resources/org/openmrs/api/db/hibernate/Order.hbm.xml +++ /dev/null @@ -1,167 +0,0 @@ - - - - - - - - - orders_order_id_seq - - - - - - - - - - - - - - - - - - - - - - - - - - - org.openmrs.Order$Urgency - true - - - - - - org.openmrs.Order$Action - true - - - - - - org.openmrs.Order$FulfillerStatus - true - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - org.openmrs.ServiceOrder$Laterality - true - - - - - - - - - - - - - - - - - - org.openmrs.ServiceOrder$Laterality - true - - - - - - - - - - - diff --git a/api/src/test/java/org/openmrs/OrderTest.java b/api/src/test/java/org/openmrs/OrderTest.java index 80ed0c0863c2..cbbc817dcd8e 100644 --- a/api/src/test/java/org/openmrs/OrderTest.java +++ b/api/src/test/java/org/openmrs/OrderTest.java @@ -58,7 +58,7 @@ public void setUp() throws Exception { o = new Order(); } - + protected static void assertThatAllFieldsAreCopied(Order original, String methodName, String... otherfieldsToExclude) throws Exception { if (methodName == null) { diff --git a/api/src/test/java/org/openmrs/api/OrderServiceTest.java b/api/src/test/java/org/openmrs/api/OrderServiceTest.java index 12f636a67082..637519714aaa 100644 --- a/api/src/test/java/org/openmrs/api/OrderServiceTest.java +++ b/api/src/test/java/org/openmrs/api/OrderServiceTest.java @@ -60,6 +60,7 @@ import org.openmrs.ProgramAttributeType; import org.openmrs.Provider; import org.openmrs.ProviderAttributeType; +import org.openmrs.ReferralOrder; import org.openmrs.Relationship; import org.openmrs.SimpleDosingInstructions; import org.openmrs.TestOrder; @@ -2742,6 +2743,10 @@ public void saveOrder_shouldFailIfTheJavaTypeOfThePreviousOrderDoesNotMatch() th .addAnnotatedClass(ProgramAttributeType.class) .addAnnotatedClass(HL7InError.class) .addAnnotatedClass(OrderType.class) + .addAnnotatedClass(Order.class) + .addAnnotatedClass(DrugOrder.class) + .addAnnotatedClass(TestOrder.class) + .addAnnotatedClass(ReferralOrder.class) .getMetadataBuilder().build(); From cb3a8fc7efecee40ebaca64cb729120004fa18a5 Mon Sep 17 00:00:00 2001 From: ajey prasand Date: Mon, 14 Apr 2025 15:21:01 +0530 Subject: [PATCH 3/6] removed others entities except order --- api/src/main/java/org/openmrs/DrugOrder.java | 31 ------------------- .../main/java/org/openmrs/ReferralOrder.java | 5 --- .../main/java/org/openmrs/ServiceOrder.java | 16 ---------- api/src/main/java/org/openmrs/TestOrder.java | 5 --- .../org/openmrs/api/OrderServiceTest.java | 3 -- 5 files changed, 60 deletions(-) diff --git a/api/src/main/java/org/openmrs/DrugOrder.java b/api/src/main/java/org/openmrs/DrugOrder.java index 8621199361f7..c304f8b0e21e 100644 --- a/api/src/main/java/org/openmrs/DrugOrder.java +++ b/api/src/main/java/org/openmrs/DrugOrder.java @@ -11,12 +11,6 @@ import static org.openmrs.Order.Action.DISCONTINUE; -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; -import javax.persistence.Table; - import org.apache.commons.lang3.StringUtils; import org.hibernate.envers.Audited; import org.openmrs.util.OpenmrsUtil; @@ -27,69 +21,44 @@ * @version 1.0 */ @Audited -@Entity -@Table(name = "drug_order") public class DrugOrder extends Order { public static final long serialVersionUID = 72232L; // Fields - @Column(name = "dose", length = 22) private Double dose; - @ManyToOne - @JoinColumn(name = "dose_units") private Concept doseUnits; - @ManyToOne - @JoinColumn(name = "frequency") private OrderFrequency frequency; - @Column(name = "as_needed", nullable = false) private Boolean asNeeded = false; - @Column(name = "quantity", length = 22) private Double quantity; - @ManyToOne - @JoinColumn(name = "quantity_units") private Concept quantityUnits; - @ManyToOne - @JoinColumn(name = "drug_inventory_id") private Drug drug; - @Column(name = "as_needed_condition", length = 255) private String asNeededCondition; - @Column(name = "dosing_type", length = 255) private Class dosingType = SimpleDosingInstructions.class; - @Column(name = "num_refills") private Integer numRefills; - @Column(name = "dosing_instructions", length = 65535) private String dosingInstructions; - @Column(name = "duration") private Integer duration; - @ManyToOne - @JoinColumn(name = "duration_units") private Concept durationUnits; - @ManyToOne - @JoinColumn(name = "route") private Concept route; - @Column(name = "brand_name", length = 255) private String brandName; - @Column(name = "dispense_as_written", nullable = false) private Boolean dispenseAsWritten = Boolean.FALSE; - @Column(name = "drug_non_coded", length = 255) private String drugNonCoded; // Constructors diff --git a/api/src/main/java/org/openmrs/ReferralOrder.java b/api/src/main/java/org/openmrs/ReferralOrder.java index 622ba0d9f5ba..cb1084e68671 100644 --- a/api/src/main/java/org/openmrs/ReferralOrder.java +++ b/api/src/main/java/org/openmrs/ReferralOrder.java @@ -9,9 +9,6 @@ */ package org.openmrs; -import javax.persistence.Entity; -import javax.persistence.Table; - import org.hibernate.envers.Audited; /** @@ -20,8 +17,6 @@ * @since 2.5.0 */ @Audited -@Entity -@Table(name = "referral_order") public class ReferralOrder extends ServiceOrder { private static final long serialVersionUID = 1L; diff --git a/api/src/main/java/org/openmrs/ServiceOrder.java b/api/src/main/java/org/openmrs/ServiceOrder.java index 5887b9e40fc5..e8794ad15ebe 100644 --- a/api/src/main/java/org/openmrs/ServiceOrder.java +++ b/api/src/main/java/org/openmrs/ServiceOrder.java @@ -9,11 +9,6 @@ */ package org.openmrs; -import javax.persistence.Column; -import javax.persistence.EnumType; -import javax.persistence.Enumerated; -import javax.persistence.JoinColumn; -import javax.persistence.ManyToOne; import javax.persistence.MappedSuperclass; /** @@ -33,27 +28,16 @@ public enum Laterality { public static final long serialVersionUID = 1L; - @ManyToOne - @JoinColumn(name = "specimen_source") public Concept specimenSource; - @Enumerated(EnumType.STRING) - @Column(name = "laterality", length = 20) private Laterality laterality; - @Column(name = "clinical_history", length = 65535) private String clinicalHistory; - @ManyToOne - @JoinColumn(name = "frequency") private OrderFrequency frequency; - @ManyToOne - @JoinColumn(name = "frequency") private Integer numberOfRepeats; - @ManyToOne - @JoinColumn(name = "location") private Concept location; /** diff --git a/api/src/main/java/org/openmrs/TestOrder.java b/api/src/main/java/org/openmrs/TestOrder.java index 3ff062100b5c..e74588894ca5 100644 --- a/api/src/main/java/org/openmrs/TestOrder.java +++ b/api/src/main/java/org/openmrs/TestOrder.java @@ -9,9 +9,6 @@ */ package org.openmrs; -import javax.persistence.Entity; -import javax.persistence.Table; - import org.hibernate.envers.Audited; /** @@ -21,8 +18,6 @@ * @since 1.9.2, 1.10 */ @Audited -@Entity -@Table(name = "test_order") public class TestOrder extends ServiceOrder { public static final long serialVersionUID = 1L; diff --git a/api/src/test/java/org/openmrs/api/OrderServiceTest.java b/api/src/test/java/org/openmrs/api/OrderServiceTest.java index 637519714aaa..4a30f8d66bdf 100644 --- a/api/src/test/java/org/openmrs/api/OrderServiceTest.java +++ b/api/src/test/java/org/openmrs/api/OrderServiceTest.java @@ -2744,9 +2744,6 @@ public void saveOrder_shouldFailIfTheJavaTypeOfThePreviousOrderDoesNotMatch() th .addAnnotatedClass(HL7InError.class) .addAnnotatedClass(OrderType.class) .addAnnotatedClass(Order.class) - .addAnnotatedClass(DrugOrder.class) - .addAnnotatedClass(TestOrder.class) - .addAnnotatedClass(ReferralOrder.class) .getMetadataBuilder().build(); From e56001ec1d80b60d85f6a43c7edf9d3d546f39c7 Mon Sep 17 00:00:00 2001 From: ajey prasand Date: Mon, 14 Apr 2025 16:46:25 +0530 Subject: [PATCH 4/6] removed other changes --- api/src/main/java/org/openmrs/ServiceOrder.java | 2 -- api/src/test/java/org/openmrs/OrderTest.java | 1 - api/src/test/java/org/openmrs/api/OrderServiceTest.java | 1 - 3 files changed, 4 deletions(-) diff --git a/api/src/main/java/org/openmrs/ServiceOrder.java b/api/src/main/java/org/openmrs/ServiceOrder.java index e8794ad15ebe..f9e1a7baa114 100644 --- a/api/src/main/java/org/openmrs/ServiceOrder.java +++ b/api/src/main/java/org/openmrs/ServiceOrder.java @@ -9,7 +9,6 @@ */ package org.openmrs; -import javax.persistence.MappedSuperclass; /** * Provides properties for several order types like TestOrder , ReferralOrder @@ -17,7 +16,6 @@ * * @since 2.5.0 */ -@MappedSuperclass public abstract class ServiceOrder extends Order { public enum Laterality { diff --git a/api/src/test/java/org/openmrs/OrderTest.java b/api/src/test/java/org/openmrs/OrderTest.java index cbbc817dcd8e..89073a4da048 100644 --- a/api/src/test/java/org/openmrs/OrderTest.java +++ b/api/src/test/java/org/openmrs/OrderTest.java @@ -58,7 +58,6 @@ public void setUp() throws Exception { o = new Order(); } - protected static void assertThatAllFieldsAreCopied(Order original, String methodName, String... otherfieldsToExclude) throws Exception { if (methodName == null) { diff --git a/api/src/test/java/org/openmrs/api/OrderServiceTest.java b/api/src/test/java/org/openmrs/api/OrderServiceTest.java index 4a30f8d66bdf..41a3c86c0a05 100644 --- a/api/src/test/java/org/openmrs/api/OrderServiceTest.java +++ b/api/src/test/java/org/openmrs/api/OrderServiceTest.java @@ -60,7 +60,6 @@ import org.openmrs.ProgramAttributeType; import org.openmrs.Provider; import org.openmrs.ProviderAttributeType; -import org.openmrs.ReferralOrder; import org.openmrs.Relationship; import org.openmrs.SimpleDosingInstructions; import org.openmrs.TestOrder; From f45655bf9dd4718e7b5947252cda233602d5963e Mon Sep 17 00:00:00 2001 From: ajey prasand Date: Mon, 14 Apr 2025 16:49:55 +0530 Subject: [PATCH 5/6] removed other changes --- api/src/main/java/org/openmrs/ServiceOrder.java | 1 - 1 file changed, 1 deletion(-) diff --git a/api/src/main/java/org/openmrs/ServiceOrder.java b/api/src/main/java/org/openmrs/ServiceOrder.java index f9e1a7baa114..3d2a3a6cf2ec 100644 --- a/api/src/main/java/org/openmrs/ServiceOrder.java +++ b/api/src/main/java/org/openmrs/ServiceOrder.java @@ -9,7 +9,6 @@ */ package org.openmrs; - /** * Provides properties for several order types like TestOrder , ReferralOrder * and others depending on the openmrs implementation use case as need arises From f79f8f9e91e5a52d8064099ffce4e944c8d6aaef Mon Sep 17 00:00:00 2001 From: ajey prasand Date: Mon, 14 Apr 2025 16:53:26 +0530 Subject: [PATCH 6/6] removed other changes --- api/src/test/java/org/openmrs/OrderTest.java | 1 + 1 file changed, 1 insertion(+) diff --git a/api/src/test/java/org/openmrs/OrderTest.java b/api/src/test/java/org/openmrs/OrderTest.java index 89073a4da048..80ed0c0863c2 100644 --- a/api/src/test/java/org/openmrs/OrderTest.java +++ b/api/src/test/java/org/openmrs/OrderTest.java @@ -58,6 +58,7 @@ public void setUp() throws Exception { o = new Order(); } + protected static void assertThatAllFieldsAreCopied(Order original, String methodName, String... otherfieldsToExclude) throws Exception { if (methodName == null) {