Prescribed medication duration measure to be 4 weeks

mekomsolutions · Jan 24, 2024 · 07e18ad · 07e18ad
1 parent 4037894
commit 07e18ad
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/api/src/main/resources/org/openmrs/module/commonreports/sql/disbursement.sql b/api/src/main/resources/org/openmrs/module/commonreports/sql/disbursement.sql
@@ -130,7 +130,7 @@ SELECT
     '80% (of registered women aged 30 to 49 years that have had their CCS screening for the first time) were VIA positive and referred' AS 'Indicator',
     CASE 
         WHEN SUM(CASE 
-            WHEN medication_table.medication_duration_in_weeks >= 3 THEN 1 
+            WHEN medication_table.medication_duration_in_weeks >= 4 THEN 1 
             ELSE 0 
         END) >= 0.8 * COUNT(*) THEN 'Yes'
         ELSE 'No'
@@ -150,8 +150,11 @@ LEFT OUTER JOIN
     (
         SELECT 
             CASE 
+                WHEN c.uuid LIKE '1822AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' THEN (d_o.duration / 672)
                 WHEN c.uuid LIKE '1072AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' THEN (d_o.duration / 7)
                 WHEN c.uuid LIKE '1073AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' THEN d_o.duration
+                WHEN c.uuid LIKE '1074AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' THEN (d_o.duration * 4.34524)
+                WHEN c.uuid LIKE '1734AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA' THEN (d_o.duration * 52.1429)
                 ELSE 0
             END AS 'medication_duration_in_weeks',
             o.encounter_id

diff --git a/...test/resources/org/openmrs/module/commonreports/include/disbursementReportTestDataset.xml b/...test/resources/org/openmrs/module/commonreports/include/disbursementReportTestDataset.xml
@@ -154,7 +154,7 @@
   <orders order_id="104" order_type_id="2" concept_id="3" orderer="1" encounter_id="2787" date_activated="2023-12-29 09:10:13.0" auto_expire_date="2024-01-13 04:17:08.0" order_reason_non_coded="160/100" creator="1" date_created="2023-12-29 04:18:20.0" voided="false" patient_id="3568" uuid="fe0aa311-b2b2-4d16-a001-70fad669a7df" urgency="ROUTINE" order_number="ORD-3" order_action="NEW" care_setting="1"/>
 
   <drug_order order_id="101" drug_inventory_id="3" dose="100.0" as_needed="true" dosing_type="org.openmrs.SimpleDosingInstructions" quantity="0.0" num_refills="0" duration="40" duration_units="337" quantity_units="51" frequency="1" dispense_as_written="false"/>
-  <drug_order order_id="102" drug_inventory_id="2" dose="35.0" as_needed="false" dosing_type="org.openmrs.SimpleDosingInstructions" quantity="5.0" num_refills="7" duration="3" duration_units="336" quantity_units="51" frequency="1" dispense_as_written="false"/>
-  <drug_order order_id="103" drug_inventory_id="2" dose="50.0" as_needed="false" dosing_type="org.openmrs.SimpleDosingInstructions" quantity="30.0" num_refills="0" duration="23" duration_units="337" quantity_units="51" frequency="1" dispense_as_written="false"/>
-  <drug_order order_id="104" drug_inventory_id="3" dose="25.0" as_needed="false" dosing_type="org.openmrs.SimpleDosingInstructions" quantity="30.0" num_refills="0" duration="30" duration_units="337" quantity_units="51" frequency="1" dispense_as_written="false"/>
+  <drug_order order_id="102" drug_inventory_id="2" dose="35.0" as_needed="false" dosing_type="org.openmrs.SimpleDosingInstructions" quantity="5.0" num_refills="7" duration="4" duration_units="336" quantity_units="51" frequency="1" dispense_as_written="false"/>
+  <drug_order order_id="103" drug_inventory_id="2" dose="50.0" as_needed="false" dosing_type="org.openmrs.SimpleDosingInstructions" quantity="30.0" num_refills="0" duration="44" duration_units="337" quantity_units="51" frequency="1" dispense_as_written="false"/>
+  <drug_order order_id="104" drug_inventory_id="3" dose="25.0" as_needed="false" dosing_type="org.openmrs.SimpleDosingInstructions" quantity="30.0" num_refills="0" duration="33" duration_units="337" quantity_units="51" frequency="1" dispense_as_written="false"/>
 </dataset>