From 6b9a31b7a8ed2419d53098e9305192c7798e63e5 Mon Sep 17 00:00:00 2001 From: blasar Date: Thu, 18 Jun 2026 12:14:29 -0700 Subject: [PATCH 01/12] Created a new Animal History report tab called "TB Test Intradermal that consist of Clinical Encounters of type Procedure, and Surgical entries. --- .../study/encounters/TB_Intradermal.qview.xml | 21 +++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 onprc_ehr/resources/queries/study/encounters/TB_Intradermal.qview.xml diff --git a/onprc_ehr/resources/queries/study/encounters/TB_Intradermal.qview.xml b/onprc_ehr/resources/queries/study/encounters/TB_Intradermal.qview.xml new file mode 100644 index 000000000..296b3e8b6 --- /dev/null +++ b/onprc_ehr/resources/queries/study/encounters/TB_Intradermal.qview.xml @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file From 8dddc024cafe0606468ba53ece57901fc8862201 Mon Sep 17 00:00:00 2001 From: blasar Date: Thu, 18 Jun 2026 13:52:35 -0700 Subject: [PATCH 02/12] Modified TB Test Results under Lab Results to include Surgery TB Test Intradermal. --- .../queries/study/TBTestEnounters.sql | 6 ++++-- .../study/encounters/TB Tests.qview.xml | 1 + .../study/encounters/TB_Intradermal.qview.xml | 21 ------------------- 3 files changed, 5 insertions(+), 23 deletions(-) delete mode 100644 onprc_ehr/resources/queries/study/encounters/TB_Intradermal.qview.xml diff --git a/onprc_ehr/resources/queries/study/TBTestEnounters.sql b/onprc_ehr/resources/queries/study/TBTestEnounters.sql index a6269d9d6..00679e477 100644 --- a/onprc_ehr/resources/queries/study/TBTestEnounters.sql +++ b/onprc_ehr/resources/queries/study/TBTestEnounters.sql @@ -18,8 +18,10 @@ SELECT t.date, t.procedureid, t.qcstate, - t.taskid + t.taskid, + t.type FROM study.encounters t -where procedureid.name in ('TB Test Intradermal','TB Test Serologic') +where t.procedureid.name in ('TB Test Intradermal','TB Test Serologic') +And t.type in ('Procedure','Surgery') diff --git a/onprc_ehr/resources/queries/study/encounters/TB Tests.qview.xml b/onprc_ehr/resources/queries/study/encounters/TB Tests.qview.xml index 2b3fae03a..10ca8fbb8 100644 --- a/onprc_ehr/resources/queries/study/encounters/TB Tests.qview.xml +++ b/onprc_ehr/resources/queries/study/encounters/TB Tests.qview.xml @@ -5,6 +5,7 @@ + diff --git a/onprc_ehr/resources/queries/study/encounters/TB_Intradermal.qview.xml b/onprc_ehr/resources/queries/study/encounters/TB_Intradermal.qview.xml deleted file mode 100644 index 296b3e8b6..000000000 --- a/onprc_ehr/resources/queries/study/encounters/TB_Intradermal.qview.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file From e1c9624d04af64b63aa34fc0726b70c1286b429f Mon Sep 17 00:00:00 2001 From: blasar Date: Thu, 18 Jun 2026 14:03:11 -0700 Subject: [PATCH 03/12] Modified TB Test Results under Lab Results to include Surgery TB Test Intradermal. --- onprc_ehr/resources/queries/study/encounters/TB Tests.qview.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/onprc_ehr/resources/queries/study/encounters/TB Tests.qview.xml b/onprc_ehr/resources/queries/study/encounters/TB Tests.qview.xml index 10ca8fbb8..f99de6d17 100644 --- a/onprc_ehr/resources/queries/study/encounters/TB Tests.qview.xml +++ b/onprc_ehr/resources/queries/study/encounters/TB Tests.qview.xml @@ -3,9 +3,9 @@ + - From 83c898dcdd9bd21fc45c31407aa8432d0ca29f47 Mon Sep 17 00:00:00 2001 From: blasar Date: Sun, 21 Jun 2026 01:09:26 -0700 Subject: [PATCH 04/12] Modified TB Test Results under Lab Results to include Surgery TB Test Intradermal. --- .../queries/study/TBTestEnounters.sql | 6 +- .../study/TB_Test_Intradermal.query.xml | 84 +++++++++++++++++++ .../queries/study/TB_Test_Intradermal.sql | 48 +++++++++++ .../study/TB_Test_Intradermal/.qview.xml | 19 +++++ .../TB_Test_Intradermal/Procedure.qview.xml | 19 +++++ .../study/encounters/TB Tests.qview.xml | 6 +- 6 files changed, 175 insertions(+), 7 deletions(-) create mode 100644 onprc_ehr/resources/queries/study/TB_Test_Intradermal.query.xml create mode 100644 onprc_ehr/resources/queries/study/TB_Test_Intradermal.sql create mode 100644 onprc_ehr/resources/queries/study/TB_Test_Intradermal/.qview.xml create mode 100644 onprc_ehr/resources/queries/study/TB_Test_Intradermal/Procedure.qview.xml diff --git a/onprc_ehr/resources/queries/study/TBTestEnounters.sql b/onprc_ehr/resources/queries/study/TBTestEnounters.sql index 00679e477..a6269d9d6 100644 --- a/onprc_ehr/resources/queries/study/TBTestEnounters.sql +++ b/onprc_ehr/resources/queries/study/TBTestEnounters.sql @@ -18,10 +18,8 @@ SELECT t.date, t.procedureid, t.qcstate, - t.taskid, - t.type + t.taskid FROM study.encounters t -where t.procedureid.name in ('TB Test Intradermal','TB Test Serologic') -And t.type in ('Procedure','Surgery') +where procedureid.name in ('TB Test Intradermal','TB Test Serologic') diff --git a/onprc_ehr/resources/queries/study/TB_Test_Intradermal.query.xml b/onprc_ehr/resources/queries/study/TB_Test_Intradermal.query.xml new file mode 100644 index 000000000..f6f8f9405 --- /dev/null +++ b/onprc_ehr/resources/queries/study/TB_Test_Intradermal.query.xml @@ -0,0 +1,84 @@ + + + + + /ehr/encounterDetails.view?objectid=${objectid}&formtype=${taskid/formtype}&taskid=${taskid} + + + + + + + + + Date + + + + + Center Project + false + + ehr + project + project + + + + Procedure + + ehr_lookups + procedures + rowid + name + + + + Remark + false + + + Status + + core + QCState + Rowid + + + + + ehr + tasks + taskid + rowid + + + + + ehr + requests + requestid + rowid + + + + Charge Unit + + ehr_lookups + procedureChargeType + value + + + + Source + + ehr_lookups + encounter_types + value + + + +
+ + + \ No newline at end of file diff --git a/onprc_ehr/resources/queries/study/TB_Test_Intradermal.sql b/onprc_ehr/resources/queries/study/TB_Test_Intradermal.sql new file mode 100644 index 000000000..ea8abfbcc --- /dev/null +++ b/onprc_ehr/resources/queries/study/TB_Test_Intradermal.sql @@ -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') + diff --git a/onprc_ehr/resources/queries/study/TB_Test_Intradermal/.qview.xml b/onprc_ehr/resources/queries/study/TB_Test_Intradermal/.qview.xml new file mode 100644 index 000000000..51772e26d --- /dev/null +++ b/onprc_ehr/resources/queries/study/TB_Test_Intradermal/.qview.xml @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/onprc_ehr/resources/queries/study/TB_Test_Intradermal/Procedure.qview.xml b/onprc_ehr/resources/queries/study/TB_Test_Intradermal/Procedure.qview.xml new file mode 100644 index 000000000..51772e26d --- /dev/null +++ b/onprc_ehr/resources/queries/study/TB_Test_Intradermal/Procedure.qview.xml @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/onprc_ehr/resources/queries/study/encounters/TB Tests.qview.xml b/onprc_ehr/resources/queries/study/encounters/TB Tests.qview.xml index f99de6d17..bf856060a 100644 --- a/onprc_ehr/resources/queries/study/encounters/TB Tests.qview.xml +++ b/onprc_ehr/resources/queries/study/encounters/TB Tests.qview.xml @@ -3,9 +3,9 @@ - - - + + + From 445a6c1c84bcb812c8535e2f9ab224a6c3cbfa69 Mon Sep 17 00:00:00 2001 From: blasar Date: Sun, 21 Jun 2026 01:24:02 -0700 Subject: [PATCH 05/12] Modified TB Test Results under Lab Results to include Surgery TB Test Intradermal. --- .../resources/queries/study/TB_Test_Intradermal/.qview.xml | 2 +- .../queries/study/TB_Test_Intradermal/Procedure.qview.xml | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/onprc_ehr/resources/queries/study/TB_Test_Intradermal/.qview.xml b/onprc_ehr/resources/queries/study/TB_Test_Intradermal/.qview.xml index 51772e26d..6f47a0439 100644 --- a/onprc_ehr/resources/queries/study/TB_Test_Intradermal/.qview.xml +++ b/onprc_ehr/resources/queries/study/TB_Test_Intradermal/.qview.xml @@ -5,7 +5,7 @@ - + diff --git a/onprc_ehr/resources/queries/study/TB_Test_Intradermal/Procedure.qview.xml b/onprc_ehr/resources/queries/study/TB_Test_Intradermal/Procedure.qview.xml index 51772e26d..6f10b782c 100644 --- a/onprc_ehr/resources/queries/study/TB_Test_Intradermal/Procedure.qview.xml +++ b/onprc_ehr/resources/queries/study/TB_Test_Intradermal/Procedure.qview.xml @@ -5,10 +5,11 @@ - + + From 7bba953d09e1accfdd29597dd5be3a93f439c08c Mon Sep 17 00:00:00 2001 From: blasar Date: Sun, 21 Jun 2026 01:37:51 -0700 Subject: [PATCH 06/12] Modified TB Test Results under Lab Results to include Surgery TB Test Intradermal. --- .../resources/queries/study/TB_Test_Intradermal/.qview.xml | 2 +- .../queries/study/TB_Test_Intradermal/Procedure.qview.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/onprc_ehr/resources/queries/study/TB_Test_Intradermal/.qview.xml b/onprc_ehr/resources/queries/study/TB_Test_Intradermal/.qview.xml index 6f47a0439..483e3ed60 100644 --- a/onprc_ehr/resources/queries/study/TB_Test_Intradermal/.qview.xml +++ b/onprc_ehr/resources/queries/study/TB_Test_Intradermal/.qview.xml @@ -14,6 +14,6 @@ - + \ No newline at end of file diff --git a/onprc_ehr/resources/queries/study/TB_Test_Intradermal/Procedure.qview.xml b/onprc_ehr/resources/queries/study/TB_Test_Intradermal/Procedure.qview.xml index 6f10b782c..50a0bb742 100644 --- a/onprc_ehr/resources/queries/study/TB_Test_Intradermal/Procedure.qview.xml +++ b/onprc_ehr/resources/queries/study/TB_Test_Intradermal/Procedure.qview.xml @@ -15,6 +15,6 @@ - + \ No newline at end of file From ba78ac0e8252207273d16cc053bd499a0ac3e6c1 Mon Sep 17 00:00:00 2001 From: blasar Date: Mon, 22 Jun 2026 09:15:21 -0700 Subject: [PATCH 07/12] Modified TB Test Results under Lab Results to include Surgery TB Test Intradermal. --- ...est_Intradermal.sql => Procedure_Amended.sql} | 16 ++++++++-------- ...tradermal.query.xml => Procedure_Amended.xml} | 0 .../.qview.xml | 0 .../Procedure.qview.xml | 0 4 files changed, 8 insertions(+), 8 deletions(-) rename onprc_ehr/resources/queries/study/{TB_Test_Intradermal.sql => Procedure_Amended.sql} (88%) rename onprc_ehr/resources/queries/study/{TB_Test_Intradermal.query.xml => Procedure_Amended.xml} (100%) rename onprc_ehr/resources/queries/study/{TB_Test_Intradermal => Procedure_Amended}/.qview.xml (100%) rename onprc_ehr/resources/queries/study/{TB_Test_Intradermal => Procedure_Amended}/Procedure.qview.xml (100%) diff --git a/onprc_ehr/resources/queries/study/TB_Test_Intradermal.sql b/onprc_ehr/resources/queries/study/Procedure_Amended.sql similarity index 88% rename from onprc_ehr/resources/queries/study/TB_Test_Intradermal.sql rename to onprc_ehr/resources/queries/study/Procedure_Amended.sql index ea8abfbcc..ebecb4db0 100644 --- a/onprc_ehr/resources/queries/study/TB_Test_Intradermal.sql +++ b/onprc_ehr/resources/queries/study/Procedure_Amended.sql @@ -30,16 +30,16 @@ FROM study.encounters t Where t.type in ('Procedure') UNION SELECT - j.id, - j.date, - j.procedureid, + j.id, + j.date, +j.procedureid, j.qcstate, - j.taskid, - j.type, + j.taskid, + j.type, j.remark, - j.requestid, - j.chargetype, - j.project + j.requestid, + j.chargetype, + j.project FROM study.encounters j diff --git a/onprc_ehr/resources/queries/study/TB_Test_Intradermal.query.xml b/onprc_ehr/resources/queries/study/Procedure_Amended.xml similarity index 100% rename from onprc_ehr/resources/queries/study/TB_Test_Intradermal.query.xml rename to onprc_ehr/resources/queries/study/Procedure_Amended.xml diff --git a/onprc_ehr/resources/queries/study/TB_Test_Intradermal/.qview.xml b/onprc_ehr/resources/queries/study/Procedure_Amended/.qview.xml similarity index 100% rename from onprc_ehr/resources/queries/study/TB_Test_Intradermal/.qview.xml rename to onprc_ehr/resources/queries/study/Procedure_Amended/.qview.xml diff --git a/onprc_ehr/resources/queries/study/TB_Test_Intradermal/Procedure.qview.xml b/onprc_ehr/resources/queries/study/Procedure_Amended/Procedure.qview.xml similarity index 100% rename from onprc_ehr/resources/queries/study/TB_Test_Intradermal/Procedure.qview.xml rename to onprc_ehr/resources/queries/study/Procedure_Amended/Procedure.qview.xml From 7b9d6188f9bf3759fc1a9424c6030f524c1d7b9d Mon Sep 17 00:00:00 2001 From: blasar Date: Mon, 22 Jun 2026 11:17:17 -0700 Subject: [PATCH 08/12] Modified TB Test Results under Lab Results to include Surgery TB Test Intradermal. --- onprc_ehr/resources/queries/study/Procedure_Amended.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/onprc_ehr/resources/queries/study/Procedure_Amended.xml b/onprc_ehr/resources/queries/study/Procedure_Amended.xml index f6f8f9405..0fec33102 100644 --- a/onprc_ehr/resources/queries/study/Procedure_Amended.xml +++ b/onprc_ehr/resources/queries/study/Procedure_Amended.xml @@ -1,7 +1,7 @@ - +
/ehr/encounterDetails.view?objectid=${objectid}&formtype=${taskid/formtype}&taskid=${taskid} From a5a40a9896e9ad7a15a1a3ffa1f87a0e8ffc80de Mon Sep 17 00:00:00 2001 From: blasar Date: Mon, 22 Jun 2026 11:49:50 -0700 Subject: [PATCH 09/12] Modified TB Test Results under Lab Results to include Surgery TB Test Intradermal. --- ...Procedure_Amended.xml => Procedure_Amended.query.xml} | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) rename onprc_ehr/resources/queries/study/{Procedure_Amended.xml => Procedure_Amended.query.xml} (87%) diff --git a/onprc_ehr/resources/queries/study/Procedure_Amended.xml b/onprc_ehr/resources/queries/study/Procedure_Amended.query.xml similarity index 87% rename from onprc_ehr/resources/queries/study/Procedure_Amended.xml rename to onprc_ehr/resources/queries/study/Procedure_Amended.query.xml index 0fec33102..499d3df6a 100644 --- a/onprc_ehr/resources/queries/study/Procedure_Amended.xml +++ b/onprc_ehr/resources/queries/study/Procedure_Amended.query.xml @@ -2,7 +2,7 @@
- /ehr/encounterDetails.view?objectid=${objectid}&formtype=${taskid/formtype}&taskid=${taskid} + Procedures Amended @@ -19,6 +19,7 @@ Center Project false + /ONPRC/EHR ehr project project @@ -27,6 +28,7 @@ Procedure + /ONPRC/EHR ehr_lookups procedures rowid @@ -40,6 +42,7 @@ Status + /ONPRC/EHR core QCState Rowid @@ -47,6 +50,7 @@ + /ONPRC/EHR ehr tasks taskid @@ -55,6 +59,7 @@ + /ONPRC/EHR ehr requests requestid @@ -64,6 +69,7 @@ Charge Unit + /ONPRC/EHR ehr_lookups procedureChargeType value @@ -72,6 +78,7 @@ Source + /ONPRC/EHR ehr_lookups encounter_types value From cf1cdde7db0df66c99e22ff609725503330dbf64 Mon Sep 17 00:00:00 2001 From: blasar Date: Mon, 22 Jun 2026 11:51:26 -0700 Subject: [PATCH 10/12] Modified TB Test Results under Lab Results to include Surgery TB Test Intradermal. --- .../resources/queries/study/Procedure_Amended.query.xml | 7 ------- 1 file changed, 7 deletions(-) diff --git a/onprc_ehr/resources/queries/study/Procedure_Amended.query.xml b/onprc_ehr/resources/queries/study/Procedure_Amended.query.xml index 499d3df6a..d39cad68d 100644 --- a/onprc_ehr/resources/queries/study/Procedure_Amended.query.xml +++ b/onprc_ehr/resources/queries/study/Procedure_Amended.query.xml @@ -19,7 +19,6 @@ Center Project false - /ONPRC/EHR ehr project project @@ -28,7 +27,6 @@ Procedure - /ONPRC/EHR ehr_lookups procedures rowid @@ -42,7 +40,6 @@ Status - /ONPRC/EHR core QCState Rowid @@ -50,7 +47,6 @@ - /ONPRC/EHR ehr tasks taskid @@ -59,7 +55,6 @@ - /ONPRC/EHR ehr requests requestid @@ -69,7 +64,6 @@ Charge Unit - /ONPRC/EHR ehr_lookups procedureChargeType value @@ -78,7 +72,6 @@ Source - /ONPRC/EHR ehr_lookups encounter_types value From 1457b8cc27642a2b96b68ccb598eaa9d840aab13 Mon Sep 17 00:00:00 2001 From: blasar Date: Mon, 22 Jun 2026 13:06:26 -0700 Subject: [PATCH 11/12] Modified TB Test Results under Lab Results to include Surgery TB Test Intradermal. --- .../resources/queries/study/encounters/TB Tests.qview.xml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/onprc_ehr/resources/queries/study/encounters/TB Tests.qview.xml b/onprc_ehr/resources/queries/study/encounters/TB Tests.qview.xml index bf856060a..2b3fae03a 100644 --- a/onprc_ehr/resources/queries/study/encounters/TB Tests.qview.xml +++ b/onprc_ehr/resources/queries/study/encounters/TB Tests.qview.xml @@ -3,9 +3,8 @@ - - - + + From aedd82e94ac3f4bd0d34f0ec84f7dd5d4ac6f964 Mon Sep 17 00:00:00 2001 From: blasar Date: Tue, 23 Jun 2026 12:49:42 -0700 Subject: [PATCH 12/12] Modified Procedure report to include Instradermal from surgery. --- onprc_ehr/resources/queries/study/Procedure_Amended.query.xml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/onprc_ehr/resources/queries/study/Procedure_Amended.query.xml b/onprc_ehr/resources/queries/study/Procedure_Amended.query.xml index d39cad68d..7be4d1136 100644 --- a/onprc_ehr/resources/queries/study/Procedure_Amended.query.xml +++ b/onprc_ehr/resources/queries/study/Procedure_Amended.query.xml @@ -13,8 +13,7 @@ Date - - + Center Project false