Skip to content

Commit

Permalink
Trunk-4239
Browse files Browse the repository at this point in the history
  • Loading branch information
@akshika47 @wluyima
akshika47 authored and wluyima committed Feb 28, 2014
1 parent a2e7eb8 commit 6bfb175
Show file tree
Hide file tree
Showing 8 changed files with 20 additions and 11 deletions.
3 changes: 2 additions & 1 deletion api/src/main/java/org/openmrs/DrugOrder.java
View file
Expand Up @@ -434,7 +434,8 @@ public Order cloneForDiscontinuing() {
newOrder.setPreviousOrder(this);
newOrder.setPatient(this.getPatient());
newOrder.setDrug(this.getDrug());

newOrder.setStartDate(this.getStartDate());

return newOrder;
}

Expand Down
3 changes: 2 additions & 1 deletion api/src/main/java/org/openmrs/Order.java
View file
Expand Up @@ -545,7 +545,8 @@ public Order cloneForDiscontinuing() {
newOrder.setAction(Action.DISCONTINUE);
newOrder.setPreviousOrder(this);
newOrder.setPatient(this.getPatient());

newOrder.setStartDate(this.getStartDate());

return newOrder;
}

Expand Down
7 changes: 7 additions & 0 deletions api/src/main/resources/liquibase-update-to-latest.xml
View file
Expand Up @@ -7051,4 +7051,11 @@
referencedTableName="provider" referencedColumnNames="provider_id" />
</changeSet>

<changeSet id="201402241054" author="Akshika">
<comment>Makes the start_date in Orders not nullable</comment>
<ext:modifyColumn tableName="orders">
<column name="start_date" type="DATETIME"/>
<constraints nullable="false"/>
</ext:modifyColumn>
</changeSet>
</databaseChangeLog>
2 changes: 1 addition & 1 deletion api/src/main/resources/org/openmrs/api/db/hibernate/Order.hbm.xml
View file
Expand Up @@ -17,7 +17,7 @@
column="uuid" length="38" unique="true" />

<property name="instructions" type="java.lang.String" column="instructions" length="65535"/>
<property name="startDate" type="java.util.Date" column="start_date" length="19"/>
<property name="startDate" type="java.util.Date" column="start_date" length="19" not-null="true"/>
<property name="autoExpireDate" type="java.util.Date" column="auto_expire_date" length="19"/>
<property name="dateStopped" type="java.util.Date" column="date_stopped" length="19"/>
<property name="accessionNumber" type="java.lang.String" column="accession_number" length="255" />
Expand Down
2 changes: 1 addition & 1 deletion api/src/test/java/org/openmrs/api/EncounterServiceTest.java
View file
Expand Up @@ -492,7 +492,7 @@ public void saveEncounter_shouldNotOverwriteObsAndOrdersCreatorOrDateCreated() t
Order order = new Order();
order.setConcept(new Concept(1));
order.setPatient(new Patient(2));
order.setStartDate(new Date());
Field field = Order.class.getDeclaredField("orderNumber");
field.setAccessible(true);
field.set(order, "ORD-1");
Expand Down
10 changes: 5 additions & 5 deletions api/src/test/resources/org/openmrs/api/include/EncounterServiceTest-initialData.xml
View file
Expand Up @@ -54,17 +54,17 @@
<encounter encounter_id="2" encounter_type="1" form_id="1" encounter_datetime="2008-01-01 00:00:00.0" patient_id="3" location_id="1" creator="1" date_created="2008-02-01 00:00:00.0" voided="1" voided_by="1" date_voided="2008-02-01 00:00:00.0" void_reason="Because" uuid="33d70956-b359-452a-b3da-b69c8ab459ce"/>
<encounter_provider encounter_provider_id="1" encounter_id="2" provider_id="2" encounter_role_id="2" creator="1" date_created="2006-03-11 15:57:35.0" voided="false" uuid="c92be2b5-b167-4c3b-9bab-5f8c01ae727a" />
<obs obs_id="4" person_id="3" encounter_id="2" concept_id="1" obs_datetime="2005-01-01 00:00:00.0" location_id="1" value_numeric="1.0" creator="1" date_created="2006-02-10 15:57:35.0" voided="1" voided_by="1" date_voided="2008-02-01 00:00:00.0" void_reason="Because" uuid="8f92ca37-9aee-4834-a1e4-26cd517421da"/>
<orders order_id="2" order_number="2" urgency="ROUTINE" patient_id="3" encounter_id="2" concept_id="1" orderer="1" creator="1" date_created="2006-03-11 15:57:35.0" voided="1" voided_by="1" date_voided="2008-02-01 00:00:00.0" void_reason="Because" uuid="81bc39d2-9a62-46b1-9df6-c35d3cb29e08" order_action="NEW" care_setting="1"/>
<orders order_id="2" order_number="2" urgency="ROUTINE" patient_id="3" encounter_id="2" concept_id="1" start_date="2012-08-19 00:00:00.0" orderer="1" creator="1" date_created="2006-03-11 15:57:35.0" voided="1" voided_by="1" date_voided="2008-02-01 00:00:00.0" void_reason="Because" uuid="81bc39d2-9a62-46b1-9df6-c35d3cb29e08" order_action="NEW" care_setting="1"/>

