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/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/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 @@
+
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 @@
+
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)
+
diff --git a/onprc_ehr/resources/queries/study/demographicsAssignedVet.sql b/onprc_ehr/resources/queries/study/demographicsAssignedVet.sql
index 61727ec5c..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
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,