From 2af21ab113da76a6335de27f694c2df154ccb6b0 Mon Sep 17 00:00:00 2001
From: blasar <blasar@ohsu.eddu>
Date: Thu, 25 Jun 2026 09:47:03 -0700
Subject: [PATCH 1/2] Modified Clinical Procedure report to allow Current
 location selection to generate the report.

---
 .../queries/study/Procedure_Amended.query.xml          |  9 +++++++++
 .../resources/queries/study/Procedure_Amended.sql      | 10 ++++++++--
 .../study/Procedure_Amended/Procedure.qview.xml        |  2 ++
 3 files changed, 19 insertions(+), 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 7be4d1136..39a5b9f89 100644
--- a/onprc_ehr/resources/queries/study/Procedure_Amended.query.xml
+++ b/onprc_ehr/resources/queries/study/Procedure_Amended.query.xml
@@ -32,6 +32,15 @@
                             <fkDisplayColumnName>name</fkDisplayColumnName>
                         </fk>
                     </column>
+                    <column columnName="objectid">
+                        <isHidden>true</isHidden>
+                    </column>
+<!--                    <column columnName="room">-->
+<!--                        <isHidden>false</isHidden>-->
+<!--                    </column>-->
+<!--                    <column columnName="area">-->
+<!--                        <isHidden>false</isHidden>-->
+<!--                    </column>-->
                     <column columnName="remark">
                         <columnTitle>Remark</columnTitle>
                         <isHidden>false</isHidden>
diff --git a/onprc_ehr/resources/queries/study/Procedure_Amended.sql b/onprc_ehr/resources/queries/study/Procedure_Amended.sql
index ebecb4db0..2e0bababd 100644
--- a/onprc_ehr/resources/queries/study/Procedure_Amended.sql
+++ b/onprc_ehr/resources/queries/study/Procedure_Amended.sql
@@ -23,7 +23,10 @@ SELECT
     t.remark,
     t.requestid,
     t.chargetype,
-    t.project
+    t.project,
+    t.objectid,
+    t.Id.curLocation.room,
+    t.Id.curLocation.area
 
 
 FROM study.encounters t
@@ -39,7 +42,10 @@ j.procedureid,
      j.remark,
    j.requestid,
   j.chargetype,
-      j.project
+      j.project,
+      j.objectid,
+      j.Id.curLocation.room,
+        j.Id.curLocation.area
 
 
 FROM study.encounters j
diff --git a/onprc_ehr/resources/queries/study/Procedure_Amended/Procedure.qview.xml b/onprc_ehr/resources/queries/study/Procedure_Amended/Procedure.qview.xml
index 50a0bb742..0b0608c34 100644
--- a/onprc_ehr/resources/queries/study/Procedure_Amended/Procedure.qview.xml
+++ b/onprc_ehr/resources/queries/study/Procedure_Amended/Procedure.qview.xml
@@ -10,6 +10,8 @@
         <column name="requestid" />
         <column name="chargetype" />
         <column name="type" />
+<!--        <column name="Id/curLocation/room" />-->
+<!--        <column name="Id/curLocation/area" />-->
     </columns>
     <sorts>
         <sort column="date" descending="true"/>

From 031b5da1d76e18ec65584751a7f861cdd72338e8 Mon Sep 17 00:00:00 2001
From: blasar <blasar@ohsu.eddu>
Date: Fri, 26 Jun 2026 08:19:02 -0700
Subject: [PATCH 2/2] Modified Animal History Report Clinical Procedures to now
 include a process to display the report by current location.

---
 .../queries/study/Procedure_Amended.query.xml | 38 ++++++++---------
 .../queries/study/Procedure_Amended.sql       | 41 ++++++++++---------
 .../Procedure_Amended/Procedure.qview.xml     |  5 +--
 3 files changed, 39 insertions(+), 45 deletions(-)

diff --git a/onprc_ehr/resources/queries/study/Procedure_Amended.query.xml b/onprc_ehr/resources/queries/study/Procedure_Amended.query.xml
index 39a5b9f89..5f5aa7ba4 100644
--- a/onprc_ehr/resources/queries/study/Procedure_Amended.query.xml
+++ b/onprc_ehr/resources/queries/study/Procedure_Amended.query.xml
@@ -3,26 +3,18 @@
         <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">
