BAH-3079 | add. medications tagged as inpatient to be fetched in acti…

…ve and inactive drug orders
Bahmni · Jul 12, 2023 · c787d7b · c787d7b
1 parent c7199cf
commit c787d7b
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 9 deletions.
diff --git a/...i/src/main/java/org/bahmni/module/bahmnicore/service/impl/BahmniDrugOrderServiceImpl.java b/...i/src/main/java/org/bahmni/module/bahmnicore/service/impl/BahmniDrugOrderServiceImpl.java
@@ -97,11 +97,17 @@ public Map<String,DrugOrder> getDiscontinuedDrugOrders(List<DrugOrder> drugOrder
     public List<DrugOrder> getInactiveDrugOrders(String patientUuid, Set<Concept> concepts, Set<Concept> drugConceptsToBeExcluded,
                                                  Collection<Encounter> encounters) {
         Patient patient = openmrsPatientService.getPatientByUuid(patientUuid);
-        CareSetting careSettingByName = orderService.getCareSettingByName(CareSetting.CareSettingType.OUTPATIENT.toString());
+        CareSetting outPatientCareSetting = orderService.getCareSettingByName(CareSetting.CareSettingType.OUTPATIENT.toString());
+        CareSetting inPatientCareSetting = orderService.getCareSettingByName(CareSetting.CareSettingType.INPATIENT.toString());
         Date asOfDate = new Date();
-        List<Order> orders = orderDao.getInactiveOrders(patient, orderService.getOrderTypeByName("Drug order"),
-                careSettingByName, asOfDate, concepts, drugConceptsToBeExcluded, encounters);
-        return mapOrderToDrugOrder(orders);
+        List<Order> outPatientOrders = orderDao.getInactiveOrders(patient, orderService.getOrderTypeByName("Drug order"),
+                outPatientCareSetting, asOfDate, concepts, drugConceptsToBeExcluded, encounters);
+        List<Order> inPatientOrders = orderDao.getInactiveOrders(patient, orderService.getOrderTypeByName("Drug order"),
+                inPatientCareSetting, asOfDate, concepts, drugConceptsToBeExcluded, encounters);
+        List<Order> allActiveDrugOrders = new ArrayList<>();
+        allActiveDrugOrders.addAll(outPatientOrders);
+        allActiveDrugOrders.addAll(inPatientOrders);
+        return mapOrderToDrugOrder(allActiveDrugOrders);
     }
 
     @Override
@@ -204,10 +210,16 @@ private List<OrderFrequencyData> getFrequencies() {
     private List<DrugOrder> getActiveDrugOrders(String patientUuid, Date asOfDate, Set<Concept> conceptsToFilter,
                                                 Set<Concept> conceptsToExclude, Date startDate, Date endDate, Collection<Encounter> encounters) {
         Patient patient = openmrsPatientService.getPatientByUuid(patientUuid);
-        CareSetting careSettingByName = orderService.getCareSettingByName(CareSetting.CareSettingType.OUTPATIENT.toString());
-        List<Order> orders = orderDao.getActiveOrders(patient, orderService.getOrderTypeByName("Drug order"),
-                careSettingByName, asOfDate, conceptsToFilter, conceptsToExclude, startDate, endDate, encounters);
-        return mapOrderToDrugOrder(orders);
+        CareSetting outPatientCareSetting = orderService.getCareSettingByName(CareSetting.CareSettingType.OUTPATIENT.toString());
+        CareSetting inPatientCareSetting = orderService.getCareSettingByName(CareSetting.CareSettingType.INPATIENT.toString());
+        List<Order> outPatientOrders = orderDao.getActiveOrders(patient, orderService.getOrderTypeByName("Drug order"),
+                outPatientCareSetting, asOfDate, conceptsToFilter, conceptsToExclude, startDate, endDate, encounters);
+        List<Order> inPatientOrders = orderDao.getActiveOrders(patient, orderService.getOrderTypeByName("Drug order"),
+                inPatientCareSetting, asOfDate, conceptsToFilter, conceptsToExclude, startDate, endDate, encounters);
+        List<Order> allActiveDrugOrders = new ArrayList<>();
+        allActiveDrugOrders.addAll(outPatientOrders);
+        allActiveDrugOrders.addAll(inPatientOrders);
+        return mapOrderToDrugOrder(allActiveDrugOrders);
     }
 
     private List<DrugOrder> mapOrderToDrugOrder(List<Order> orders){

diff --git a/...c/test/java/org/bahmni/module/bahmnicore/service/impl/BahmniDrugOrderServiceImplTest.java b/...c/test/java/org/bahmni/module/bahmnicore/service/impl/BahmniDrugOrderServiceImplTest.java
@@ -33,6 +33,7 @@
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.verifyNoMoreInteractions;
 import static org.mockito.Mockito.when;
+import static org.mockito.Mockito.times;
 import static org.mockito.MockitoAnnotations.initMocks;
 
 public class BahmniDrugOrderServiceImplTest {
@@ -85,7 +86,7 @@ public void shouldGetActiveDrugOrdersOfAPatientProgram() throws ParseException {
        bahmniDrugOrderService.getDrugOrders(PATIENT_UUID, true, conceptsToFilter, null, PATIENT_PROGRAM_UUID);
 
         final Date value = dateArgumentCaptor.getValue();
-        verify(orderDao).getActiveOrders(mockPatient, mockOrderType, mockCareSetting, value, conceptsToFilter, null, null, null, encounters);
+        verify(orderDao, times(2)).getActiveOrders(mockPatient, mockOrderType, mockCareSetting, value, conceptsToFilter, null, null, null, encounters);
     }
 
     @Test