Skip to content

Commit 01efea6

Browse files
labkey-teamcitylabkey-teamcity
committed
Merge 25.11 to 26.2
2 parents f36cc52 + bd28e57 commit 01efea6

20 files changed

Lines changed: 134 additions & 11 deletions

‎snprc_ehr/resources/queries/snprc_ehr/HL7BiochemistryPivot.query.xml‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,14 @@
22
<metadata>
33
<tables xmlns="http://labkey.org/data/xml">
44
<table tableName="HL7BiochemistryPivot" tableDbType="NOT_IN_DB">
5+
<javaCustomizer class="org.labkey.ehr.table.DefaultEHRCustomizer" />
56
<tableTitle>Biochemistry Results Pivot</tableTitle>
7+
<columns>
8+
<column columnName="Key">
9+
<isKeyField>true</isKeyField>
10+
<isHidden>true</isHidden>
11+
</column>
12+
</columns>
613
</table>
714
</tables>
815
</metadata>

‎snprc_ehr/resources/queries/snprc_ehr/HL7BiochemistryPivot.sql‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
SELECT
22
obr.ANIMAL_ID as id,
33
obr.OBSERVATION_DATE_TM as date,
4+
obr.ANIMAL_ID || '-' || CAST(obr.OBSERVATION_DATE_TM AS VARCHAR) as key,
45
obr.MESSAGE_ID,
56
COALESCE (lp.ServiceId.ServiceName, obr.PROCEDURE_NAME) as PROCEDURE_NAME,
67
obr.PROCEDURE_ID,
@@ -20,6 +21,6 @@ GROUP BY obr.ANIMAL_ID, obr.OBSERVATION_DATE_TM, obr.MESSAGE_ID, COALESCE (lp.Se
2021

2122
IN
2223
(
23-
select DISTINCT TestName as TEST_NAME from snprc_ehr.labwork_panels t
24+
select DISTINCT ltrim(Rtrim(TestName)) as TEST_NAME from snprc_ehr.labwork_panels t
2425
where t.includeInPanel = true AND t.ServiceId.Dataset='Biochemistry'
2526
)

‎snprc_ehr/resources/queries/snprc_ehr/HL7BiochemistryPivot/RoutineChemistry.qview.xml‎

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
<!-- $S is the escape code for / -->
2+
<customView xmlns="http://labkey.org/data/xml/queryCustomView">
3+
<columns>
4+
<column name="Id"/>
5+
<column name="Date"/>
6+
<column name="CREATININE::RESULT"/>
7+
<column name="CREATININE::ABNORMAL_FLAGS"/>
8+
<column name="GLUCOSE::RESULT"/>
9+
<column name="GLUCOSE::ABNORMAL_FLAGS"/>
10+
<column name="BUN$SCREAT RATIO::RESULT"/>
11+
<column name="BUN$SCREAT RATIO::ABNORMAL_FLAGS"/>
12+
<column name="TOTAL PROTEIN::RESULT"/>
13+
<column name="TOTAL PROTEIN::ABNORMAL_FLAGS"/>
14+
<column name="ALBUMIN::RESULT"/>
15+
<column name="ALBUMIN::ABNORMAL_FLAGS"/>
16+
<column name="GLOBULIN (CALC)::RESULT"/>
17+
<column name="GLOBULIN (CALC)::ABNORMAL_FLAGS"/>
18+
<column name="A$SG RATIO (CALC)::RESULT"/>
19+
<column name="A$SG RATIO (CALC)::ABNORMAL_FLAGS"/>
20+
<column name="ALT $S SGPT::RESULT"/>
21+
<column name="ALT $S SGPT::ABNORMAL_FLAGS"/>
22+
<column name="AST $S SGOT::RESULT"/>
23+
<column name="AST $S SGOT::ABNORMAL_FLAGS"/>
24+
<column name="ALK PHOSPHATASE::RESULT"/>
25+
<column name="ALK PHOSPHATASE::ABNORMAL_FLAGS"/>
26+
<column name="SODIUM::RESULT"/>
27+
<column name="SODIUM::ABNORMAL_FLAGS"/>
28+
<column name="POTASSIUM::RESULT"/>
29+
<column name="POTASSIUM::ABNORMAL_FLAGS"/>
30+
<column name="CHLORIDE::RESULT"/>
31+
<column name="CHLORIDE::ABNORMAL_FLAGS"/>
32+
<column name="CARBON DIOXIDE::RESULT"/>
33+
<column name="CARBON DIOXIDE::ABNORMAL_FLAGS"/>
34+
<column name="ANION GAP (CALC)::RESULT"/>
35+
<column name="ANION GAP (CALC)::ABNORMAL_FLAGS"/>
36+
<column name="COMMENT"/>
37+
</columns>
38+
<sorts>
39+
<sort column="Id"/>
40+
<sort column="Date" descending="true"/>
41+
</sorts>
42+
</customView>
43+

‎snprc_ehr/resources/queries/snprc_ehr/HL7CulturePivot.query.xml‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,14 @@
22
<metadata>
33
<tables xmlns="http://labkey.org/data/xml">
44
<table tableName="HL7CulturePivot" tableDbType="NOT_IN_DB">
5+
<javaCustomizer class="org.labkey.ehr.table.DefaultEHRCustomizer" />
56
<tableTitle>Culture and Sensitivity Results Pivot</tableTitle>
7+
<columns>
8+
<column columnName="Key">
9+
<isKeyField>true</isKeyField>
10+
<isHidden>true</isHidden>
11+
</column>
12+
</columns>
613
</table>
714
</tables>
815
</metadata>

‎snprc_ehr/resources/queries/snprc_ehr/HL7CulturePivot.sql‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
SELECT
22
obr.ANIMAL_ID as id,
33
obr.OBSERVATION_DATE_TM as date,
4+
obr.ANIMAL_ID || '-' || CAST(obr.OBSERVATION_DATE_TM AS VARCHAR) as key,
45
obr.MESSAGE_ID,
56
COALESCE (lp.ServiceId.ServiceName, obr.PROCEDURE_NAME) as PROCEDURE_NAME,
67
obr.PROCEDURE_ID,

‎snprc_ehr/resources/queries/snprc_ehr/HL7HematologyPivot.query.xml‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,14 @@
22
<metadata>
33
<tables xmlns="http://labkey.org/data/xml">
44
<table tableName="HL7HematologyPivot" tableDbType="NOT_IN_DB">
5+
<javaCustomizer class="org.labkey.ehr.table.DefaultEHRCustomizer" />
56
<tableTitle>Hematology Pivot</tableTitle>
7+
<columns>
8+
<column columnName="Key">
9+
<isKeyField>true</isKeyField>
10+
<isHidden>true</isHidden>
11+
</column>
12+
</columns>
613
</table>
714
</tables>
815
</metadata>

‎snprc_ehr/resources/queries/snprc_ehr/HL7HematologyPivot.sql‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
SELECT
22
obr.ANIMAL_ID as id,
33
obr.OBSERVATION_DATE_TM as date,
4+
obr.ANIMAL_ID || '-' || CAST(obr.OBSERVATION_DATE_TM AS VARCHAR) as key,
45
obr.MESSAGE_ID,
56
COALESCE (lp.ServiceId.ServiceName, obr.PROCEDURE_NAME) as PROCEDURE_NAME,
67
obr.PROCEDURE_ID,

‎snprc_ehr/resources/queries/snprc_ehr/HL7HistologyPivot.query.xml‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,14 @@
22
<metadata>
33
<tables xmlns="http://labkey.org/data/xml">
44
<table tableName="HL7HistologyPivot" tableDbType="NOT_IN_DB">
5+
<javaCustomizer class="org.labkey.ehr.table.DefaultEHRCustomizer" />
56
<tableTitle>Histology Pivot</tableTitle>
7+
<columns>
8+
<column columnName="Key">
9+
<isKeyField>true</isKeyField>
10+
<isHidden>true</isHidden>
11+
</column>
12+
</columns>
613
</table>
714
</tables>
815
</metadata>

‎snprc_ehr/resources/queries/snprc_ehr/HL7HistologyPivot.sql‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
SELECT obr.ANIMAL_ID as id,
22
obr.OBSERVATION_DATE_TM as date,
3+
obr.ANIMAL_ID || '-' || CAST(obr.OBSERVATION_DATE_TM AS VARCHAR) as key,
34
obr.MESSAGE_ID,
45
COALESCE (lp.ServiceId.ServiceName, obr.PROCEDURE_NAME) as PROCEDURE_NAME,
56
obr.PROCEDURE_ID,

‎snprc_ehr/resources/queries/snprc_ehr/HL7MiscPivot.query.xml‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,14 @@
22
<metadata>
33
<tables xmlns="http://labkey.org/data/xml">
44
<table tableName="HL7MiscPivot" tableDbType="NOT_IN_DB">
5+
<javaCustomizer class="org.labkey.ehr.table.DefaultEHRCustomizer" />
56
<tableTitle>Misc Tests Pivot</tableTitle>
7+
<columns>
8+
<column columnName="Key">
9+
<isKeyField>true</isKeyField>
10+
<isHidden>true</isHidden>
11+
</column>
12+
</columns>
613
</table>
714
</tables>
815
</metadata>

0 commit comments

Comments
 (0)