Cric 1880 new irb report request (#1833)

broadinstitute · May 3, 2024 · 317fa38 · 317fa38
1 parent a875ceb
commit 317fa38
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/grails-app/services/org/broadinstitute/orsp/QueryService.groovy b/grails-app/services/org/broadinstitute/orsp/QueryService.groovy
@@ -1995,7 +1995,9 @@ class QueryService implements Status {
                                     .append("LEFT JOIN ( ")
                                     .append("SELECT project_key, CONCAT(GROUP_CONCAT(CONCAT(' ', source, ': \"', name, '\"'))) as funding_source ")
                                     .append("FROM funding GROUP BY project_key) t3 ON t1.project_key = t3.project_key ")
-                                    .append("WHERE t1.type = 'IRB Project' AND (t1.status = 'Approved' OR t1.approval_status = 'Approved') ")
+                                    .append("WHERE t1.type = 'IRB Project' AND ( ")
+                                    .append("(t1.status = 'Approved' AND t1.approval_status != \"Withdrawn\" AND t1.approval_status != \"Closed\" AND t1.approval_status != \"Abandoned\") ")
+                                    .append("OR t1.approval_status = 'Approved') ")
                                     .append("GROUP BY t1.project_key, t1.request_date ORDER BY t1.request_date;")
         final SQLQuery sqlQuery = session.createSQLQuery(query)
         final result = sqlQuery.with {