[Bug]Kavitha | fix dateless appt exception when patient merge

Bahmni · Dec 29, 2023 · 226fa9e · 226fa9e
1 parent 7f58e0f
commit 226fa9e
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/api/src/main/java/org/openmrs/module/appointments/dao/impl/AppointmentDaoImpl.java b/api/src/main/java/org/openmrs/module/appointments/dao/impl/AppointmentDaoImpl.java
@@ -205,6 +205,9 @@ public List<Appointment> getAppointmentsForPatient(Integer patientId) {
     @Override
     public List<Appointment> getDatelessAppointments() {
         Criteria criteria = sessionFactory.getCurrentSession().createCriteria(Appointment.class);
+        criteria.createAlias("patient", "patient");
+        criteria.add(Restrictions.eq("patient.voided", false));
+        criteria.add(Restrictions.eq("patient.personVoided", false));
         criteria.add(Restrictions.isNull("startDateTime"));
         criteria.add(Restrictions.isNull("endDateTime"));
         criteria.addOrder(Order.asc("dateCreated"));