Merge 22.3 to develop

Author: labkey-teamcity

snprc_ehr/resources/queries/study/CulturePivot.query.xml

@@ -21,7 +21,7 @@
                         <fk>
                             <fkDbSchema>study</fkDbSchema>
                             <fkTable>ClinpathRuns</fkTable>
-                            <fkColumnName>message_id</fkColumnName>
+                            <fkColumnName>objectid</fkColumnName>
                         </fk>
                     </column>
                 </columns>

snprc_ehr/resources/queries/study/CulturePivot.sql

@@ -24,6 +24,7 @@ SELECT
     p.date,
     p.serviceTestId.testName as TestName,
     p.runId.serviceRequested as PanelName,
+    p.remark,
     GROUP_CONCAT(p.qualresult) as QResults
 
 FROM study.labworkResults as p
@@ -32,7 +33,7 @@ FROM study.labworkResults as p
                         and lt.ServiceId.Dataset='Culture'
 
 where p.id is not null
-  group by p.runid, p.Id, p.date,p.serviceTestId.testName, p.runId.serviceRequested
+  group by p.runid, p.Id, p.date,p.serviceTestId.testName, p.remark, p.runId.serviceRequested
     PIVOT   QResults by TestName IN
   (select  t.testName from snprc_ehr.labwork_panels t
   where t.includeInPanel = true

snprc_ehr/resources/queries/study/ParasitologyPivot.query.xml

@@ -21,7 +21,7 @@
                         <fk>
                             <fkDbSchema>study</fkDbSchema>
                             <fkTable>ClinpathRuns</fkTable>
-                            <fkColumnName>message_id</fkColumnName>
+                            <fkColumnName>objectid</fkColumnName>
                         </fk>
                     </column>
                 </columns>

snprc_ehr/resources/queries/study/ParasitologyPivot.sql

@@ -22,6 +22,7 @@ SELECT
   p.runid,
   p.Id,
   p.date,
+  p.remark,
   p.serviceTestId.testName as TestName,
   p.runId.serviceRequested as PanelName,
   GROUP_CONCAT(p.qualresult) as QResults
@@ -33,7 +34,7 @@ FROM study.labworkResults as p
 
 where p.id is not null
   and p.runId.serviceRequested not in ('OVA & PARASITES','OVA & PARASITES, URINE')
-group by p.runid, p.Id, p.date,p.serviceTestId.testName, p.runId.serviceRequested
+group by p.runid, p.Id, p.date,p.serviceTestId.testName, p.runId.serviceRequested, p.remark
   PIVOT QResults by TestName IN
   (select TestName from snprc_ehr.labwork_panels t
   where t.includeInPanel = true

snprc_ehr/resources/queries/study/ParasitologyPivotOP.query.xml

@@ -27,7 +27,7 @@
                         <fk>
                             <fkDbSchema>study</fkDbSchema>
                             <fkTable>ClinpathRuns</fkTable>
-                            <fkColumnName>message_id</fkColumnName>
+                            <fkColumnName>objectid</fkColumnName>
                         </fk>
                     </column>
                 </columns>

snprc_ehr/resources/queries/study/ParasitologyPivotOP.sql

@@ -25,6 +25,7 @@ SELECT
   p.date,
   p.serviceTestId.testName as TestName,
   p.runId.serviceRequested as PanelName,
+  p.remark,
   GROUP_CONCAT(p.qualresult) as QResults
 
 FROM study.labworkResults as p
@@ -34,7 +35,7 @@ FROM study.labworkResults as p
 
 where p.id is not null
       and p.runId.serviceRequested  in ('OVA & PARASITES' ,'OVA & PARASITES, URINE')
-group by p.runid, p.Id, p.date, p.serviceTestId.testName, p.runId.serviceRequested
+group by p.runid, p.Id, p.date,p.remark, p.serviceTestId.testName, p.runId.serviceRequested
   PIVOT QResults by TestName IN
   (select TestName from snprc_ehr.labwork_panels t
   where t.includeInPanel = true

snprc_ehr/resources/queries/study/chemPivot.sql

@@ -19,11 +19,12 @@ b.date,
 b.runId,
 b.panelName,
 b.TestName,
+b.remark,
 MAX(b.result) as results
 
 FROM chemPivotInner b
 
-GROUP BY b.runid,b.id, b.date, b.TestName, b.panelName
+GROUP BY b.runid,b.id, b.date, b.TestName, b.panelName, b.remark
 
 PIVOT results BY TestName IN
 (select TestName from snprc_ehr.labwork_panels t

snprc_ehr/resources/queries/study/chemPivotInner.sql

@@ -20,6 +20,7 @@ SELECT
   b.serviceTestId.testName AS TestName,
 
   coalesce(b.runId, b.objectid) as runId,
+  b.remark,
   b.resultoorindicator,
   CASE
   WHEN b.result IS NULL THEN  b.qualresult

snprc_ehr/resources/queries/study/hematologyPivot.query.xml

@@ -27,7 +27,7 @@
                         <fk>
                             <fkDbSchema>study</fkDbSchema>
                             <fkTable>ClinpathRuns</fkTable>
-                            <fkColumnName>message_id</fkColumnName>
+                            <fkColumnName>objectid</fkColumnName>
                         </fk>
                     </column>
                 </columns>

snprc_ehr/resources/queries/study/hematologyPivot.sql

@@ -19,11 +19,12 @@ b.date,
 b.runid,
 b.panelName,
 b.TestName,
+b.remark,
 MAX(b.result) as results
 
 FROM hematologyPivotInner b
 
-GROUP BY b.runid, b.panelName, b.id, b.date, b.TestName
+GROUP BY b.runid, b.panelName, b.id, b.date, b.TestName, b.remark
 
 PIVOT results BY TestName IN
 (select TestName from snprc_ehr.labwork_panels t