From 11a4212d7ef72e55cc9b22834358c09335c34d47 Mon Sep 17 00:00:00 2001 From: ohsudev Date: Tue, 20 Jan 2026 23:36:59 -0800 Subject: [PATCH 1/2] Modified Offspring reporting to include surrogate mom. --- .../study/demographicsOffspringBSU.query.xml | 8 ++++++++ .../queries/study/demographicsOffspringBSU.sql | 3 ++- .../study/demographicsOffspringBSU/.qview.xml | 1 + .../study/demographicsParents/.qview.xml | 1 + .../study/demographicsParentsBSU.query.xml | 8 ++++++++ .../queries/study/demographicsParentsBSU.sql | 18 +++++++++++++++--- 6 files changed, 35 insertions(+), 4 deletions(-) diff --git a/onprc_ehr/resources/queries/study/demographicsOffspringBSU.query.xml b/onprc_ehr/resources/queries/study/demographicsOffspringBSU.query.xml index 7404ad7f6..cb64f6f1d 100644 --- a/onprc_ehr/resources/queries/study/demographicsOffspringBSU.query.xml +++ b/onprc_ehr/resources/queries/study/demographicsOffspringBSU.query.xml @@ -43,6 +43,14 @@ Foster Dam + + Surrogate Dam + + study + animal + id + + Sire diff --git a/onprc_ehr/resources/queries/study/demographicsOffspringBSU.sql b/onprc_ehr/resources/queries/study/demographicsOffspringBSU.sql index 26a72138b..b85b7ce43 100644 --- a/onprc_ehr/resources/queries/study/demographicsOffspringBSU.sql +++ b/onprc_ehr/resources/queries/study/demographicsOffspringBSU.sql @@ -17,6 +17,7 @@ d2.status, d2.geneticdam, d2.observeddam, d2.fosterMom, +d2.surrogateMom, d2.sire, d2.sireType, d.qcstate @@ -25,7 +26,7 @@ FROM study.Demographics d INNER JOIN study.demographicsParentsBSU d2 - ON ((d2.sire = d.id OR d2.geneticdam = d.id OR d2.fostermom = d.id OR d2.observeddam = d.id) AND d.id != d2.id) + ON ((d2.sire = d.id OR d2.geneticdam = d.id OR d2.fosterMom = d.id OR d2.surrogateMom = d.id OR d2.observeddam = d.id) AND d.id != d2.id) diff --git a/onprc_ehr/resources/queries/study/demographicsOffspringBSU/.qview.xml b/onprc_ehr/resources/queries/study/demographicsOffspringBSU/.qview.xml index 4a4679a82..fd9958bee 100644 --- a/onprc_ehr/resources/queries/study/demographicsOffspringBSU/.qview.xml +++ b/onprc_ehr/resources/queries/study/demographicsOffspringBSU/.qview.xml @@ -15,6 +15,7 @@ + diff --git a/onprc_ehr/resources/queries/study/demographicsParents/.qview.xml b/onprc_ehr/resources/queries/study/demographicsParents/.qview.xml index 2ab5905b4..01e76b9af 100644 --- a/onprc_ehr/resources/queries/study/demographicsParents/.qview.xml +++ b/onprc_ehr/resources/queries/study/demographicsParents/.qview.xml @@ -6,6 +6,7 @@ + diff --git a/onprc_ehr/resources/queries/study/demographicsParentsBSU.query.xml b/onprc_ehr/resources/queries/study/demographicsParentsBSU.query.xml index 5790dc400..e947589e1 100644 --- a/onprc_ehr/resources/queries/study/demographicsParentsBSU.query.xml +++ b/onprc_ehr/resources/queries/study/demographicsParentsBSU.query.xml @@ -48,6 +48,14 @@ id + + Surrogate Dam + + study + animal + id + + Number of Parents Known diff --git a/onprc_ehr/resources/queries/study/demographicsParentsBSU.sql b/onprc_ehr/resources/queries/study/demographicsParentsBSU.sql index 76f64855f..78542443f 100644 --- a/onprc_ehr/resources/queries/study/demographicsParentsBSU.sql +++ b/onprc_ehr/resources/queries/study/demographicsParentsBSU.sql @@ -42,9 +42,14 @@ SELECT p3.parent as fosterMom, p3.method as fosterType, - (CASE WHEN p3.parent IS NOT NULL THEN 1 ELSE 0 END + - CASE WHEN coalesce(p2.parent, b.dam) IS NOT NULL THEN 1 ELSE 0 END + - CASE WHEN coalesce(p1.parent, b.sire) IS NOT NULL THEN 1 ELSE 0 END) as numParents + +p4.parent as surrogateMom, +p4.method as surrogateType, + + (CASE WHEN p4.parent IS NOT NULL THEN 1 ELSE 0 END + + CASE WHEN p3.parent IS NOT NULL THEN 1 ELSE 0 END + + CASE WHEN coalesce(p2.parent, b.dam) IS NOT NULL THEN 1 ELSE 0 END + + CASE WHEN coalesce(p1.parent, b.sire) IS NOT NULL THEN 1 ELSE 0 END) as numParents FROM study.demographics d @@ -68,5 +73,12 @@ LEFT JOIN ( WHERE p3.relationship = 'Foster Dam' AND p3.enddate IS NULL GROUP BY p3.Id ) p3 ON (d.Id = p3.id) + +LEFT JOIN ( + select p4.id, min(p4.method) as method, max(p4.parent) as parent + FROM study.parentage p4 + WHERE p4.relationship = 'Surrogate Dam' AND p4.enddate IS NULL + GROUP BY p4.Id +) p4 ON (d.Id = p4.id) LEFT JOIN study.birth b ON (b.id = d.id) From 1e790654528034c132d0d7c8ae85193b2bbd6f1f Mon Sep 17 00:00:00 2001 From: Ohsudev <76500320+Ohsudev@users.noreply.github.com> Date: Wed, 21 Jan 2026 11:48:42 -0800 Subject: [PATCH 2/2] Modified Offspring reporting to include surrogate mom. --- .../queries/study/demographicsOffspringBSU.sql | 2 +- .../queries/study/demographicsParentsBSU.sql | 14 ++++++++++---- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/onprc_ehr/resources/queries/study/demographicsOffspringBSU.sql b/onprc_ehr/resources/queries/study/demographicsOffspringBSU.sql index b85b7ce43..47fe27b8d 100644 --- a/onprc_ehr/resources/queries/study/demographicsOffspringBSU.sql +++ b/onprc_ehr/resources/queries/study/demographicsOffspringBSU.sql @@ -26,7 +26,7 @@ FROM study.Demographics d INNER JOIN study.demographicsParentsBSU d2 - ON ((d2.sire = d.id OR d2.geneticdam = d.id OR d2.fosterMom = d.id OR d2.surrogateMom = d.id OR d2.observeddam = d.id) AND d.id != d2.id) + ON ((d2.sire = d.id OR d2.geneticdam = d.id OR d2.fosterMom = d.id OR d2.observeddam = d.id) AND d.id != d2.id) diff --git a/onprc_ehr/resources/queries/study/demographicsParentsBSU.sql b/onprc_ehr/resources/queries/study/demographicsParentsBSU.sql index 78542443f..66657396f 100644 --- a/onprc_ehr/resources/queries/study/demographicsParentsBSU.sql +++ b/onprc_ehr/resources/queries/study/demographicsParentsBSU.sql @@ -39,12 +39,18 @@ SELECT ELSE null END as sireType, - p3.parent as fosterMom, - p3.method as fosterType, + coalesce(p3.parent, '') as fosterMom, + CASE + WHEN p3.parent IS NOT NULL THEN p3.method + ELSE null + END as fosterType, -p4.parent as surrogateMom, -p4.method as surrogateType, + coalesce(p4.parent, '') as surrogateMom, + CASE + WHEN p4.parent IS NOT NULL THEN p4.method + ELSE null + END as surrogateType, (CASE WHEN p4.parent IS NOT NULL THEN 1 ELSE 0 END + CASE WHEN p3.parent IS NOT NULL THEN 1 ELSE 0 END +