diff --git a/api/src/main/java/org/openmrs/Order.java b/api/src/main/java/org/openmrs/Order.java
index 72a09e4da943..8e12bbfa36e7 100644
--- a/api/src/main/java/org/openmrs/Order.java
+++ b/api/src/main/java/org/openmrs/Order.java
@@ -145,6 +145,13 @@ public enum FulfillerStatus {
@Column(name = "order_reason_non_coded", length = 255)
private String orderReasonNonCoded;
+ @ManyToOne
+ @JoinColumn(name = "discontinue_reason")
+ private Concept discontinueReason;
+
+ @Column(name = "discontinue_reason_non_coded", length = 255)
+ private String discontinueReasonNonCoded;
+
@Enumerated(EnumType.STRING)
@JdbcTypeCode(SqlTypes.VARCHAR)
@Column(name = "urgency", length = 50, nullable = false)
@@ -260,6 +267,8 @@ protected Order copyHelper(Order target) {
target.dateStopped = getDateStopped();
target.setOrderReason(getOrderReason());
target.setOrderReasonNonCoded(getOrderReasonNonCoded());
+ target.setDiscontinueReason(getDiscontinueReason());
+ target.setDiscontinueReasonNonCoded(getDiscontinueReasonNonCoded());
target.setAccessionNumber(getAccessionNumber());
target.setVoided(getVoided());
target.setVoidedBy(getVoidedBy());
@@ -458,6 +467,34 @@ public void setOrderReasonNonCoded(String orderReasonNonCoded) {
this.orderReasonNonCoded = orderReasonNonCoded;
}
+ /**
+ * @return Returns the discontinueReason.
+ */
+ public Concept getDiscontinueReason() {
+ return discontinueReason;
+ }
+
+ /**
+ * @param discontinueReason The discontinueReason to set.
+ */
+ public void setDiscontinueReason(Concept discontinueReason) {
+ this.discontinueReason = discontinueReason;
+ }
+
+ /**
+ * @return Returns the discontinueReasonNonCoded.
+ */
+ public String getDiscontinueReasonNonCoded() {
+ return discontinueReasonNonCoded;
+ }
+
+ /**
+ * @param discontinueReasonNonCoded The discontinueReasonNonCoded to set.
+ */
+ public void setDiscontinueReasonNonCoded(String discontinueReasonNonCoded) {
+ this.discontinueReasonNonCoded = discontinueReasonNonCoded;
+ }
+
/**
* @return the commentToFulfiller
* @since 1.10
diff --git a/api/src/main/resources/org/openmrs/liquibase/updates/liquibase-update-to-latest-3.0.x.xml b/api/src/main/resources/org/openmrs/liquibase/updates/liquibase-update-to-latest-3.0.x.xml
index 4ac1806e903b..51d99af2137b 100644
--- a/api/src/main/resources/org/openmrs/liquibase/updates/liquibase-update-to-latest-3.0.x.xml
+++ b/api/src/main/resources/org/openmrs/liquibase/updates/liquibase-update-to-latest-3.0.x.xml
@@ -141,6 +141,19 @@
-
-
+
+
+
+ Add discontinue_reason and discontinue_reason_non_coded to orders table for TRUNK-6284
+
+
+
+
+
+
+
+
+
+
+