From 6e0d37f97e7e583612ec1bd19b0ff3e5630b94a0 Mon Sep 17 00:00:00 2001 From: loganb Date: Sat, 13 Dec 2025 08:40:30 -0800 Subject: [PATCH 1/5] Add caseNo to master problems for active clinical cases --- .../resources/queries/study/ClinicalCases_Open.sql | 3 ++- .../queries/study/demographicsAssignedVet.sql | 2 +- .../queries/study/vetAssignment_demographics.sql | 10 +++++----- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/onprc_ehr/resources/queries/study/ClinicalCases_Open.sql b/onprc_ehr/resources/queries/study/ClinicalCases_Open.sql index 1b9b00b03..e9232e666 100644 --- a/onprc_ehr/resources/queries/study/ClinicalCases_Open.sql +++ b/onprc_ehr/resources/queries/study/ClinicalCases_Open.sql @@ -11,7 +11,8 @@ SELECT c.mostRecentP2, c.isActive, c.assignedvet, - c.mostRecentCeg_Plan + c.mostRecentCeg_Plan, + c.caseNo FROM study.cases c WHERE c.isOpen = true AND c.category = 'Clinical' \ No newline at end of file diff --git a/onprc_ehr/resources/queries/study/demographicsAssignedVet.sql b/onprc_ehr/resources/queries/study/demographicsAssignedVet.sql index 61727ec5c..9867c6871 100644 --- a/onprc_ehr/resources/queries/study/demographicsAssignedVet.sql +++ b/onprc_ehr/resources/queries/study/demographicsAssignedVet.sql @@ -12,7 +12,7 @@ SELECT f.AssignmentType, GROUP_CONCAT( CASE WHEN f.matchedRule = 0 THEN f.ActiveMasterProblems ELSE NULL END, - ', ' + '; ' ) AS MasterProblems, f.Area, f.Room diff --git a/onprc_ehr/resources/queries/study/vetAssignment_demographics.sql b/onprc_ehr/resources/queries/study/vetAssignment_demographics.sql index ff5df31cf..102fd30d6 100644 --- a/onprc_ehr/resources/queries/study/vetAssignment_demographics.sql +++ b/onprc_ehr/resources/queries/study/vetAssignment_demographics.sql @@ -9,11 +9,11 @@ Notes: WITH CasesData AS ( SELECT Id, - Open_CMU_Cases.AssignedVet.DisplayName AS CaseVet, - Open_CMU_Cases.Date AS CaseDate, - GROUP_CONCAT(ProblemCategories, ';') AS ActiveMasterProblems - FROM Study.ClinicalCases_Open AS Open_CMU_Cases - GROUP BY Open_CMU_Cases.AssignedVet.DisplayName, Id, Open_CMU_Cases.Date + c.AssignedVet.DisplayName AS CaseVet, + c.Date AS CaseDate, + GROUP_CONCAT(CAST(c.caseNo AS VARCHAR) + ': ' + c.ProblemCategories, ';') AS ActiveMasterProblems + FROM Study.ClinicalCases_Open AS c + GROUP BY c.AssignedVet.DisplayName, Id, c.Date ) SELECT Demographics.Id, From 5998981b9ff42fac077a280b11a9dd2444dbff31 Mon Sep 17 00:00:00 2001 From: loganb Date: Sat, 13 Dec 2025 09:08:55 -0800 Subject: [PATCH 2/5] Add caseNo to Active Clinical Cases view --- .../queries/study/cases/Active Clinical Cases.qview.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/onprc_ehr/resources/queries/study/cases/Active Clinical Cases.qview.xml b/onprc_ehr/resources/queries/study/cases/Active Clinical Cases.qview.xml index 5b1bbfc68..3da597fc1 100644 --- a/onprc_ehr/resources/queries/study/cases/Active Clinical Cases.qview.xml +++ b/onprc_ehr/resources/queries/study/cases/Active Clinical Cases.qview.xml @@ -8,6 +8,7 @@ + From 17a533e4f8a86ccc1bc433e3a8526a73f4235096 Mon Sep 17 00:00:00 2001 From: loganb Date: Mon, 15 Dec 2025 11:38:16 -0800 Subject: [PATCH 3/5] Add caseNo to views --- onprc_ehr/resources/queries/study/cases/.qview.xml | 1 + .../resources/queries/study/cases/All Clinical Cases.qview.xml | 1 + .../resources/queries/study/cases/Clinical Case Review.qview.xml | 1 + 3 files changed, 3 insertions(+) diff --git a/onprc_ehr/resources/queries/study/cases/.qview.xml b/onprc_ehr/resources/queries/study/cases/.qview.xml index d60c1d434..b1368f125 100644 --- a/onprc_ehr/resources/queries/study/cases/.qview.xml +++ b/onprc_ehr/resources/queries/study/cases/.qview.xml @@ -8,6 +8,7 @@ + diff --git a/onprc_ehr/resources/queries/study/cases/All Clinical Cases.qview.xml b/onprc_ehr/resources/queries/study/cases/All Clinical Cases.qview.xml index 4c81622fb..2a0f8b683 100644 --- a/onprc_ehr/resources/queries/study/cases/All Clinical Cases.qview.xml +++ b/onprc_ehr/resources/queries/study/cases/All Clinical Cases.qview.xml @@ -7,6 +7,7 @@ + diff --git a/onprc_ehr/resources/queries/study/cases/Clinical Case Review.qview.xml b/onprc_ehr/resources/queries/study/cases/Clinical Case Review.qview.xml index 8e151893a..17804aec5 100644 --- a/onprc_ehr/resources/queries/study/cases/Clinical Case Review.qview.xml +++ b/onprc_ehr/resources/queries/study/cases/Clinical Case Review.qview.xml @@ -11,6 +11,7 @@ + From d81ee785f2fbdff90fea71812d4222a7252980f7 Mon Sep 17 00:00:00 2001 From: loganb Date: Mon, 15 Dec 2025 11:39:16 -0800 Subject: [PATCH 4/5] Eliminate duplicate case numbers --- .../resources/queries/study/demographicsAssignedVet.query.xml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/onprc_ehr/resources/queries/study/demographicsAssignedVet.query.xml b/onprc_ehr/resources/queries/study/demographicsAssignedVet.query.xml index c89bdbec4..0b1fa6d87 100644 --- a/onprc_ehr/resources/queries/study/demographicsAssignedVet.query.xml +++ b/onprc_ehr/resources/queries/study/demographicsAssignedVet.query.xml @@ -7,6 +7,9 @@ executeQuery.view?schemaName=study&query.queryName=VetAssignment_Filter&query.Id~contains=${Id} + + Case Number: Master Problem(s) + From fb97ade1f177d8f866214e09c3b85acece1fa267 Mon Sep 17 00:00:00 2001 From: loganb Date: Mon, 15 Dec 2025 11:39:47 -0800 Subject: [PATCH 5/5] Eliminate duplicate case numbers --- onprc_ehr/resources/queries/study/demographicsAssignedVet.sql | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/onprc_ehr/resources/queries/study/demographicsAssignedVet.sql b/onprc_ehr/resources/queries/study/demographicsAssignedVet.sql index 9867c6871..d3278c6f6 100644 --- a/onprc_ehr/resources/queries/study/demographicsAssignedVet.sql +++ b/onprc_ehr/resources/queries/study/demographicsAssignedVet.sql @@ -10,10 +10,10 @@ SELECT f.Id, f.AssignedVet, f.AssignmentType, - GROUP_CONCAT( + GROUP_CONCAT(DISTINCT CASE WHEN f.matchedRule = 0 THEN f.ActiveMasterProblems ELSE NULL END, '; ' - ) AS MasterProblems, + ) AS masterProblems, f.Area, f.Room FROM vetAssignment_filter f