+                        <fk>
+                            <fkDbSchema>study</fkDbSchema>
+                            <fkTable>animal</fkTable>
+                            <fkColumnName>Id</fkColumnName>
+                        </fk>
                     </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>
@@ -32,15 +24,6 @@
                             <fkDisplayColumnName>name</fkDisplayColumnName>
                         </fk>
                     </column>
-                    <column columnName="objectid">
-                        <isHidden>true</isHidden>
-                    </column>
-<!--                    <column columnName="room">-->
-<!--                        <isHidden>false</isHidden>-->
-<!--                    </column>-->
-<!--                    <column columnName="area">-->
-<!--                        <isHidden>false</isHidden>-->
-<!--                    </column>-->
                     <column columnName="remark">
                         <columnTitle>Remark</columnTitle>
                         <isHidden>false</isHidden>
@@ -69,6 +52,13 @@
                             <fkDisplayColumnName>rowid</fkDisplayColumnName>
                         </fk>
                     </column>
+                    <column columnName="project">
+                        <fk>
+                            <fkDbSchema>ehr</fkDbSchema>
+                            <fkTable>project</fkTable>
+                            <fkColumnName>project</fkColumnName>
+                        </fk>
+                    </column>
                     <column columnName="chargetype">
                         <columnTitle>Charge Unit</columnTitle>
                         <fk>
@@ -85,6 +75,10 @@
                             <fkColumnName>value</fkColumnName>
                         </fk>
                     </column>
+                    <column columnName="lsid">
+                        <isHidden>true</isHidden>
+                        <isKeyField>true</isKeyField>
+                    </column>
                 </columns>
             </table>
         </tables>
diff --git a/onprc_ehr/resources/queries/study/Procedure_Amended.sql b/onprc_ehr/resources/queries/study/Procedure_Amended.sql
index 2e0bababd..89dbbccb7 100644
--- a/onprc_ehr/resources/queries/study/Procedure_Amended.sql
+++ b/onprc_ehr/resources/queries/study/Procedure_Amended.sql
@@ -13,8 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
+
+
 SELECT
-    t.id,
+    t.Id,
     t.date,
     t.procedureid,
     t.qcstate,
@@ -24,31 +27,29 @@ SELECT
     t.requestid,
     t.chargetype,
     t.project,
-    t.objectid,
-    t.Id.curLocation.room,
-    t.Id.curLocation.area
+    t.lsid
 
 
 FROM study.encounters t
 Where  t.type in ('Procedure')
-UNION
-SELECT
-        j.id,
+
+  UNION
+
+ SELECT
+      j.Id,
       j.date,
-j.procedureid,
-    j.qcstate,
-     j.taskid,
-       j.type,
-     j.remark,
-   j.requestid,
-  j.chargetype,
+      j.procedureid,
+      j.qcstate,
+      j.taskid,
+      j.type,
+      j.remark,
+      j.requestid,
+      j.chargetype,
       j.project,
-      j.objectid,
-      j.Id.curLocation.room,
-        j.Id.curLocation.area
+      j.lsid
 
 
-FROM study.encounters j
-where j.procedureid.name in ('TB Test Intradermal')
-  And j.type in ('Surgery')
+ 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/Procedure_Amended/Procedure.qview.xml b/onprc_ehr/resources/queries/study/Procedure_Amended/Procedure.qview.xml
index 0b0608c34..b6ff5a628 100644
--- a/onprc_ehr/resources/queries/study/Procedure_Amended/Procedure.qview.xml
+++ b/onprc_ehr/resources/queries/study/Procedure_Amended/Procedure.qview.xml
@@ -10,13 +10,12 @@
         <column name="requestid" />
         <column name="chargetype" />
         <column name="type" />
-<!--        <column name="Id/curLocation/room" />-->
-<!--        <column name="Id/curLocation/area" />-->
+
     </columns>
     <sorts>
         <sort column="date" descending="true"/>
     </sorts>
     <filters>
-        <filter column="type" operator="containsnoneof" value="Procedure,Surgery"/>
+        <filter column="type" operator="containsoneof" value="Procedure;Surgery"/>
     </filters>
 </customView>
\ No newline at end of file