<!-- A real non-voided encounter -->
<!-- A real non-voided encounter -->
<encounter encounter_id="1" encounter_type="1" form_id="1" encounter_datetime="2005-01-01 00:00:00.0" patient_id="3" location_id="1" creator="1" date_created="2005-01-01 00:00:00.0" voided="0" uuid="430bbb70-6a9c-4e1e-badb-9d1034b1b5e9"/>
<encounter_provider encounter_provider_id="2" encounter_id="1" provider_id="2" encounter_role_id="2" creator="1" date_created="2006-03-11 15:57:35.0" voided="false" uuid="b566821c-1ad9-473b-836b-9e9c67688e02" />
<obs obs_id="1" person_id="3" encounter_id="1" concept_id="1" obs_datetime="2005-01-01 00:00:00.0" location_id="1" value_numeric="1.0" creator="1" date_created="2006-02-10 15:57:35.0" voided="false" uuid="f0b5fbfb-6c8b-43fd-918d-41d578d571ec"/>
<obs obs_id="2" person_id="3" encounter_id="1" concept_id="1" obs_datetime="2005-01-01 00:00:00.0" location_id="1" value_numeric="2.0" creator="1" date_created="2006-02-11 15:57:35.0" voided="false" uuid="96d6835c-c038-4ca1-bead-4bfa36bd7fa0"/>
<!-- this obs datetime is intentionally different than the encounter datetime above -->
<obs obs_id="3" person_id="3" encounter_id="1" concept_id="1" obs_datetime="2006-01-01 00:00:00.0" location_id="1" value_numeric="3.0" creator="1" date_created="2006-03-11 15:57:35.0" voided="false" uuid="544c0a4c-fdbf-4eb8-be4b-8fde603a76f7"/>
<orders order_id="1" order_number="1" urgency="ROUTINE" patient_id="3" encounter_id="1" concept_id="1" orderer="1" creator="1" date_created="2006-03-11 15:57:35.0" voided="false" uuid="0d86e8b4-2f33-495e-aa22-6954785e4e9e" order_action="NEW" care_setting="1"/>

<orders order_id="1" order_number="1" urgency="ROUTINE" patient_id="3" encounter_id="1" start_date="2012-08-19 00:00:00.0" concept_id="1" orderer="1" creator="1" date_created="2006-03-11 15:57:35.0" voided="false" uuid="0d86e8b4-2f33-495e-aa22-6954785e4e9e" order_action="NEW" care_setting="1"/>

