OpenMRS

Timestamp:

05/09/08 10:53:35 (2 months ago)

Author:

bwolfe

Message:

Merging report-api-refactoring to trunk [2696]:[4157]

Files:

• openmrs/trunk/src/api/org/openmrs/api/db/hibernate/HibernateProgramWorkflowDAO.java (modified) (2 diffs)

openmrs/trunk/src/api/org/openmrs/api/db/hibernate/HibernateProgramWorkflowDAO.java

@@ -29 +29 @@
-import org.hibernate.criterion.Order;
-import org.hibernate.criterion.Restrictions;
+import org.openmrs.Cohort;
-import org.openmrs.Concept;
-import org.openmrs.ConceptStateConversion;
@@ -128 +129 @@
-        }
-        
+    public List<PatientProgram> getPatientPrograms(Cohort cohort, Collection<Program> programs) {
+                String hql = "from PatientProgram ";
+                if (cohort != null || programs != null)
+                        hql += "where ";
+                if (cohort != null)
+                        hql += "patient.patientId in (:patientIds) ";
+                if (programs != null) {
+                        if (cohort != null)
+                                hql += "and ";
+                        hql += " program in (:programs)";
+                }
+                hql += " order by patient.patientId, dateEnrolled";
+                Query query = sessionFactory.getCurrentSession().createQuery(hql);
+                if (cohort != null)
+                        query.setParameterList("patientIds", cohort.getMemberIds());
+                if (programs != null)
+                        query.setParameterList("programs", programs);
+                return query.list();
+    }
+
-        public ProgramWorkflow getWorkflow(Integer id) {
-                return (ProgramWorkflow) sessionFactory.getCurrentSession().get(ProgramWorkflow.class, id);