From b291b1aab71bfab510e65cebe2aa277a1b87e3f3 Mon Sep 17 00:00:00 2001 From: Kavitha S Date: Wed, 31 Jan 2024 10:27:19 +0530 Subject: [PATCH] Kavitha | add void condition in fetching slots --- .../org/openmrs/module/ipd/api/dao/impl/HibernateSlotDAO.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/api/src/main/java/org/openmrs/module/ipd/api/dao/impl/HibernateSlotDAO.java b/api/src/main/java/org/openmrs/module/ipd/api/dao/impl/HibernateSlotDAO.java index 4415a89..26e385a 100644 --- a/api/src/main/java/org/openmrs/module/ipd/api/dao/impl/HibernateSlotDAO.java +++ b/api/src/main/java/org/openmrs/module/ipd/api/dao/impl/HibernateSlotDAO.java @@ -119,7 +119,7 @@ public List getSlotsBySubjectIncludingAdministeredTimeFrame(Reference subj Query query = sessionFactory.getCurrentSession() .createQuery("SELECT slot FROM Slot slot " + "LEFT JOIN slot.medicationAdministration medAdmin " + - "WHERE (slot.schedule.subject = :subject) AND " + + "WHERE (slot.schedule.subject = :subject) AND slot.voided = 0 AND " + "(((slot.startDateTime BETWEEN :startDateTime AND :endDateTime) AND " + "(medAdmin.administeredDateTime BETWEEN :startDate AND :endDate or medAdmin is null)) OR " + "(medAdmin is not null AND " +