<!-- an encounter with a mismatched order.patient_id -->
<encounter encounter_id="15" encounter_type="1" form_id="1" encounter_datetime="2001-01-01 00:00:00.0" patient_id="3" location_id="1" visit_id="1" creator="1" date_created="2005-01-01 00:00:00.0" voided="0" uuid="7fffd6b9-0970-4967-88c7-0b7b50f12bc6"/>
Expand All @@ -75,7 +75,7 @@
<!-- a voided encounter with a mismatched order.patient_id -->
<encounter encounter_id="16" encounter_type="1" form_id="1" encounter_datetime="2007-01-01 00:00:00.0" patient_id="3" location_id="1" visit_id="1" creator="1" date_created="2007-01-01 00:00:00.0" voided="1" void_reason="testing" uuid="929809cc-8ef7-11e0-a7a1-91c116298e4b"/>
<encounter_provider encounter_provider_id="4" encounter_id="16" provider_id="1" encounter_role_id="2" creator="1" date_created="2006-03-11 15:57:35.0" voided="false" uuid="0d9b354c-e6fd-11e0-be7d-593b1cdbf439" />
<orders order_id="10" order_number="10" urgency="ROUTINE" patient_id="2" encounter_id="15" concept_id="1" orderer="1" creator="1" date_created="2006-03-11 15:57:35.0" voided="false" uuid="bf003896-2caf-42ef-8cfa-5ad29a11661f" order_action="NEW" care_setting="1"/>
<orders order_id="10" order_number="10" urgency="ROUTINE" patient_id="2" encounter_id="15" concept_id="1" orderer="1" creator="1" start_date="2012-08-19 00:00:00.0" date_created="2006-03-11 15:57:35.0" voided="false" uuid="bf003896-2caf-42ef-8cfa-5ad29a11661f" order_action="NEW" care_setting="1"/>

<visit visit_id="1" visit_type_id="2" date_started="2001-01-01 00:00:00.0" patient_id="3" location_id="1" creator="1" date_created="2005-01-01 00:00:00.0" voided="0" uuid="7fffd6b9-0970-4967-88c7-0b7b50f12ab9"/>
<global_property property="visits.assignmentHandler" property_value="" description="Set to the name of the class responsible for assigning visits to encounters." uuid="7fffd6b9-0970-4967-88c7-0b7b50f12cc6"/>
Expand Down
2 changes: 1 addition & 1 deletion api/src/test/resources/org/openmrs/api/include/OrderServiceTest-discontinuedOrder.xml
View file
@@ -1,5 +1,5 @@
<?xml version='1.0' encoding='UTF-8'?>
<dataset>
<orders order_id="25" order_number="1" urgency="ROUTINE" order_action="NEW" concept_id="88" orderer="1" instructions="2x daily" start_date="2008-08-08 00:00:00.0" date_stopped="2008-08-15 00:00:00.0" creator="1" date_created="2008-08-19 12:20:22.0" voided="false" patient_id="7" uuid="921de0a3-05c4-444a-be03-e01b4c4b9152" care_setting="1"/>
<orders order_id="26" previous_order_id="1" order_number="111" urgency="ROUTINE" order_action="DISCONTINUE" concept_id="88" creator="1" date_created="2008-08-15 00:00:00.0" voided="false" patient_id="7" uuid="e1f95924-697a-11e3-bd76-0800271c1b55" care_setting="1"/>
<orders order_id="26" previous_order_id="1" order_number="111" urgency="ROUTINE" order_action="DISCONTINUE" concept_id="88" creator="1" start_date="2008-08-08 00:00:00.0" date_created="2008-08-15 00:00:00.0" voided="false" patient_id="7" uuid="e1f95924-697a-11e3-bd76-0800271c1b55" care_setting="1"/>
</dataset>
2 changes: 1 addition & 1 deletion api/src/test/resources/org/openmrs/api/include/OrderServiceTest-reviseDiscontinuedOrders.xml
View file
Expand Up @@ -2,7 +2,7 @@
<dataset>
<orders order_id="16" order_number="6" urgency="ROUTINE" order_action="DISCONTINUE" concept_id="88" orderer="1" instructions=""
creator="1" date_created="2012-01-19 12:24:10.0"
voided="false" patient_id="2"
voided="false" patient_id="2" start_date="2012-08-19 00:00:00.0"
uuid="0c96f25c-4949-4f72-9931-d808fbcdb611" care_setting="1" />
<drug_order order_id="16" drug_inventory_id="3" dose="125.0" dose_units="50" frequency="1" as_needed="false" dosing_type="SIMPLE" duration="10"/>
</dataset>

0 comments on commit 6bfb175

Please sign in to comment.