TRUNK-4126 Added duration and durationUnits properties to DrugOrder c…

…lass
openmrs · Dec 19, 2013 · a2e4eb1 · a2e4eb1
1 parent 485e01a
commit a2e4eb1
Show file tree

Hide file tree

Showing 3 changed files with 75 additions and 0 deletions.
diff --git a/api/src/main/java/org/openmrs/DrugOrder.java b/api/src/main/java/org/openmrs/DrugOrder.java
@@ -56,6 +56,10 @@ public enum DosingType {
 
 	private String dosingInstructions;
 
+	private Double duration;
+
+	private Concept durationUnits;
+
 	// Constructors
 
 	/** default constructor */
@@ -89,6 +93,8 @@ protected DrugOrder copyHelper(DrugOrder target) {
 		target.drug = getDrug();
 		target.dosingType = getDosingType();
 		target.dosingInstructions = getDosingInstructions();
+		target.duration = getDuration();
+		target.durationUnits = getDurationUnits();
 		return target;
 	}
 
@@ -336,6 +342,44 @@ public String getDosingInstructions() {
 		return this.dosingInstructions;
 	}
 
+	/**
+	 * Gets the duration of a Drug Order
+	 * 
+	 * @since 1.10
+	 */
+	public Double getDuration() {
+		return duration;
+	}
+
+	/**
+	 * Sets the duration of a Drug Order
+	 * 
+	 * @param duration to set
+	 * @since 1.10
+	 */
+	public void setDuration(Double duration) {
+		this.duration = duration;
+	}
+
+	/**
+	 * Gets durationUnits of a Drug Order
+	 * 
+	 * @since 1.10
+	 */
+	public Concept getDurationUnits() {
+		return durationUnits;
+	}
+
+	/**
+	 * Sets the durationUnits of a Drug Order
+	 * 
+	 * @param durationUnits
+	 * @since 1.10
+	 */
+	public void setDurationUnits(Concept durationUnits) {
+		this.durationUnits = durationUnits;
+	}
+
 	public String toString() {
 		return "DrugOrder(" + getDose() + getUnits() + " of " + (getDrug() != null ? getDrug().getName() : "[no drug]")
 		        + " from " + getStartDate() + " to " + (getDiscontinued() ? getDiscontinuedDate() : getAutoExpireDate())

diff --git a/api/src/main/resources/liquibase-update-to-latest.xml b/api/src/main/resources/liquibase-update-to-latest.xml
@@ -6632,4 +6632,31 @@
 			referencedTableName="concept" referencedColumnNames="concept_id" />
 	</changeSet>
 
+    <changeSet id="201312162044-TRUNK-4126" author="k-joseph">
+        <preConditions onFail="MARK_RAN">
+            <not>
+                <columnExists tableName="drug_order" columnName="duration" />
+            </not>
+        </preConditions>
+        <comment>Adding duration column to drug_order table</comment>
+        <addColumn tableName="drug_order">
+            <column name="duration" type="double" />
+        </addColumn>
+    </changeSet>
+
+    <changeSet id="201312162059-TRUNK-4126" author="k-joseph">
+        <preConditions onFail="MARK_RAN">
+            <not>
+                <columnExists tableName="drug_order" columnName="duration_units" />
+            </not>
+        </preConditions>
+        <comment>Adding duration_units column to drug_order table</comment>
+        <addColumn tableName="drug_order">
+            <column name="duration_units" type="int" />
+        </addColumn>
+        <addForeignKeyConstraint constraintName="drug_order_duration_units_fk"
+                                 baseTableName="drug_order" baseColumnNames="duration_units"
+                                 referencedTableName="concept" referencedColumnNames="concept_id" />
+    </changeSet>
+
 </databaseChangeLog>
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
@@ -114,6 +114,10 @@
             <property name="numRefills" type="int" column="num_refills" />
             <property name="administrationInstructions" type="java.lang.String" column="administration_instructions" length="65535"/>
             <property name="dosingInstructions" type="java.lang.String" column="dosing_instructions" length="65535"/>
+            <property name="duration" type="double" column="duration" length="22"/>
+            <many-to-one name="durationUnits" class="org.openmrs.Concept">
+            	<column name="duration_units"/>
+            </many-to-one>
 		</joined-subclass>
 
         <joined-subclass name="org.openmrs.TestOrder" table="test_order" lazy="false">