From 7e8fbb4d30564a48608eef0325eed7fcef6236dc Mon Sep 17 00:00:00 2001 From: Marty Pradere Date: Mon, 6 Oct 2025 16:33:35 -0700 Subject: [PATCH 1/4] Update active protocol assignment --- .../queries/study/demographicsActiveProtocolAssignment.sql | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/nirc_ehr/resources/queries/study/demographicsActiveProtocolAssignment.sql b/nirc_ehr/resources/queries/study/demographicsActiveProtocolAssignment.sql index e33d7dca..cc4e78bb 100644 --- a/nirc_ehr/resources/queries/study/demographicsActiveProtocolAssignment.sql +++ b/nirc_ehr/resources/queries/study/demographicsActiveProtocolAssignment.sql @@ -10,4 +10,5 @@ SELECT END as varchar(500)) as protocolString FROM study.demographics d -LEFT JOIN study.protocolAssignment a ON (a.id = d.id AND a.enddate IS NULL) \ No newline at end of file +LEFT JOIN study.protocolAssignment a ON (a.id = d.id AND a.enddate IS NULL) +WHERE a.qcstate.publicdata = true \ No newline at end of file From d802cffe78e4f737474198f75232f7cb231824fa Mon Sep 17 00:00:00 2001 From: Marty Pradere Date: Mon, 6 Oct 2025 16:36:00 -0700 Subject: [PATCH 2/4] Update active project assignments --- .../queries/study/demographicsActiveProjectAssignment.sql | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/nirc_ehr/resources/queries/study/demographicsActiveProjectAssignment.sql b/nirc_ehr/resources/queries/study/demographicsActiveProjectAssignment.sql index f3cbc84a..5ae89560 100644 --- a/nirc_ehr/resources/queries/study/demographicsActiveProjectAssignment.sql +++ b/nirc_ehr/resources/queries/study/demographicsActiveProjectAssignment.sql @@ -2,4 +2,5 @@ SELECT d.id, a.project.name as project FROM study.demographics d -LEFT JOIN study.assignment a ON (a.id = d.id AND a.enddate IS NULL) \ No newline at end of file +LEFT JOIN study.assignment a ON (a.id = d.id AND a.enddate IS NULL) +WHERE a.qcstate.publicdata = true \ No newline at end of file From 8ecd08b70dfd6e362eed83026bf185914370a6cd Mon Sep 17 00:00:00 2001 From: Marty Pradere Date: Mon, 6 Oct 2025 16:42:07 -0700 Subject: [PATCH 3/4] More qcstate checks --- nirc_ehr/resources/queries/study/demographicsCagemates.sql | 2 +- nirc_ehr/resources/queries/study/demographicsCurLocation.sql | 2 +- nirc_ehr/resources/queries/study/demographicsOffspring.sql | 1 + nirc_ehr/resources/queries/study/demographicsParents.sql | 1 + nirc_ehr/resources/queries/study/demographicsSiblings.sql | 2 +- nirc_ehr/resources/queries/study/demographicsSource.sql | 1 + 6 files changed, 6 insertions(+), 3 deletions(-) diff --git a/nirc_ehr/resources/queries/study/demographicsCagemates.sql b/nirc_ehr/resources/queries/study/demographicsCagemates.sql index 3c8824d2..4a4cfd85 100644 --- a/nirc_ehr/resources/queries/study/demographicsCagemates.sql +++ b/nirc_ehr/resources/queries/study/demographicsCagemates.sql @@ -20,7 +20,7 @@ JOIN study.housing h2 ON (h2.Id.demographics.calculated_status = 'Alive' AND (h.cage = h2.cage)) -WHERE h.enddateTimeCoalesced >= now() +WHERE h.enddateTimeCoalesced >= now() AND h.qcstate.publicdata = true AND h2.qcstate.publicdata = true GROUP BY h.id, h.room, h.cage ) t ON (t.id = d.id) diff --git a/nirc_ehr/resources/queries/study/demographicsCurLocation.sql b/nirc_ehr/resources/queries/study/demographicsCurLocation.sql index 441ed163..d2fc0f0c 100644 --- a/nirc_ehr/resources/queries/study/demographicsCurLocation.sql +++ b/nirc_ehr/resources/queries/study/demographicsCurLocation.sql @@ -33,5 +33,5 @@ d2.performedBy.displayName AS performedBy FROM study.housing d2 -WHERE d2.enddate IS NULL +WHERE d2.enddate IS NULL AND d2.qcstate.publicdata = true AND d2.qcstate.publicdata = true \ No newline at end of file diff --git a/nirc_ehr/resources/queries/study/demographicsOffspring.sql b/nirc_ehr/resources/queries/study/demographicsOffspring.sql index 658d98bd..56bd0b3c 100644 --- a/nirc_ehr/resources/queries/study/demographicsOffspring.sql +++ b/nirc_ehr/resources/queries/study/demographicsOffspring.sql @@ -17,5 +17,6 @@ FROM study.Demographics d INNER JOIN study.Demographics d2 ON ((d2.sire = d.id OR d2.dam = d.id) AND d.id != d2.id) +WHERE d.qcstate.publicdata = true group by d.id, d2.id, d2.birth, d2.sire, d2.dam, d2.gender, d.qcstate diff --git a/nirc_ehr/resources/queries/study/demographicsParents.sql b/nirc_ehr/resources/queries/study/demographicsParents.sql index c574e57e..c5c7c5f5 100644 --- a/nirc_ehr/resources/queries/study/demographicsParents.sql +++ b/nirc_ehr/resources/queries/study/demographicsParents.sql @@ -25,6 +25,7 @@ SELECT ELSE 0 END as numParents FROM study.demographics d +WHERE d.qcstate.publicdata = true -- TODO: Incorporate fostering? Genetic testing? diff --git a/nirc_ehr/resources/queries/study/demographicsSiblings.sql b/nirc_ehr/resources/queries/study/demographicsSiblings.sql index 327c16a9..fd941404 100644 --- a/nirc_ehr/resources/queries/study/demographicsSiblings.sql +++ b/nirc_ehr/resources/queries/study/demographicsSiblings.sql @@ -30,7 +30,7 @@ FROM study.Demographics d1 JOIN study.Demographics d2 ON ((d2.id.parents.sire = d1.id.parents.sire OR d2.id.parents.dam = d1.id.parents.dam) AND d1.id != d2.id) -WHERE d2.id is not null +WHERE d2.id IS NOT NULL AND d1.qcstate.publicdata = true AND d2.qcstate.publicdata = true -- ) t diff --git a/nirc_ehr/resources/queries/study/demographicsSource.sql b/nirc_ehr/resources/queries/study/demographicsSource.sql index 8bc3ef6f..6f0d380f 100644 --- a/nirc_ehr/resources/queries/study/demographicsSource.sql +++ b/nirc_ehr/resources/queries/study/demographicsSource.sql @@ -27,4 +27,5 @@ LEFT JOIN ON (T1.Id = d.Id) LEFT JOIN study.arrival T2 ON (t2.id = d.id AND t2.date = t1.earliestArrival) +WHERE d.qcstate.publicdata = true AND t2.qcstate.publicdata = true AND t1.qcstate.publicdata = true From f9114749628436b7f5fc047e754ddf573ca00101 Mon Sep 17 00:00:00 2001 From: Marty Pradere Date: Fri, 10 Oct 2025 10:49:46 -0700 Subject: [PATCH 4/4] fix query --- nirc_ehr/resources/queries/study/demographicsSource.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nirc_ehr/resources/queries/study/demographicsSource.sql b/nirc_ehr/resources/queries/study/demographicsSource.sql index 6f0d380f..7c69b924 100644 --- a/nirc_ehr/resources/queries/study/demographicsSource.sql +++ b/nirc_ehr/resources/queries/study/demographicsSource.sql @@ -27,5 +27,5 @@ LEFT JOIN ON (T1.Id = d.Id) LEFT JOIN study.arrival T2 ON (t2.id = d.id AND t2.date = t1.earliestArrival) -WHERE d.qcstate.publicdata = true AND t2.qcstate.publicdata = true AND t1.qcstate.publicdata = true +WHERE d.qcstate.publicdata = true AND t2.qcstate.publicdata = true