From accec520366a7ea440b5cef517bfb9dc614152bd Mon Sep 17 00:00:00 2001 From: ohsudev Date: Wed, 7 Jan 2026 14:03:36 -0800 Subject: [PATCH 1/2] Created a new reporting program called "Tissue Distribution by AnimalID per Calendar". --- ...sueDistributionSummaryCalendarYr.query.xml | 2 +- ...utionSummarybyAnimalIDCalendarYr.query.xml | 31 +++++++++++++++++++ ...istributionSummarybyAnimalIDCalendarYr.sql | 15 +++++++++ .../.qview.xml | 6 ++++ ...ibutionSummarybyAnimalIDFiscalYr.query.xml | 31 +++++++++++++++++++ ...eDistributionSummarybyAnimalIDFiscalYr.sql | 15 +++++++++ .../.qview.xml | 6 ++++ ...tionSummarybyRecipientCalendarYr.query.xml | 2 +- 8 files changed, 106 insertions(+), 2 deletions(-) create mode 100644 onprc_ehr/resources/queries/study/TissueDistributionSummarybyAnimalIDCalendarYr.query.xml create mode 100644 onprc_ehr/resources/queries/study/TissueDistributionSummarybyAnimalIDCalendarYr.sql create mode 100644 onprc_ehr/resources/queries/study/TissueDistributionSummarybyAnimalIDCalendarYr/.qview.xml create mode 100644 onprc_ehr/resources/queries/study/TissueDistributionSummarybyAnimalIDFiscalYr.query.xml create mode 100644 onprc_ehr/resources/queries/study/TissueDistributionSummarybyAnimalIDFiscalYr.sql create mode 100644 onprc_ehr/resources/queries/study/TissueDistributionSummarybyAnimalIDFiscalYr/.qview.xml diff --git a/onprc_ehr/resources/queries/study/TissueDistributionSummaryCalendarYr.query.xml b/onprc_ehr/resources/queries/study/TissueDistributionSummaryCalendarYr.query.xml index a33c892f9..6208d338d 100644 --- a/onprc_ehr/resources/queries/study/TissueDistributionSummaryCalendarYr.query.xml +++ b/onprc_ehr/resources/queries/study/TissueDistributionSummaryCalendarYr.query.xml @@ -2,7 +2,7 @@ - Tissue Distribution Summary + Tissue Distribution Summary By Calendar Year Total Samples diff --git a/onprc_ehr/resources/queries/study/TissueDistributionSummarybyAnimalIDCalendarYr.query.xml b/onprc_ehr/resources/queries/study/TissueDistributionSummarybyAnimalIDCalendarYr.query.xml new file mode 100644 index 000000000..5801a6240 --- /dev/null +++ b/onprc_ehr/resources/queries/study/TissueDistributionSummarybyAnimalIDCalendarYr.query.xml @@ -0,0 +1,31 @@ + + + +
+ Tissue Distribution Summary By Animal ID Per Calendar Year + + + Total Samples + /query/executeQuery.view? + schemaName=study&& + query.queryName=Tissue Distributions& + query.calendarYear~eq=${calendarYear}& + query.id~eq=${id}& + query.QCState/Label~in=Completed;Request: Pending& + + + + Distinct Animal IDs + /query/executeQuery.view? + schemaName=study& + query.queryName=Tissue Distributions& + query.calendarYear~eq=${calendarYear}& + query.id~eq=${id}& + query.QCState/Label~in=Completed;Request: Pending& + + + +
+ + + \ No newline at end of file diff --git a/onprc_ehr/resources/queries/study/TissueDistributionSummarybyAnimalIDCalendarYr.sql b/onprc_ehr/resources/queries/study/TissueDistributionSummarybyAnimalIDCalendarYr.sql new file mode 100644 index 000000000..e834b541b --- /dev/null +++ b/onprc_ehr/resources/queries/study/TissueDistributionSummarybyAnimalIDCalendarYr.sql @@ -0,0 +1,15 @@ +-- Added: 1-2-2018 R.Blasa +SELECT + calendarYear, + t.id, +-- t.recipient.affiliation, +-- t.requestCategory, + count(t.Id) as totalSamples, + count(distinct t.Id) as distinctAnimals, + count(distinct t.recipient) as distinctRecipients + +FROM study.tissueDistributions t +Where t.taskid is not null + And t.QCState.Label in ('Request: Pending','Completed') + +GROUP BY calendarYear, t.id \ No newline at end of file diff --git a/onprc_ehr/resources/queries/study/TissueDistributionSummarybyAnimalIDCalendarYr/.qview.xml b/onprc_ehr/resources/queries/study/TissueDistributionSummarybyAnimalIDCalendarYr/.qview.xml new file mode 100644 index 000000000..4f925f9e0 --- /dev/null +++ b/onprc_ehr/resources/queries/study/TissueDistributionSummarybyAnimalIDCalendarYr/.qview.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/onprc_ehr/resources/queries/study/TissueDistributionSummarybyAnimalIDFiscalYr.query.xml b/onprc_ehr/resources/queries/study/TissueDistributionSummarybyAnimalIDFiscalYr.query.xml new file mode 100644 index 000000000..cc0391db3 --- /dev/null +++ b/onprc_ehr/resources/queries/study/TissueDistributionSummarybyAnimalIDFiscalYr.query.xml @@ -0,0 +1,31 @@ + + + + + Tissue Distribution Summary By Animal ID Per Fiscal Year + + + Total Samples + /query/executeQuery.view? + schemaName=study& + query.queryName=Tissue Distributions& + query.fiscalYear~eq=${fiscalYear}& + query.id~eq=${id}& + query.QCState/Label~in=Completed;Request: Pending& + + + + Distinct Animal IDs + /query/executeQuery.view? + schemaName=study&& + query.queryName=Tissue Distributions& + query.fiscalYear~eq=${fiscaYear}& + query.id~eq=${id}& + query.QCState/Label~in=Completed;Request: Pending& + + + +
+ + + \ No newline at end of file diff --git a/onprc_ehr/resources/queries/study/TissueDistributionSummarybyAnimalIDFiscalYr.sql b/onprc_ehr/resources/queries/study/TissueDistributionSummarybyAnimalIDFiscalYr.sql new file mode 100644 index 000000000..72c23c1fd --- /dev/null +++ b/onprc_ehr/resources/queries/study/TissueDistributionSummarybyAnimalIDFiscalYr.sql @@ -0,0 +1,15 @@ +-- Added: 1-2-2018 R.Blasa +SELECT + fiscalYear, + t.id, +-- t.recipient.affiliation, +-- t.requestCategory, + count(t.Id) as totalSamples, + count(distinct t.Id) as distinctAnimals, + count(distinct t.recipient) as distinctRecipients + +FROM study.tissueDistributions t +Where t.taskid is not null + And t.QCState.Label in ('Request: Pending','Completed') + +GROUP BY fiscalYear, t.id \ No newline at end of file diff --git a/onprc_ehr/resources/queries/study/TissueDistributionSummarybyAnimalIDFiscalYr/.qview.xml b/onprc_ehr/resources/queries/study/TissueDistributionSummarybyAnimalIDFiscalYr/.qview.xml new file mode 100644 index 000000000..85a4caabd --- /dev/null +++ b/onprc_ehr/resources/queries/study/TissueDistributionSummarybyAnimalIDFiscalYr/.qview.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/onprc_ehr/resources/queries/study/TissueDistributionSummarybyRecipientCalendarYr.query.xml b/onprc_ehr/resources/queries/study/TissueDistributionSummarybyRecipientCalendarYr.query.xml index 518ec01a4..34ea7529c 100644 --- a/onprc_ehr/resources/queries/study/TissueDistributionSummarybyRecipientCalendarYr.query.xml +++ b/onprc_ehr/resources/queries/study/TissueDistributionSummarybyRecipientCalendarYr.query.xml @@ -2,7 +2,7 @@ - Tissue Distribution Summary By Recipient + Tissue Distribution Summary By Recipient By Calendar Year Total Samples From 73cf7dbb30eb5bc627c79f6389d39bf293908f6e Mon Sep 17 00:00:00 2001 From: ohsudev Date: Wed, 7 Jan 2026 14:19:37 -0800 Subject: [PATCH 2/2] Created a new reporting program called "Tissue Distribution by AnimalID per Calendar". --- ...ssueDistributionSummarybyAnimalIDCalendarYr.query.xml | 2 +- ...TissueDistributionSummarybyAnimalIDFiscalYr.query.xml | 4 ++-- .../TissueDistributionSummarybyAnimalIDFiscalYr.sql | 2 -- onprc_ehr/src/org/labkey/onprc_ehr/ONPRC_EHRModule.java | 9 ++++++++- 4 files changed, 11 insertions(+), 6 deletions(-) diff --git a/onprc_ehr/resources/queries/study/TissueDistributionSummarybyAnimalIDCalendarYr.query.xml b/onprc_ehr/resources/queries/study/TissueDistributionSummarybyAnimalIDCalendarYr.query.xml index 5801a6240..db599ded7 100644 --- a/onprc_ehr/resources/queries/study/TissueDistributionSummarybyAnimalIDCalendarYr.query.xml +++ b/onprc_ehr/resources/queries/study/TissueDistributionSummarybyAnimalIDCalendarYr.query.xml @@ -7,7 +7,7 @@ Total Samples /query/executeQuery.view? - schemaName=study&& + schemaName=study& query.queryName=Tissue Distributions& query.calendarYear~eq=${calendarYear}& query.id~eq=${id}& diff --git a/onprc_ehr/resources/queries/study/TissueDistributionSummarybyAnimalIDFiscalYr.query.xml b/onprc_ehr/resources/queries/study/TissueDistributionSummarybyAnimalIDFiscalYr.query.xml index cc0391db3..fb0a59734 100644 --- a/onprc_ehr/resources/queries/study/TissueDistributionSummarybyAnimalIDFiscalYr.query.xml +++ b/onprc_ehr/resources/queries/study/TissueDistributionSummarybyAnimalIDFiscalYr.query.xml @@ -17,9 +17,9 @@ Distinct Animal IDs /query/executeQuery.view? - schemaName=study&& + schemaName=study& query.queryName=Tissue Distributions& - query.fiscalYear~eq=${fiscaYear}& + query.fiscalYear~eq=${fiscalYear}& query.id~eq=${id}& query.QCState/Label~in=Completed;Request: Pending& diff --git a/onprc_ehr/resources/queries/study/TissueDistributionSummarybyAnimalIDFiscalYr.sql b/onprc_ehr/resources/queries/study/TissueDistributionSummarybyAnimalIDFiscalYr.sql index 72c23c1fd..875e9381e 100644 --- a/onprc_ehr/resources/queries/study/TissueDistributionSummarybyAnimalIDFiscalYr.sql +++ b/onprc_ehr/resources/queries/study/TissueDistributionSummarybyAnimalIDFiscalYr.sql @@ -2,8 +2,6 @@ SELECT fiscalYear, t.id, --- t.recipient.affiliation, --- t.requestCategory, count(t.Id) as totalSamples, count(distinct t.Id) as distinctAnimals, count(distinct t.recipient) as distinctRecipients diff --git a/onprc_ehr/src/org/labkey/onprc_ehr/ONPRC_EHRModule.java b/onprc_ehr/src/org/labkey/onprc_ehr/ONPRC_EHRModule.java index a8164a775..ff4a4e16c 100644 --- a/onprc_ehr/src/org/labkey/onprc_ehr/ONPRC_EHRModule.java +++ b/onprc_ehr/src/org/labkey/onprc_ehr/ONPRC_EHRModule.java @@ -498,7 +498,14 @@ public String toString() // Added 1-2-2018 R.Blasa EHRService.get().registerReportLink(EHRService.REPORT_LINK_TYPE.moreReports, "View Tissue Distribution Summary, By Recipient(Calendar Year)", this, DetailsURL.fromString("/query/executeQuery.view?schemaName=study&query.queryName=tissueDistributionSummaryByRecipientCalendarYr"), "Pathology"); - //Added: 12-7-2017 R.Blasa + // Added 1-7-2026 R.Blasa + EHRService.get().registerReportLink(EHRService.REPORT_LINK_TYPE.moreReports, "View Tissue Distribution Summary, By Animal ID(Calendar Year)", this, DetailsURL.fromString("/query/executeQuery.view?schemaName=study&query.queryName=tissueDistributionSummaryByAnimalIDCalendarYr"), "Pathology"); + + // Added 1-7-2026 R.Blasa + EHRService.get().registerReportLink(EHRService.REPORT_LINK_TYPE.moreReports, "View Tissue Distribution Summary, By Animal ID(Fiscal Year)", this, DetailsURL.fromString("/query/executeQuery.view?schemaName=study&query.queryName=tissueDistributionSummaryByAnimalIDFiscalYr"), "Pathology"); + + + //Added: 12-7-2017 R.Blasa // EHRService.get().registerReportLink(EHRService.REPORT_LINK_TYPE.moreReports, "Animal Census on a Given Date Range", this, DetailsURL.fromString("/onprc_ehr/CensusGivenDateRange.view"), "Colony Management"); // Added: 2-2-2021 R.Blasa