Skip to content

Commit

Permalink
U4X-556: add dose instructions to drug orders from the clinical asses…
Browse files Browse the repository at this point in the history 
…sment form of HFE (mohuganda#500)
  • Loading branch information
@slubwama
slubwama authored May 8, 2024
1 parent 3b98b81 commit e839afb
Show file tree
Hide file tree
Showing 7 changed files with 16 additions and 9 deletions.
1 change: 1 addition & 0 deletions api/src/main/java/org/openmrs/module/ugandaemr/UgandaEMRConstants.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,7 @@ public class UgandaEMRConstants {
public static final int ARV_MEDICATION_DURATION_CONCEPT_ID = 99036;
public static final int MEDICATION_DURATION_UNIT_CONCEPT_ID = 1732;
public static final int MEDICATION_FREQUENCY = 160855;
public static final int MEDICATION_DOSE_INSTRUCTION = 175387;
public static final int CURRENTLY_TAKING_MEDICATION_CONCEPT_ID = 159367;
public static final int MEDICATION_COMMENT_CONCEPT_ID = 160632;

Expand Down
4 changes: 4 additions & 0 deletions api/src/main/java/org/openmrs/module/ugandaemr/api/impl/UgandaEMRServiceImpl.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -904,6 +904,7 @@ public Set<DrugOrderMapper> processDrugOrders(Set<Order> orders) {
drugOrderMapper.setStrength(getDrugStrength(drugOrder));
drugOrderMapper.setRoute(drugOrder.getRoute().getDisplayString());
drugOrderMapper.setAccessionNumber(drugOrder.getAccessionNumber());
drugOrderMapper.setDosingInstructions(drugOrder.getDosingInstructions());
drugOrderMapper.setCareSetting(drugOrder.getCareSetting().getName());
drugOrderMapper.setConcept(drugOrder.getConcept().getConceptId().toString());
drugOrderMapper.setConceptName(drugOrder.getConcept().getDisplayString());
Expand Down Expand Up @@ -1425,6 +1426,9 @@ public Encounter processDrugOrdersFromEncounterObs(FormEntrySession session, boo
case MEDICATION_FREQUENCY:
drugOrder.setFrequency(Context.getOrderService().getOrderFrequencyByConcept(groupMember.getValueCoded()));
break;
case MEDICATION_DOSE_INSTRUCTION:
drugOrder.setDosingInstructions(groupMember.getValueText());
break;
default:
}
}
Expand Down
1 change: 1 addition & 0 deletions api/src/main/resources/metadata/concepts_and_drugs/Concept.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11116,6 +11116,7 @@
<concept concept_id="82366" retired="0" datatype_id="4" class_id="3" is_set="0" creator="1" date_created="2006-12-17 00:00:00" version="" date_changed="2006-12-17 00:00:00" uuid="82366AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"/>
<concept concept_id="83919" retired="0" datatype_id="4" class_id="3" is_set="0" creator="1" date_created="2006-12-17 00:00:00" version="" uuid="83919AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"/>
<concept concept_id="175385" retired="0" datatype_id="3" class_id="5" is_set="0" creator="1" date_created="2024-04-19 09:06:07" version="" changed_by="1" date_changed="2024-04-19 09:06:07" uuid="7b1a6bec-30aa-4dd8-b3f0-6d83d52180c6"/>
<concept concept_id="175387" retired="0" datatype_id="3" class_id="11" is_set="0" creator="1" date_created="2024-04-28 08:05:24" version="" changed_by="1" date_changed="2024-04-28 08:05:24" uuid="8880b92b-d5ba-4243-9e54-57a3acebf347"/>
<concept concept_id="80470" retired="0" datatype_id="4" class_id="3" is_set="0" creator="1" date_created="2006-12-17 00:00:00" version="" changed_by="1" date_changed="2006-12-17 00:00:00" retired_by="1" uuid="80470AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"/>
<concept concept_id="104834" retired="0" datatype_id="4" class_id="3" is_set="0" creator="1" date_created="2007-03-11 00:00:00" version="" changed_by="1" date_changed="2020-09-27 18:45:24" retired_by="1" uuid="104834AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"/>
<concept concept_id="104843" retired="0" datatype_id="4" class_id="3" is_set="0" creator="1" date_created="2007-03-11 00:00:00" version="" changed_by="1" date_changed="2020-09-27 18:49:32" retired_by="1" uuid="104843AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"/>
Expand Down
4 changes: 1 addition & 3 deletions api/src/main/resources/metadata/concepts_and_drugs/Concept_Name.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13028,13 +13028,11 @@
<concept_name concept_name_id="187873" concept_id="1306" name="Target Not Detected" locale="en" locale_preferred="1" creator="1" date_created="2024-04-24 16:17:55" voided="0" uuid="e0e37157-ac9b-4093-b458-3e9f9672a60b" />
<concept_name concept_name_id="187872" concept_id="1675" name="RHZE" locale="en" locale_preferred="1" creator="1" date_created="2024-04-24 16:13:21" voided="0" uuid="d89abcdf-a0c8-43a1-a165-0e7a7d8010b3" />
<concept_name concept_name_id="187874" concept_id="165733" name="RHZ" locale="en" locale_preferred="1" creator="1" date_created="2020-02-20 10:36:22" voided="0" uuid="810832c4-02cd-11ef-ae28-af7c5d60cad2" />

<concept_name concept_name_id="187875" concept_id="175387" name="Dose Instructions" locale="en" locale_preferred="1" creator="1" date_created="2024-04-28 08:05:24" concept_name_type="FULLY_SPECIFIED" voided="0" uuid="356e9f15-7d13-43fc-bf9b-34a0a555d223" />
<concept_name concept_id="80470" name="Nebivolol" locale="en" creator="1" date_created="2006-12-17 00:00:00" concept_name_id="6914" voided="0" voided_by="1" uuid="6914BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB" concept_name_type="FULLY_SPECIFIED" locale_preferred="1" changed_by="1"/>
<concept_name concept_id="104834" name="Hydrochlorothiazide / losartan" locale="en" creator="1" date_created="2007-03-11 00:00:00" concept_name_id="10299" voided="0" voided_by="1" uuid="10299BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB" concept_name_type="FULLY_SPECIFIED" locale_preferred="1" changed_by="1"/>
<concept_name concept_id="104843" name="Hydrochlorothiazide / telmisartan" locale="en" creator="1" date_created="2007-03-11 00:00:00" concept_name_id="10308" voided="0" voided_by="1" uuid="10308BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB" concept_name_type="FULLY_SPECIFIED" locale_preferred="1" changed_by="1"/>
<concept_name concept_id="86056" name="Valsartan" locale="en" creator="1" date_created="2006-12-17 00:00:00" concept_name_id="8631" voided="0" voided_by="1" uuid="8631BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB" concept_name_type="FULLY_SPECIFIED" locale_preferred="1" changed_by="1"/>
<concept_name concept_id="78060" name="Insulin aspart" locale="en" creator="1" date_created="2006-12-17 00:00:00" concept_name_id="6116" voided="0" voided_by="1" uuid="6116BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB" concept_name_type="FULLY_SPECIFIED" locale_preferred="1" changed_by="1"/>
<concept_name concept_name_id="187876" concept_id="175388" name="Amlodipine/Losartan" locale="en" locale_preferred="1" creator="1" date_created="2024-04-28 08:05:24" concept_name_type="FULLY_SPECIFIED" voided="0" uuid="1128170a-0c6c-11ef-9be0-42632db81231"/>


</dataset>
2 changes: 1 addition & 1 deletion api/src/main/resources/metadata/concepts_and_drugs/Drug.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -497,7 +497,7 @@
<drug drug_id="502" concept_id="265" name="Amoxycillin and Clavulanic acid Powder for Suspension: 228.5 mg/5 mL" combination="1" dosage_form="165679" creator="1" date_created="2023-12-01 10:34:54" retired="0" uuid="fd38f360-8fa5-11ee-b9d1-0242ac120002" strength="228.5 mg/5 mL" />
<drug drug_id="503" concept_id="1243" name="Hydrochlorothiazide 12.5mg" combination="0" dosage_form="1513" creator="1" date_created="2023-12-01 10:34:54" retired="0" uuid="fd38f464-8fa5-11ee-b9d1-0242ac120002" strength="12.5mg" />
<drug drug_id="504" concept_id="164978" name="Abacavir/Lamivudine/Dolutegravir 600/300/50mg" combination="1" dosage_form="1513" creator="1" date_created="2023-12-01 10:34:54" retired="0" uuid="fd38f57c-8fa5-11ee-b9d1-0242ac120002" strength="600mg/300mg/50mg" />
<drug drug_id="505" concept_id="73087" name="Cefixime 400mg" combination="0" dosage_form="1513" creator="1" date_created="2023-12-01 10:34:54" retired="0" uuid="fd38f680-8fa5-11ee-b9d1-0242ac120002" strength="400mg" />
<drug drug_id="505" concept_id="963" name="Cefixime 400mg" combination="0" dosage_form="1513" creator="1" date_created="2023-12-01 10:34:54" retired="0" uuid="fd38f680-8fa5-11ee-b9d1-0242ac120002" strength="400mg" />
<drug drug_id="506" concept_id="71137" name="S- Amlodipine 2.5mg" combination="0" dosage_form="1513" creator="1" date_created="2023-12-01 10:34:54" retired="0" uuid="fd38f78e-8fa5-11ee-b9d1-0242ac120002" strength="2.5mg" />
<drug drug_id="507" concept_id="71137" name="S-Amlodipine 5mg" combination="0" dosage_form="1513" creator="1" date_created="2023-12-01 10:34:54" retired="0" uuid="fd38f8a6-8fa5-11ee-b9d1-0242ac120002" strength="5mg" />
<drug drug_id="508" concept_id="1675" name="(RHZE) Rifampicin 150mg/Isoniazid 75mg/Pyrazinamide 400mg/Ethambutol 275mg Blister" combination="0" dosage_form="1513" creator="1" date_created="2023-12-01 10:34:54" retired="0" uuid="6e76d65c-8fae-11ee-b9d1-0242ac120002" strength="150mg/75mg/400mg/275mg" />
Expand Down
4 changes: 4 additions & 0 deletions omod/src/main/webapp/fragments/pharmacy/newDispensingForm.gsp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -476,6 +476,10 @@ form input {
<span data-bind="if:drug && drug.toUpperCase() !== 'WRITE COMMENT'">
<label data-bind="text: drug+' '+strength+' - '+frequency"></label>
</span>

<span data-bind="if:dosingInstructions!=null">
<label data-bind="text: 'Dose Instructions: '+dosingInstructions"></label>
</span>
</div>
</td>
<td data-bind="">
Expand Down
9 changes: 4 additions & 5 deletions ...rc/main/webapp/resources/htmlforms/HMIS-HIV-003-HivCareArtCard-ClinicalAssessmentPage.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1558,11 +1558,6 @@
return false;
}

if(returnDate=="") {
jq().toastmessage('showErrorToast', "The return visit date is required");
return false;
}

//In case of a transfer out
if (transferOut == 90003) {
if (getValue('transfer_out_date.value') == "") {
Expand Down Expand Up @@ -4628,6 +4623,10 @@
<obs conceptId="160855"
labelText="Frequency"/>
</div>
<div class="col-md-6">
<obs conceptId="175387"
labelText="Dose Instruction" rows="2" cols="90"/>
</div>
<div class="col-md-3">
<div class="add-entry">
<a href="#" id="{id}-addEntry"
Expand Down

0 comments on commit e839afb

Please sign in to comment.