From e3a9ff186c8ccbe04e3074627aaf88d86850043c Mon Sep 17 00:00:00 2001 From: Ohsudev <76500320+Ohsudev@users.noreply.github.com> Date: Thu, 19 Mar 2026 10:56:43 -0700 Subject: [PATCH 1/2] 25.11 fb blood processing updates (#1652) * Modified Blood Processing with latest most recent criteria for drawing blood. * Modified Blood Processing with latest most recent criteria for drawing blood. * Modified Blood Processing with latest most recent criteria for drawing blood. * Modified blood Processing program. * Modified blood Processing program. * Modified blood Processing program. * Modified blood Processing program. * Modified blood Processing program. * Modified blood Processing program. * Modified blood Processing program. * Modified blood Processing program. * Modified blood Processing program. * Modified blood Processing program. * Modified blood Processing program. * Modified blood Processing program. * Modified blood Processing program. * Modified blood Processing program. * Modified blood Processing program. * Modified blood Processing program. * Modified blood Processing program. * Modified blood Processing program. * Modified blood Processing program. * Modified blood Processing program for Gwen customized version of the reporting program. * Modified blood Processing program for Gwen customized version of the reporting program. * Modified blood Processing program for Gwen customized version of the reporting program. --- .../queries/study/processingGeneticsBloodDraws.sql | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/onprc_reports/resources/queries/study/processingGeneticsBloodDraws.sql b/onprc_reports/resources/queries/study/processingGeneticsBloodDraws.sql index 7ff1f2dc7..4c5867b54 100644 --- a/onprc_reports/resources/queries/study/processingGeneticsBloodDraws.sql +++ b/onprc_reports/resources/queries/study/processingGeneticsBloodDraws.sql @@ -51,13 +51,14 @@ SELECT ELSE 0 END as mhcBloodDrawVol, CASE + WHEN (nts.Id is not null) THEN 0 WHEN (f.flags LIKE '%DNA Bank Blood Draw Needed%') THEN 6 WHEN (f.flags LIKE '%DNA Bank Not Needed%') THEN 0 WHEN (f.flags LIKE '%DNA Bank Blood Draw Collected%') THEN 0 WHEN (s.subjectId IS NULL) THEN 6 --timestampdiff('SQL_TSI_DAY', curdate(), d.birth) > 365 AND ELSE 0 END as dnaBloodDrawVol - + FROM study.Demographics d --determine if animal has raw STR data performed by UC Davis @@ -150,6 +151,17 @@ LEFT JOIN ( GROUP BY u.Id ) u ON (u.Id = d.Id) +LEFT JOIN ( + SELECT + p.id, + max(p.date) as lastDate + FROM study.flags p + WHERE p.flag.category ='Genetics' And p.flag.value = 'DNA Bank Blood Draw Not Needed' + And p.enddate is null + GROUP BY p.id + +) nts ON (nts.id = d.id) + WHERE d.calculated_status = 'Alive' From 4967432513f9c7300f6cddd68c3ad00d9b606b3b Mon Sep 17 00:00:00 2001 From: bbimber Date: Sat, 21 Mar 2026 12:58:00 -0700 Subject: [PATCH 2/2] Fix typo in URL (#1665) --- GeneticsCore/resources/views/mhcDataDashboard.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/GeneticsCore/resources/views/mhcDataDashboard.html b/GeneticsCore/resources/views/mhcDataDashboard.html index e5583e4e5..8ca2fcdb5 100644 --- a/GeneticsCore/resources/views/mhcDataDashboard.html +++ b/GeneticsCore/resources/views/mhcDataDashboard.html @@ -66,7 +66,7 @@ 'query.viewName': 'SBT Information', 'query.readset~nonblank': null, 'query.readset/status~isblank': null, - 'query.numCachedResults~gt': 0, + 'query.numCachedResults~eq': 0, }) },{ name: 'Readsets Without Alignments',