Skip to content

More updated views, cases ETL update #529

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
labkey-martyp merged 8 commits into from
May 4, 2025
Merged

More updated views, cases ETL update #529

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
4a40dd6
View updates
labkey-martyp May 3, 2025
35ca855
Notification style fix
labkey-martyp May 3, 2025
90ac620
Case History
labkey-martyp May 3, 2025
be4f7f6
etl
labkey-martyp May 3, 2025
1798b68
Use COALESCE instead of nested CASE statement during string concatena…
labkey-bpatel May 3, 2025
fdc6f95
minor fix
labkey-bpatel May 4, 2025
6fee7d9
typo
labkey-martyp May 4, 2025
1f26392
Merge branch '25.3_fb_go_live_views' of https://github.com/LabKey/nir…
labkey-martyp May 4, 2025
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 nirc_ehr/resources/etls/physicalExam.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<description>Physical Exam data</description>
<transforms>
<transform id="step1" type="org.labkey.di.pipeline.TransformTask">
<description>Copy to pairings target</description>
<description>Copy to physical exam target</description>
<source schemaName="dbo" queryName="q_physicalExam"/>
<destination schemaName="study" queryName="physicalExam"
bulkLoad="true" batchSize="5000" targetOption="merge">
Expand Down
18 changes: 3 additions & 15 deletions nirc_ehr/resources/queries/dbo/q_cases.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,21 +8,9 @@ SELECT * FROM (
THEN 'unknown'
ELSE (trim(anmEvt.STAFF_ID.STAFF_FIRST_NAME)
|| '|' || trim(anmEvt.STAFF_ID.STAFF_LAST_NAME)) END) AS performedby,
(CASE
WHEN anmEvt.EVENT_ID = 1580
THEN 'Open Remark: ' ||
(CASE WHEN anmCmt.TEXT IS NULL THEN 'None' ELSE anmCmt.TEXT END) ||
'; Open Diagnosis: ' ||
(CASE WHEN anmEvt.DIAGNOSIS IS NULL THEN 'None' ELSE anmEvt.DIAGNOSIS END)
END) AS openRemark,
(CASE
WHEN anmEvt.EVENT_ID = 1677
THEN 'Close Remark: ' ||
(CASE WHEN anmCmt.TEXT IS NULL THEN 'None' ELSE anmCmt.TEXT END) ||
'; Close Diagnosis: ' ||
(CASE WHEN anmEvt.DIAGNOSIS IS NULL THEN 'None' ELSE anmEvt.DIAGNOSIS END)
END) AS closeRemark,
COALESCE(dea.deathDate, dep.eventDate) AS enddate,
(CASE WHEN anmEvt.EVENT_ID = 1580 THEN ('Open Remark: ' || COALESCE(anmCmt.TEXT, 'None') || '; Open Diagnosis: ' || COALESCE(anmEvt.DIAGNOSIS, 'None')) ELSE NULL END) AS openRemark,
(CASE WHEN anmEvt.EVENT_ID = 1677 THEN ('Close Remark: ' || COALESCE(anmCmt.TEXT, 'None') || '; Close Diagnosis: ' || COALESCE(anmEvt.DIAGNOSIS, 'None')) ELSE NULL END) AS closeRemark,
COALESCE(dea.deathDate, dep.eventDate) AS enddate,
anmEvt.EVENT_ID.NAME AS category,
CASE
WHEN anmEvt.ATTACHMENT_PATH IS NOT NULL THEN
Expand Down
5 changes: 4 additions & 1 deletion nirc_ehr/resources/queries/study/activeBehaviorCases/.qview.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,11 @@
<customView xmlns="http://labkey.org/data/xml/queryCustomView" canOverride="true">
<columns>
<column name="caseCheck"/>
<column name="caseHistory"/>
<column name="Id"/>
<column name="Id/Demographics/species"/>
<column name="Id/curLocation/cage/room/floor/building"/>
<column name="Id/curLocation/cage"/>
<column name="date"/>
<column name="reviewdate"/>
<column name="enddate"/>
Expand All @@ -17,7 +21,6 @@
<property name="columnTitle" value="Status"/>
</properties>
</column>
<column name="caseHistory"/>
</columns>
<sorts>
<sort column="date" descending="true"/>
Expand Down
7 changes: 5 additions & 2 deletions nirc_ehr/resources/queries/study/activeBehaviorCases/Area 11.qview.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,11 @@
<customView xmlns="http://labkey.org/data/xml/queryCustomView" canOverride="true">
<columns>
<column name="caseCheck"/>
<column name="caseHistory"/>
<column name="Id"/>
<column name="Id/Demographics/species"/>
<column name="Id/curLocation/cage/room/floor/building"/>
<column name="Id/curLocation/cage"/>
<column name="date"/>
<column name="reviewdate"/>
<column name="enddate"/>
Expand All @@ -17,12 +21,11 @@
<property name="columnTitle" value="Status"/>
</properties>
</column>
<column name="caseHistory"/>
</columns>
<sorts>
<sort column="date" descending="true"/>
</sorts>
<filters>
<filter column="Id/curLocation/room/floor/building" operator="eq" value="Building 11"/>
<filter column="Id/curLocation/room/floor/building/Description" operator="eq" value="Building 11"/>
</filters>
</customView>
7 changes: 5 additions & 2 deletions nirc_ehr/resources/queries/study/activeBehaviorCases/Area 51.qview.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,11 @@
<customView xmlns="http://labkey.org/data/xml/queryCustomView" canOverride="true">
<columns>
<column name="caseCheck"/>
<column name="caseHistory"/>
<column name="Id"/>
<column name="Id/Demographics/species"/>
<column name="Id/curLocation/cage/room/floor/building"/>
<column name="Id/curLocation/cage"/>
<column name="date"/>
<column name="reviewdate"/>
<column name="enddate"/>
Expand All @@ -17,12 +21,11 @@
<property name="columnTitle" value="Status"/>
</properties>
</column>
<column name="caseHistory"/>
</columns>
<sorts>
<sort column="date" descending="true"/>
</sorts>
<filters>
<filter column="Id/curLocation/room/floor/building" operator="eq" value="Building 51"/>
<filter column="Id/curLocation/room/floor/building/Description" operator="eq" value="Building 51"/>
</filters>
</customView>
7 changes: 5 additions & 2 deletions nirc_ehr/resources/queries/study/activeBehaviorCases/Building 10.qview.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,11 @@
<customView xmlns="http://labkey.org/data/xml/queryCustomView" canOverride="true">
<columns>
<column name="caseCheck"/>
<column name="caseHistory"/>
<column name="Id"/>
<column name="Id/Demographics/species"/>
<column name="Id/curLocation/cage/room/floor/building"/>
<column name="Id/curLocation/cage"/>
<column name="date"/>
<column name="reviewdate"/>
<column name="enddate"/>
Expand All @@ -17,12 +21,11 @@
<property name="columnTitle" value="Status"/>
</properties>
</column>
<column name="caseHistory"/>
</columns>
<sorts>
<sort column="date" descending="true"/>
</sorts>
<filters>
<filter column="Id/curLocation/room/floor/building" operator="eq" value="Building 10"/>
<filter column="Id/curLocation/room/floor/building/building/Description" operator="eq" value="Building 10"/>
</filters>
</customView>
7 changes: 5 additions & 2 deletions nirc_ehr/resources/queries/study/activeBehaviorCases/Building 10C.qview.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,11 @@
<customView xmlns="http://labkey.org/data/xml/queryCustomView" canOverride="true">
<columns>
<column name="caseCheck"/>
<column name="caseHistory"/>
<column name="Id"/>
<column name="Id/Demographics/species"/>
<column name="Id/curLocation/cage/room/floor/building"/>
<column name="Id/curLocation/cage"/>
<column name="date"/>
<column name="reviewdate"/>
<column name="enddate"/>
Expand All @@ -17,12 +21,11 @@
<property name="columnTitle" value="Status"/>
</properties>
</column>
<column name="caseHistory"/>
</columns>
<sorts>
<sort column="date" descending="true"/>
</sorts>
<filters>
<filter column="Id/curLocation/room/floor/building" operator="eq" value="Building 10C"/>
<filter column="Id/curLocation/room/floor/building/Description" operator="eq" value="Building 10C"/>
</filters>
</customView>
7 changes: 5 additions & 2 deletions nirc_ehr/resources/queries/study/activeBehaviorCases/Building 27.qview.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,11 @@
<customView xmlns="http://labkey.org/data/xml/queryCustomView" canOverride="true">
<columns>
<column name="caseCheck"/>
<column name="caseHistory"/>
<column name="Id"/>
<column name="Id/Demographics/species"/>
<column name="Id/curLocation/cage/room/floor/building"/>
<column name="Id/curLocation/cage"/>
<column name="date"/>
<column name="reviewdate"/>
<column name="enddate"/>
Expand All @@ -17,12 +21,11 @@
<property name="columnTitle" value="Status"/>
</properties>
</column>
<column name="caseHistory"/>
</columns>
<sorts>
<sort column="date" descending="true"/>
</sorts>
<filters>
<filter column="Id/curLocation/room/floor/building" operator="eq" value="Building 27"/>
<filter column="Id/curLocation/room/floor/building/Description" operator="eq" value="Building 27"/>
</filters>
</customView>
7 changes: 5 additions & 2 deletions nirc_ehr/resources/queries/study/activeBehaviorCases/Building 28.qview.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,11 @@
<customView xmlns="http://labkey.org/data/xml/queryCustomView" canOverride="true">
<columns>
<column name="caseCheck"/>
<column name="caseHistory"/>
<column name="Id"/>
<column name="Id/Demographics/species"/>
<column name="Id/curLocation/cage/room/floor/building"/>
<column name="Id/curLocation/cage"/>
<column name="date"/>
<column name="reviewdate"/>
<column name="enddate"/>
Expand All @@ -17,12 +21,11 @@
<property name="columnTitle" value="Status"/>
</properties>
</column>
<column name="caseHistory"/>
</columns>
<sorts>
<sort column="date" descending="true"/>
</sorts>
<filters>
<filter column="Id/curLocation/room/floor/building" operator="eq" value="Building 28"/>
<filter column="Id/curLocation/room/floor/building/Description" operator="eq" value="Building 28"/>
</filters>
</customView>
7 changes: 5 additions & 2 deletions nirc_ehr/resources/queries/study/activeBehaviorCases/Building 29.qview.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,11 @@
<customView xmlns="http://labkey.org/data/xml/queryCustomView" canOverride="true">
<columns>
<column name="caseCheck"/>
<column name="caseHistory"/>
<column name="Id"/>
<column name="Id/Demographics/species"/>
<column name="Id/curLocation/cage/room/floor/building"/>
<column name="Id/curLocation/cage"/>
<column name="date"/>
<column name="reviewdate"/>
<column name="enddate"/>
Expand All @@ -17,12 +21,11 @@
<property name="columnTitle" value="Status"/>
</properties>
</column>
<column name="caseHistory"/>
</columns>
<sorts>
<sort column="date" descending="true"/>
</sorts>
<filters>
<filter column="Id/curLocation/room/floor/building" operator="eq" value="Building 29"/>
<filter column="Id/curLocation/room/floor/building/Description" operator="eq" value="Building 29"/>
</filters>
</customView>
7 changes: 5 additions & 2 deletions nirc_ehr/resources/queries/study/activeBehaviorCases/Building 30.qview.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,11 @@
<customView xmlns="http://labkey.org/data/xml/queryCustomView" canOverride="true">
<columns>
<column name="caseCheck"/>
<column name="caseHistory"/>
<column name="Id"/>
<column name="Id/Demographics/species"/>
<column name="Id/curLocation/cage/room/floor/building"/>
<column name="Id/curLocation/cage"/>
<column name="date"/>
<column name="reviewdate"/>
<column name="enddate"/>
Expand All @@ -17,12 +21,11 @@
<property name="columnTitle" value="Status"/>
</properties>
</column>
<column name="caseHistory"/>
</columns>
<sorts>
<sort column="date" descending="true"/>
</sorts>
<filters>
<filter column="Id/curLocation/room/floor/building" operator="eq" value="Building 30"/>
<filter column="Id/curLocation/room/floor/building/Description" operator="eq" value="Building 30"/>
</filters>
</customView>
7 changes: 5 additions & 2 deletions nirc_ehr/resources/queries/study/activeBehaviorCases/Building 31.qview.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,11 @@
<customView xmlns="http://labkey.org/data/xml/queryCustomView" canOverride="true">
<columns>
<column name="caseCheck"/>
<column name="caseHistory"/>
<column name="Id"/>
<column name="Id/Demographics/species"/>
<column name="Id/curLocation/cage/room/floor/building"/>
<column name="Id/curLocation/cage"/>
<column name="date"/>
<column name="reviewdate"/>
<column name="enddate"/>
Expand All @@ -17,12 +21,11 @@
<property name="columnTitle" value="Status"/>
</properties>
</column>
<column name="caseHistory"/>
</columns>
<sorts>
<sort column="date" descending="true"/>
</sorts>
<filters>
<filter column="Id/curLocation/room/floor/building" operator="eq" value="Building 31"/>
<filter column="Id/curLocation/room/floor/building/Description" operator="eq" value="Building 31"/>
</filters>
</customView>
7 changes: 5 additions & 2 deletions nirc_ehr/resources/queries/study/activeBehaviorCases/Building 31C.qview.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,11 @@
<customView xmlns="http://labkey.org/data/xml/queryCustomView" canOverride="true">
<columns>
<column name="caseCheck"/>
<column name="caseHistory"/>
<column name="Id"/>
<column name="Id/Demographics/species"/>
<column name="Id/curLocation/cage/room/floor/building"/>
<column name="Id/curLocation/cage"/>
<column name="date"/>
<column name="reviewdate"/>
<column name="enddate"/>
Expand All @@ -17,12 +21,11 @@
<property name="columnTitle" value="Status"/>
</properties>
</column>
<column name="caseHistory"/>
</columns>
<sorts>
<sort column="date" descending="true"/>
</sorts>
<filters>
<filter column="Id/curLocation/room/floor/building" operator="eq" value="Building 31C"/>
<filter column="Id/curLocation/room/floor/building/Description" operator="eq" value="Building 31C"/>
</filters>
</customView>
7 changes: 5 additions & 2 deletions nirc_ehr/resources/queries/study/activeBehaviorCases/Building 31D.qview.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,11 @@
<customView xmlns="http://labkey.org/data/xml/queryCustomView" canOverride="true">
<columns>
<column name="caseCheck"/>
<column name="caseHistory"/>
<column name="Id"/>
<column name="Id/Demographics/species"/>
<column name="Id/curLocation/cage/room/floor/building"/>
<column name="Id/curLocation/cage"/>
<column name="date"/>
<column name="reviewdate"/>
<column name="enddate"/>
Expand All @@ -17,12 +21,11 @@
<property name="columnTitle" value="Status"/>
</properties>
</column>
<column name="caseHistory"/>
</columns>
<sorts>
<sort column="date" descending="true"/>
</sorts>
<filters>
<filter column="Id/curLocation/room/floor/building" operator="eq" value="Building 31D"/>
<filter column="Id/curLocation/room/floor/building/Description" operator="eq" value="Building 31D"/>
</filters>
</customView>
7 changes: 5 additions & 2 deletions nirc_ehr/resources/queries/study/activeBehaviorCases/Building 32.qview.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,11 @@
<customView xmlns="http://labkey.org/data/xml/queryCustomView" canOverride="true">
<columns>
<column name="caseCheck"/>
<column name="caseHistory"/>
<column name="Id"/>
<column name="Id/Demographics/species"/>
<column name="Id/curLocation/cage/room/floor/building"/>
<column name="Id/curLocation/cage"/>
<column name="date"/>
<column name="reviewdate"/>
<column name="enddate"/>
Expand All @@ -17,12 +21,11 @@
<property name="columnTitle" value="Status"/>
</properties>
</column>
<column name="caseHistory"/>
</columns>
<sorts>
<sort column="date" descending="true"/>
</sorts>
<filters>
<filter column="Id/curLocation/room/floor/building" operator="eq" value="Building 32"/>
<filter column="Id/curLocation/room/floor/building/Description" operator="eq" value="Building 32"/>
</filters>
</customView>
Loading