Skip to content

Added missing remark column to labwork pivot queries #452

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
spamhurts merged 9 commits into from
May 24, 2022
Merged

Added missing remark column to labwork pivot queries #452

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
a89e612
- Added remark column to Culture pivot report
spamhurts May 23, 2022
a5d6c16
- Added remark column to Chemistry pivot report
spamhurts May 23, 2022
5995b46
- Added remark column to Hematology pivot report
spamhurts May 23, 2022
17346c4
- re-fixed CulturePivot foreign key
spamhurts May 23, 2022
5b9eae3
- Fixed remark value in MiscPivot
spamhurts May 23, 2022
9802904
- Add remark value to Parasitology pivot
spamhurts May 23, 2022
84e1787
- Add remark value to Parasitology O&P pivot
spamhurts May 23, 2022
a5df9e8
- Add remark value to Surveillance pivot
spamhurts May 23, 2022
ff1a456
- Add remark value to Urinalysis pivot
spamhurts May 23, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion snprc_ehr/resources/queries/study/CulturePivot.query.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<fk>
<fkDbSchema>study</fkDbSchema>
<fkTable>ClinpathRuns</fkTable>
<fkColumnName>message_id</fkColumnName>
<fkColumnName>objectid</fkColumnName>
</fk>
</column>
</columns>
Expand Down
3 changes: 2 additions & 1 deletion snprc_ehr/resources/queries/study/CulturePivot.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion snprc_ehr/resources/queries/study/ParasitologyPivot.query.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<fk>
<fkDbSchema>study</fkDbSchema>
<fkTable>ClinpathRuns</fkTable>
<fkColumnName>message_id</fkColumnName>
<fkColumnName>objectid</fkColumnName>
</fk>
</column>
</columns>
Expand Down
3 changes: 2 additions & 1 deletion snprc_ehr/resources/queries/study/ParasitologyPivot.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion snprc_ehr/resources/queries/study/ParasitologyPivotOP.query.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
<fk>
<fkDbSchema>study</fkDbSchema>
<fkTable>ClinpathRuns</fkTable>
<fkColumnName>message_id</fkColumnName>
<fkColumnName>objectid</fkColumnName>
</fk>
</column>
</columns>
Expand Down
3 changes: 2 additions & 1 deletion snprc_ehr/resources/queries/study/ParasitologyPivotOP.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
3 changes: 2 additions & 1 deletion snprc_ehr/resources/queries/study/chemPivot.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions snprc_ehr/resources/queries/study/chemPivotInner.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion snprc_ehr/resources/queries/study/hematologyPivot.query.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
<fk>
<fkDbSchema>study</fkDbSchema>
<fkTable>ClinpathRuns</fkTable>
<fkColumnName>message_id</fkColumnName>
<fkColumnName>objectid</fkColumnName>
</fk>
</column>
</columns>
Expand Down
3 changes: 2 additions & 1 deletion snprc_ehr/resources/queries/study/hematologyPivot.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions snprc_ehr/resources/queries/study/hematologyPivotInner.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ SELECT
b.runId.serviceRequested as panelName,
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
Expand Down
2 changes: 1 addition & 1 deletion snprc_ehr/resources/queries/study/miscPivot.query.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
<fk>
<fkDbSchema>study</fkDbSchema>
<fkTable>ClinpathRuns</fkTable>
<fkColumnName>message_id</fkColumnName>
<fkColumnName>objectid</fkColumnName>
</fk>
</column>
</columns>
Expand Down
4 changes: 2 additions & 2 deletions snprc_ehr/resources/queries/study/miscPivot.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,12 @@ SELECT
b.runId,
b.panelName,
b.TestName,
b.remark,
MAX(b.result) as results,
(select group_concat(a.remark) from study.labworkResults as a where a.runId = b.runId) as remark

FROM miscPivotInner 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
Expand Down
2 changes: 1 addition & 1 deletion snprc_ehr/resources/queries/study/miscPivotInner.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ SELECT
b.date,
b.runId.serviceRequested as panelName,
b.serviceTestId.testName AS TestName,

b.remark,
coalesce(b.runId, b.objectid) as runId,
b.resultoorindicator,
CASE
Expand Down
2 changes: 1 addition & 1 deletion snprc_ehr/resources/queries/study/surveillancePivot.query.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
<fk>
<fkDbSchema>study</fkDbSchema>
<fkTable>ClinpathRuns</fkTable>
<fkColumnName>message_id</fkColumnName>
<fkColumnName>objectid</fkColumnName>
</fk>
</column>
</columns>
Expand Down
3 changes: 2 additions & 1 deletion snprc_ehr/resources/queries/study/surveillancePivot.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,12 @@ b.date,
b.runid,
b.panelName,
b.TestName,
b.remark,
MAX(b.result) as results

FROM surveillancePivotInner 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
Expand Down
3 changes: 3 additions & 0 deletions snprc_ehr/resources/queries/study/surveillancePivotInner.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ SELECT
b.serviceTestId.testName AS TestName,
coalesce(b.runId, b.objectid) as runId,
b.resultoorindicator,
b.remark,
CASE
WHEN b.result IS NULL THEN b.qualresult
ELSE CAST(CAST(b.result AS float) AS VARCHAR)
Expand All @@ -40,6 +41,7 @@ SELECT
b.serviceTestId.testName AS TestName,
coalesce(b.runId, b.objectid) as runId,
b.resultoorindicator,
b.remark,
CASE
WHEN b.result IS NULL THEN b.qualresult
ELSE CAST(CAST(b.result AS float) AS VARCHAR)
Expand All @@ -56,6 +58,7 @@ SELECT
b.serviceTestId.testName AS TestName,
coalesce(b.runId, cast(b.Sequencenum as varchar)) as runId,
b.resultoorindicator,
b.remark,
CASE
WHEN b.result IS NULL THEN b.qualresult
ELSE CAST(CAST(b.result AS float) AS VARCHAR)
Expand Down
2 changes: 1 addition & 1 deletion snprc_ehr/resources/queries/study/urinalysisPivot.query.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
<fk>
<fkDbSchema>study</fkDbSchema>
<fkTable>ClinpathRuns</fkTable>
<fkColumnName>message_id</fkColumnName>
<fkColumnName>objectid</fkColumnName>
</fk>
</column>
</columns>
Expand Down
3 changes: 2 additions & 1 deletion snprc_ehr/resources/queries/study/urinalysisPivot.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,12 @@ SELECT
b.runId,
b.panelName,
b.TestName,
b.remark,
MAX(b.result) as results

FROM urinalysisPivotInner 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
Expand Down
1 change: 1 addition & 0 deletions snprc_ehr/resources/queries/study/urinalysisPivotInner.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ SELECT

coalesce(b.runId, b.objectid) as runId,
b.resultoorindicator,
b.remark,
CASE
WHEN b.result IS NULL THEN b.qualresult
ELSE CAST(CAST(b.result AS float) AS VARCHAR)
Expand Down