Skip to content

Created a new Animal History report tab called #1768

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
Ohsudev merged 12 commits into from
Jun 23, 2026
Merged

Created a new Animal History report tab called #1768

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
6b9a31b
Created a new Animal History report tab called
Jun 18, 2026
8dddc02
Modified TB Test Results under Lab Results to include Surgery TB Test…
Jun 18, 2026
e1c9624
Modified TB Test Results under Lab Results to include Surgery TB Test…
Jun 18, 2026
83c898d
Modified TB Test Results under Lab Results to include Surgery TB Test…
Jun 21, 2026
445a6c1
Modified TB Test Results under Lab Results to include Surgery TB Test…
Jun 21, 2026
7bba953
Modified TB Test Results under Lab Results to include Surgery TB Test…
Jun 21, 2026
ba78ac0
Modified TB Test Results under Lab Results to include Surgery TB Test…
Jun 22, 2026
7b9d618
Modified TB Test Results under Lab Results to include Surgery TB Test…
Jun 22, 2026
a5a40a9
Modified TB Test Results under Lab Results to include Surgery TB Test…
Jun 22, 2026
cf1cdde
Modified TB Test Results under Lab Results to include Surgery TB Test…
Jun 22, 2026
1457b8c
Modified TB Test Results under Lab Results to include Surgery TB Test…
Jun 22, 2026
aedd82e
Modified Procedure report to include Instradermal
Jun 23, 2026
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
83 changes: 83 additions & 0 deletions onprc_ehr/resources/queries/study/Procedure_Amended.query.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,83 @@
<query xmlns="http://labkey.org/data/xml/query">
<metadata>
<tables xmlns="http://labkey.org/data/xml">
<table tableName="Procedure_Amended" tableDbType="TABLE" useColumnOrder="true">
<tableTitle>Procedures Amended</tableTitle>
<insertUrl />
<importUrl />
<updateUrl />
<deleteUrl />
<columns>
<column columnName="Id">
</column>
<column columnName="date">
<columnTitle>Date</columnTitle>
</column>

<column columnName="project">
<columnTitle>Center Project</columnTitle>
<isHidden>false</isHidden>
<fk>
<fkDbSchema>ehr</fkDbSchema>
<fkTable>project</fkTable>
<fkColumnName>project</fkColumnName>
</fk>
</column>
<column columnName="procedureid">
<columnTitle>Procedure</columnTitle>
<fk>
<fkDbSchema>ehr_lookups</fkDbSchema>
<fkTable>procedures</fkTable>
<fkColumnName>rowid</fkColumnName>
<fkDisplayColumnName>name</fkDisplayColumnName>
</fk>
</column>
<column columnName="remark">
<columnTitle>Remark</columnTitle>
<isHidden>false</isHidden>
</column>
<column columnName="QCState">
<columnTitle>Status</columnTitle>
<fk>
<fkDbSchema>core</fkDbSchema>
<fkTable>QCState</fkTable>
<fkColumnName>Rowid</fkColumnName>
</fk>
</column>
<column columnName="taskid">
<fk>
<fkDbSchema>ehr</fkDbSchema>
<fkTable>tasks</fkTable>
<fkColumnName>taskid</fkColumnName>
<fkDisplayColumnName>rowid</fkDisplayColumnName>
</fk>
</column>
<column columnName="requestid">
<fk>
<fkDbSchema>ehr</fkDbSchema>
<fkTable>requests</fkTable>
<fkColumnName>requestid</fkColumnName>
<fkDisplayColumnName>rowid</fkDisplayColumnName>
</fk>
</column>
<column columnName="chargetype">
<columnTitle>Charge Unit</columnTitle>
<fk>
<fkDbSchema>ehr_lookups</fkDbSchema>
<fkTable>procedureChargeType</fkTable>
<fkColumnName>value</fkColumnName>
</fk>
</column>
<column columnName="type">
<columnTitle>Source</columnTitle>
<fk>
<fkDbSchema>ehr_lookups</fkDbSchema>
<fkTable>encounter_types</fkTable>
<fkColumnName>value</fkColumnName>
</fk>
</column>
</columns>
</table>
</tables>
</metadata>
</query>
48 changes: 48 additions & 0 deletions onprc_ehr/resources/queries/study/Procedure_Amended.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
/*
* Copyright (c) 2013 LabKey Corporation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
SELECT
t.id,
t.date,
t.procedureid,
t.qcstate,
t.taskid,
t.type,
t.remark,
t.requestid,
t.chargetype,
t.project


FROM study.encounters t
Where t.type in ('Procedure')
UNION
SELECT
j.id,
j.date,
j.procedureid,
j.qcstate,
j.taskid,
j.type,
j.remark,
j.requestid,
j.chargetype,
j.project


FROM study.encounters j
where j.procedureid.name in ('TB Test Intradermal')
And j.type in ('Surgery')

19 changes: 19 additions & 0 deletions onprc_ehr/resources/queries/study/Procedure_Amended/.qview.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
<customView xmlns="http://labkey.org/data/xml/queryCustomView">
<columns>
<column name="Id"/>
<column name="date"/>
<column name="project"/>
<column name="procedureid"/>
<column name="remark"/>
<column name="QCState"/>
<column name="taskid" />
<column name="requestid" />
<column name="chargetype" />
</columns>
<sorts>
<sort column="date" descending="true"/>
</sorts>
<filters>
<filter column="type" operator="containsnoneof" value="Procedure,Surgery"/>
</filters>
</customView>
20 changes: 20 additions & 0 deletions onprc_ehr/resources/queries/study/Procedure_Amended/Procedure.qview.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
<customView xmlns="http://labkey.org/data/xml/queryCustomView">
<columns>
<column name="Id"/>
<column name="date"/>
<column name="project"/>
<column name="procedureid"/>
<column name="remark"/>
<column name="QCState"/>
<column name="taskid" />
<column name="requestid" />
<column name="chargetype" />
<column name="type" />
</columns>
<sorts>
<sort column="date" descending="true"/>
</sorts>
<filters>
<filter column="type" operator="containsnoneof" value="Procedure,Surgery"/>
</filters>
</customView>