Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Kavitha | add void condition in fetching slots #20

Merged
merged 1 commit into from
Jan 31, 2024
Merged

Kavitha | add void condition in fetching slots #20

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion api/src/main/java/org/openmrs/module/ipd/api/dao/impl/HibernateSlotDAO.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ public List<Slot> 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 " +
Expand Down
Loading