From fffa8aba9d2e8a0eced0b2be1d3d4b4ac67cf263 Mon Sep 17 00:00:00 2001
From: Marty Pradere <martyp@labkey.com>
Date: Sun, 11 May 2025 21:19:50 -0700
Subject: [PATCH 1/4] updated views

---
 nirc_ehr/resources/queries/dbo/q_clinremarks.sql              | 1 +
 nirc_ehr/resources/queries/study/alopecia/.qview.xml          | 3 +++
 nirc_ehr/resources/queries/study/blood/.qview.xml             | 3 +++
 nirc_ehr/resources/queries/study/breeder/.qview.xml           | 3 +++
 nirc_ehr/resources/queries/study/chemistryResults/.qview.xml  | 3 +++
 .../resources/queries/study/clinical_observations/.qview.xml  | 3 +++
 .../study/clinical_observations/Alopecia Scores.qview.xml     | 3 +++
 .../queries/study/clinical_observations/Behavior.qview.xml    | 3 +++
 .../queries/study/clinical_observations/Clinical.qview.xml    | 3 +++
 nirc_ehr/resources/queries/study/deaths/.qview.xml            | 1 +
 nirc_ehr/resources/queries/study/demographics/.qview.xml      | 2 ++
 nirc_ehr/resources/queries/study/departure/.qview.xml         | 1 +
 nirc_ehr/resources/queries/study/drug/.qview.xml              | 3 +++
 nirc_ehr/resources/queries/study/exemptions/.qview.xml        | 3 +++
 nirc_ehr/resources/queries/study/flags/.qview.xml             | 3 +++
 nirc_ehr/resources/queries/study/grossPathology/.qview.xml    | 1 +
 nirc_ehr/resources/queries/study/housing/.qview.xml           | 1 +
 .../resources/queries/study/housing/Active Housing.qview.xml  | 1 +
 nirc_ehr/resources/queries/study/necropsy/.qview.xml          | 1 +
 nirc_ehr/resources/queries/study/notes/.qview.xml             | 3 +++
 nirc_ehr/resources/queries/study/obs/.qview.xml               | 3 +++
 nirc_ehr/resources/queries/study/observation_order/.qview.xml | 3 +++
 .../study/observation_order/Active Behavior Orders.qview.xml  | 3 +++
 .../study/observation_order/Active Clinical Orders.qview.xml  | 3 +++
 .../queries/study/observation_order/Behavior Orders.qview.xml | 3 +++
 .../queries/study/observation_order/Clinical Orders.qview.xml | 3 +++
 nirc_ehr/resources/queries/study/pairings/.qview.xml          | 3 +++
 nirc_ehr/resources/queries/study/physicalExam/.qview.xml      | 3 +++
 nirc_ehr/resources/queries/study/prc/.qview.xml               | 3 +++
 nirc_ehr/resources/queries/study/prc_order/.qview.xml         | 2 --
 nirc_ehr/resources/queries/study/prc_order_report/.qview.xml  | 4 +---
 nirc_ehr/resources/queries/study/treatmentSchedule/.qview.xml | 3 ---
 .../queries/study/treatmentSchedule/Area 11.qview.xml         | 3 +--
 .../queries/study/treatmentSchedule/Area 51.qview.xml         | 3 +--
 .../queries/study/treatmentSchedule/Building 10.qview.xml     | 3 +--
 .../queries/study/treatmentSchedule/Building 10C.qview.xml    | 3 +--
 .../queries/study/treatmentSchedule/Building 27.qview.xml     | 3 +--
 .../queries/study/treatmentSchedule/Building 28.qview.xml     | 3 +--
 .../queries/study/treatmentSchedule/Building 29.qview.xml     | 3 +--
 .../queries/study/treatmentSchedule/Building 30.qview.xml     | 3 +--
 .../queries/study/treatmentSchedule/Building 31.qview.xml     | 3 +--
 .../queries/study/treatmentSchedule/Building 31C.qview.xml    | 3 +--
 .../queries/study/treatmentSchedule/Building 31D.qview.xml    | 3 +--
 .../queries/study/treatmentSchedule/Building 32.qview.xml     | 3 +--
 .../queries/study/treatmentSchedule/Building 34.qview.xml     | 3 +--
 .../queries/study/treatmentSchedule/Building 37.qview.xml     | 3 +--
 .../queries/study/treatmentSchedule/Building 41.qview.xml     | 3 +--
 .../queries/study/treatmentSchedule/Building 42.qview.xml     | 3 +--
 .../queries/study/treatmentSchedule/Building 43.qview.xml     | 3 +--
 .../queries/study/treatmentSchedule/Building 44.qview.xml     | 3 +--
 .../queries/study/treatmentSchedule/Building 45.qview.xml     | 3 +--
 .../queries/study/treatmentSchedule/Building 46.qview.xml     | 3 +--
 .../queries/study/treatmentSchedule/Building 50.qview.xml     | 3 +--
 .../queries/study/treatmentSchedule/Building 52.qview.xml     | 3 +--
 .../queries/study/treatmentSchedule/Building 53.qview.xml     | 3 +--
 .../queries/study/treatmentSchedule/Building 54A.qview.xml    | 3 +--
 .../queries/study/treatmentSchedule/Building 54B.qview.xml    | 3 +--
 .../study/treatmentSchedule/Clinical Medications.qview.xml    | 2 --
 nirc_ehr/resources/queries/study/treatment_order/.qview.xml   | 2 +-
 nirc_ehr/resources/queries/study/vitals/.qview.xml            | 3 +++
 60 files changed, 102 insertions(+), 61 deletions(-)

diff --git a/nirc_ehr/resources/queries/dbo/q_clinremarks.sql b/nirc_ehr/resources/queries/dbo/q_clinremarks.sql
index 488233b4..3a2a452d 100644
--- a/nirc_ehr/resources/queries/dbo/q_clinremarks.sql
+++ b/nirc_ehr/resources/queries/dbo/q_clinremarks.sql
@@ -8,6 +8,7 @@ SELECT anmEvt.ANIMAL_EVENT_ID
        anmEvt.EVENT_ID.EVENT_ID                                                  AS category,
        anmEvt.DIAGNOSIS                                                          AS vetreview,
        anmCmt.TEXT                                                               AS remark,
+       'Clinical'                                                                AS category,
        CASE WHEN anmEvt.ATTACHMENT_PATH IS NOT NULL THEN
             ('C:\Program Files\Labkey\labkey\files\NIRC\EHR\@files\attachments'
                 || substring(anmEvt.ATTACHMENT_PATH, LENGTH('N:\'), LENGTH(anmEvt.ATTACHMENT_PATH)))
diff --git a/nirc_ehr/resources/queries/study/alopecia/.qview.xml b/nirc_ehr/resources/queries/study/alopecia/.qview.xml
index a34144d7..f889f927 100644
--- a/nirc_ehr/resources/queries/study/alopecia/.qview.xml
+++ b/nirc_ehr/resources/queries/study/alopecia/.qview.xml
@@ -4,6 +4,9 @@
     </sorts>
     <columns>
         <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="score"/>
         <column name="units"/>
diff --git a/nirc_ehr/resources/queries/study/blood/.qview.xml b/nirc_ehr/resources/queries/study/blood/.qview.xml
index 2d2db6f9..831d6b54 100644
--- a/nirc_ehr/resources/queries/study/blood/.qview.xml
+++ b/nirc_ehr/resources/queries/study/blood/.qview.xml
@@ -4,6 +4,9 @@
     </sorts>
     <columns>
         <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="quantity"/>
         <column name="units"/>
diff --git a/nirc_ehr/resources/queries/study/breeder/.qview.xml b/nirc_ehr/resources/queries/study/breeder/.qview.xml
index 63ccae39..448bd0ff 100644
--- a/nirc_ehr/resources/queries/study/breeder/.qview.xml
+++ b/nirc_ehr/resources/queries/study/breeder/.qview.xml
@@ -4,6 +4,9 @@
     </sorts>
     <columns>
         <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="type"/>
         <column name="result"/>
diff --git a/nirc_ehr/resources/queries/study/chemistryResults/.qview.xml b/nirc_ehr/resources/queries/study/chemistryResults/.qview.xml
index 11ef289a..02467cba 100644
--- a/nirc_ehr/resources/queries/study/chemistryResults/.qview.xml
+++ b/nirc_ehr/resources/queries/study/chemistryResults/.qview.xml
@@ -1,6 +1,9 @@
 <customView xmlns="http://labkey.org/data/xml/queryCustomView" canOverride="true">
     <columns>
         <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="type"/>
         <column name="result"/>
diff --git a/nirc_ehr/resources/queries/study/clinical_observations/.qview.xml b/nirc_ehr/resources/queries/study/clinical_observations/.qview.xml
index d044aafc..7b1fc1ad 100644
--- a/nirc_ehr/resources/queries/study/clinical_observations/.qview.xml
+++ b/nirc_ehr/resources/queries/study/clinical_observations/.qview.xml
@@ -4,6 +4,9 @@
     </sorts>
     <columns>
         <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="area"/>
         <column name="observation"/>
diff --git a/nirc_ehr/resources/queries/study/clinical_observations/Alopecia Scores.qview.xml b/nirc_ehr/resources/queries/study/clinical_observations/Alopecia Scores.qview.xml
index d044aafc..7b1fc1ad 100644
--- a/nirc_ehr/resources/queries/study/clinical_observations/Alopecia Scores.qview.xml	
+++ b/nirc_ehr/resources/queries/study/clinical_observations/Alopecia Scores.qview.xml	
@@ -4,6 +4,9 @@
     </sorts>
     <columns>
         <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="area"/>
         <column name="observation"/>
diff --git a/nirc_ehr/resources/queries/study/clinical_observations/Behavior.qview.xml b/nirc_ehr/resources/queries/study/clinical_observations/Behavior.qview.xml
index 0797e8c6..7b010377 100644
--- a/nirc_ehr/resources/queries/study/clinical_observations/Behavior.qview.xml
+++ b/nirc_ehr/resources/queries/study/clinical_observations/Behavior.qview.xml
@@ -4,6 +4,9 @@
     </sorts>
     <columns>
         <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="area"/>
         <column name="observation"/>
diff --git a/nirc_ehr/resources/queries/study/clinical_observations/Clinical.qview.xml b/nirc_ehr/resources/queries/study/clinical_observations/Clinical.qview.xml
index 73d4eaa7..6cf94811 100644
--- a/nirc_ehr/resources/queries/study/clinical_observations/Clinical.qview.xml
+++ b/nirc_ehr/resources/queries/study/clinical_observations/Clinical.qview.xml
@@ -4,6 +4,9 @@
     </sorts>
     <columns>
         <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="area"/>
         <column name="observation"/>
diff --git a/nirc_ehr/resources/queries/study/deaths/.qview.xml b/nirc_ehr/resources/queries/study/deaths/.qview.xml
index 5bc1b28b..d04d768b 100644
--- a/nirc_ehr/resources/queries/study/deaths/.qview.xml
+++ b/nirc_ehr/resources/queries/study/deaths/.qview.xml
@@ -4,6 +4,7 @@
     </sorts>
     <columns>
         <column name="Id"/>
+        <column name="Id/Demographics/species"/>
         <column name="date"/>
         <column name="reason"/>
         <column name="remark"/>
diff --git a/nirc_ehr/resources/queries/study/demographics/.qview.xml b/nirc_ehr/resources/queries/study/demographics/.qview.xml
index 73dc6ca0..56f1f233 100644
--- a/nirc_ehr/resources/queries/study/demographics/.qview.xml
+++ b/nirc_ehr/resources/queries/study/demographics/.qview.xml
@@ -4,6 +4,8 @@
     </sorts>
     <columns>
         <column name="Id"/>
+        <column name="Id/curLocation/cage/room/floor/building"/>
+        <column name="Id/curLocation/cage"/>
         <column name="gender"/>
         <column name="birth"/>
         <column name="death"/>
diff --git a/nirc_ehr/resources/queries/study/departure/.qview.xml b/nirc_ehr/resources/queries/study/departure/.qview.xml
index d7bdb042..31e17cb9 100644
--- a/nirc_ehr/resources/queries/study/departure/.qview.xml
+++ b/nirc_ehr/resources/queries/study/departure/.qview.xml
@@ -4,6 +4,7 @@
     </sorts>
     <columns>
         <column name="Id"/>
+        <column name="Id/Demographics/species"/>
         <column name="date"/>
         <column name="destination"/>
         <column name="description"/>
diff --git a/nirc_ehr/resources/queries/study/drug/.qview.xml b/nirc_ehr/resources/queries/study/drug/.qview.xml
index 7c4fbfdd..032e214c 100644
--- a/nirc_ehr/resources/queries/study/drug/.qview.xml
+++ b/nirc_ehr/resources/queries/study/drug/.qview.xml
@@ -4,6 +4,9 @@
     </sorts>
     <columns>
         <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="enddate"/>
         <column name="code"/>
diff --git a/nirc_ehr/resources/queries/study/exemptions/.qview.xml b/nirc_ehr/resources/queries/study/exemptions/.qview.xml
index 5c625c06..7e4278b8 100644
--- a/nirc_ehr/resources/queries/study/exemptions/.qview.xml
+++ b/nirc_ehr/resources/queries/study/exemptions/.qview.xml
@@ -4,6 +4,9 @@
     </sorts>
     <columns>
         <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="category"/>
         <column name="remark"/>
diff --git a/nirc_ehr/resources/queries/study/flags/.qview.xml b/nirc_ehr/resources/queries/study/flags/.qview.xml
index dba554d8..bf12e57f 100644
--- a/nirc_ehr/resources/queries/study/flags/.qview.xml
+++ b/nirc_ehr/resources/queries/study/flags/.qview.xml
@@ -1,6 +1,9 @@
 <customView xmlns="http://labkey.org/data/xml/queryCustomView" label="All Flags" canOverride="true">
     <columns>
         <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="enddate"/>
         <column name="flag/category"/>
diff --git a/nirc_ehr/resources/queries/study/grossPathology/.qview.xml b/nirc_ehr/resources/queries/study/grossPathology/.qview.xml
index abe813d5..798d1daa 100644
--- a/nirc_ehr/resources/queries/study/grossPathology/.qview.xml
+++ b/nirc_ehr/resources/queries/study/grossPathology/.qview.xml
@@ -4,6 +4,7 @@
     </sorts>
     <columns>
         <column name="Id"/>
+        <column name="Id/Demographics/species"/>
         <column name="date"/>
         <column name="systemExamined"/>
         <column name="appearance"/>
diff --git a/nirc_ehr/resources/queries/study/housing/.qview.xml b/nirc_ehr/resources/queries/study/housing/.qview.xml
index be455e89..bc780a57 100644
--- a/nirc_ehr/resources/queries/study/housing/.qview.xml
+++ b/nirc_ehr/resources/queries/study/housing/.qview.xml
@@ -4,6 +4,7 @@
     </sorts>
     <columns>
         <column name="Id"/>
+        <column name="Id/Demographics/species"/>
         <column name="date"/>
         <column name="enddate"/>
         <column name="room/fullRoom" />
diff --git a/nirc_ehr/resources/queries/study/housing/Active Housing.qview.xml b/nirc_ehr/resources/queries/study/housing/Active Housing.qview.xml
index 9c05c737..4fc3eeb6 100644
--- a/nirc_ehr/resources/queries/study/housing/Active Housing.qview.xml	
+++ b/nirc_ehr/resources/queries/study/housing/Active Housing.qview.xml	
@@ -1,6 +1,7 @@
 <customView xmlns="http://labkey.org/data/xml/queryCustomView" canOverride="true">
     <columns>
         <column name="Id"/>
+        <column name="Id/Demographics/species"/>
         <column name="date"/>
         <column name="enddate"/>
         <column name="cage"/>
diff --git a/nirc_ehr/resources/queries/study/necropsy/.qview.xml b/nirc_ehr/resources/queries/study/necropsy/.qview.xml
index 6eea6283..b1af3175 100644
--- a/nirc_ehr/resources/queries/study/necropsy/.qview.xml
+++ b/nirc_ehr/resources/queries/study/necropsy/.qview.xml
@@ -4,6 +4,7 @@
     </sorts>
     <columns>
         <column name="Id"/>
+        <column name="Id/Demographics/species"/>
         <column name="date"/>
         <column name="accessionNumber"/>
         <column name="examReason"/>
diff --git a/nirc_ehr/resources/queries/study/notes/.qview.xml b/nirc_ehr/resources/queries/study/notes/.qview.xml
index 1ca2417c..6cd9bab2 100644
--- a/nirc_ehr/resources/queries/study/notes/.qview.xml
+++ b/nirc_ehr/resources/queries/study/notes/.qview.xml
@@ -4,6 +4,9 @@
     </sorts>
     <columns>
         <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="type"/>
         <column name="remark"/>
diff --git a/nirc_ehr/resources/queries/study/obs/.qview.xml b/nirc_ehr/resources/queries/study/obs/.qview.xml
index 71aa27b0..46e1dc2e 100644
--- a/nirc_ehr/resources/queries/study/obs/.qview.xml
+++ b/nirc_ehr/resources/queries/study/obs/.qview.xml
@@ -4,6 +4,9 @@
     </sorts>
     <columns>
         <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="category"/>
         <column name="diagnosis"/>
diff --git a/nirc_ehr/resources/queries/study/observation_order/.qview.xml b/nirc_ehr/resources/queries/study/observation_order/.qview.xml
index 2b94bef4..c02d2fb8 100644
--- a/nirc_ehr/resources/queries/study/observation_order/.qview.xml
+++ b/nirc_ehr/resources/queries/study/observation_order/.qview.xml
@@ -1,6 +1,9 @@
 <customView xmlns="http://labkey.org/data/xml/queryCustomView" canOverride="true">
     <columns>
         <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="enddate"/>
         <column name="category"/>
diff --git a/nirc_ehr/resources/queries/study/observation_order/Active Behavior Orders.qview.xml b/nirc_ehr/resources/queries/study/observation_order/Active Behavior Orders.qview.xml
index 286a225a..d4c5c115 100644
--- a/nirc_ehr/resources/queries/study/observation_order/Active Behavior Orders.qview.xml	
+++ b/nirc_ehr/resources/queries/study/observation_order/Active Behavior Orders.qview.xml	
@@ -1,6 +1,9 @@
 <customView xmlns="http://labkey.org/data/xml/queryCustomView" canOverride="true">
     <columns>
         <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="enddate"/>
         <column name="category"/>
diff --git a/nirc_ehr/resources/queries/study/observation_order/Active Clinical Orders.qview.xml b/nirc_ehr/resources/queries/study/observation_order/Active Clinical Orders.qview.xml
index 8c9ed329..1638c87a 100644
--- a/nirc_ehr/resources/queries/study/observation_order/Active Clinical Orders.qview.xml	
+++ b/nirc_ehr/resources/queries/study/observation_order/Active Clinical Orders.qview.xml	
@@ -1,6 +1,9 @@
 <customView xmlns="http://labkey.org/data/xml/queryCustomView" canOverride="true">
     <columns>
         <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="enddate"/>
         <column name="category"/>
diff --git a/nirc_ehr/resources/queries/study/observation_order/Behavior Orders.qview.xml b/nirc_ehr/resources/queries/study/observation_order/Behavior Orders.qview.xml
index 60c6039c..343d9b8d 100644
--- a/nirc_ehr/resources/queries/study/observation_order/Behavior Orders.qview.xml	
+++ b/nirc_ehr/resources/queries/study/observation_order/Behavior Orders.qview.xml	
@@ -1,6 +1,9 @@
 <customView xmlns="http://labkey.org/data/xml/queryCustomView" canOverride="true">
     <columns>
         <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="enddate"/>
         <column name="category"/>
diff --git a/nirc_ehr/resources/queries/study/observation_order/Clinical Orders.qview.xml b/nirc_ehr/resources/queries/study/observation_order/Clinical Orders.qview.xml
index 03f570c7..5e1e7491 100644
--- a/nirc_ehr/resources/queries/study/observation_order/Clinical Orders.qview.xml	
+++ b/nirc_ehr/resources/queries/study/observation_order/Clinical Orders.qview.xml	
@@ -1,6 +1,9 @@
 <customView xmlns="http://labkey.org/data/xml/queryCustomView" canOverride="true">
     <columns>
         <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="enddate"/>
         <column name="category"/>
diff --git a/nirc_ehr/resources/queries/study/pairings/.qview.xml b/nirc_ehr/resources/queries/study/pairings/.qview.xml
index ad348ca7..26a87312 100644
--- a/nirc_ehr/resources/queries/study/pairings/.qview.xml
+++ b/nirc_ehr/resources/queries/study/pairings/.qview.xml
@@ -5,6 +5,9 @@
     <columns>
         <column name="updatePairing"/>
         <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="enddate"/>
         <column name="pairid"/>
diff --git a/nirc_ehr/resources/queries/study/physicalExam/.qview.xml b/nirc_ehr/resources/queries/study/physicalExam/.qview.xml
index dcb71d63..caf3fb01 100644
--- a/nirc_ehr/resources/queries/study/physicalExam/.qview.xml
+++ b/nirc_ehr/resources/queries/study/physicalExam/.qview.xml
@@ -4,6 +4,9 @@
     </sorts>
     <columns>
         <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="exam"/>
         <column name="result"/>
diff --git a/nirc_ehr/resources/queries/study/prc/.qview.xml b/nirc_ehr/resources/queries/study/prc/.qview.xml
index 15443a0f..f5ed643f 100644
--- a/nirc_ehr/resources/queries/study/prc/.qview.xml
+++ b/nirc_ehr/resources/queries/study/prc/.qview.xml
@@ -4,6 +4,9 @@
     </sorts>
     <columns>
         <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="procedure"/>
         <column name="remark"/>
diff --git a/nirc_ehr/resources/queries/study/prc_order/.qview.xml b/nirc_ehr/resources/queries/study/prc_order/.qview.xml
index 5540d87e..b9de6c16 100644
--- a/nirc_ehr/resources/queries/study/prc_order/.qview.xml
+++ b/nirc_ehr/resources/queries/study/prc_order/.qview.xml
@@ -1,8 +1,6 @@
 <customView xmlns="http://labkey.org/data/xml/queryCustomView" canOverride="true">
     <sorts>
         <sort column="date" descending="true"/>
-        <sort column="Id/curLocation/room"/>
-        <sort column="Id/curLocation/cage"/>
     </sorts>
     <columns>
         <column name="Id"/>
diff --git a/nirc_ehr/resources/queries/study/prc_order_report/.qview.xml b/nirc_ehr/resources/queries/study/prc_order_report/.qview.xml
index d0d6e1ef..62d20f0d 100644
--- a/nirc_ehr/resources/queries/study/prc_order_report/.qview.xml
+++ b/nirc_ehr/resources/queries/study/prc_order_report/.qview.xml
@@ -1,13 +1,11 @@
 <customView xmlns="http://labkey.org/data/xml/queryCustomView" canOverride="true">
     <sorts>
         <sort column="date" descending="true"/>
-        <sort column="Id/curLocation/room"/>
-        <sort column="Id/curLocation/cage"/>
     </sorts>
     <columns>
         <column name="Id"/>
         <column name="Id/Demographics/species"/>
-        <column name="Id/curLocation/room"/>
+        <column name="Id/curLocation/room/floor/building"/>
         <column name="Id/curLocation/cage"/>
         <column name="date"/>
         <column name="procedure"/>
diff --git a/nirc_ehr/resources/queries/study/treatmentSchedule/.qview.xml b/nirc_ehr/resources/queries/study/treatmentSchedule/.qview.xml
index a3312c3b..4c57f0bf 100644
--- a/nirc_ehr/resources/queries/study/treatmentSchedule/.qview.xml
+++ b/nirc_ehr/resources/queries/study/treatmentSchedule/.qview.xml
@@ -25,7 +25,4 @@
         <sort column="Id/curLocation/room/floor/building"/>
         <sort column="Id/curLocation/cage"/>
     </sorts>
-    <filters>
-        <filter column="calculated_status" operator="eq" value="Alive"/>
-    </filters>
 </customView>
\ No newline at end of file
diff --git a/nirc_ehr/resources/queries/study/treatmentSchedule/Area 11.qview.xml b/nirc_ehr/resources/queries/study/treatmentSchedule/Area 11.qview.xml
index 7e382716..ffd2a51c 100644
--- a/nirc_ehr/resources/queries/study/treatmentSchedule/Area 11.qview.xml	
+++ b/nirc_ehr/resources/queries/study/treatmentSchedule/Area 11.qview.xml	
@@ -25,7 +25,6 @@
         <sort column="Id/curLocation/cage"/>
     </sorts>
     <filters>
-        <filter column="calculated_status" operator="eq" value="Alive"/>
-        <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>
\ No newline at end of file
diff --git a/nirc_ehr/resources/queries/study/treatmentSchedule/Area 51.qview.xml b/nirc_ehr/resources/queries/study/treatmentSchedule/Area 51.qview.xml
index e360b172..af198fab 100644
--- a/nirc_ehr/resources/queries/study/treatmentSchedule/Area 51.qview.xml	
+++ b/nirc_ehr/resources/queries/study/treatmentSchedule/Area 51.qview.xml	
@@ -25,7 +25,6 @@
         <sort column="Id/curLocation/cage"/>
     </sorts>
     <filters>
-        <filter column="calculated_status" operator="eq" value="Alive"/>
-        <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>
\ No newline at end of file
diff --git a/nirc_ehr/resources/queries/study/treatmentSchedule/Building 10.qview.xml b/nirc_ehr/resources/queries/study/treatmentSchedule/Building 10.qview.xml
index 84960163..6ad2225c 100644
--- a/nirc_ehr/resources/queries/study/treatmentSchedule/Building 10.qview.xml	
+++ b/nirc_ehr/resources/queries/study/treatmentSchedule/Building 10.qview.xml	
@@ -25,7 +25,6 @@
         <sort column="Id/curLocation/cage"/>
     </sorts>
     <filters>
-        <filter column="calculated_status" operator="eq" value="Alive"/>
-        <filter column="Id/curLocation/room/floor/building" operator="eq" value="Building 10"/>
+        <filter column="Id/curLocation/room/floor/building/Description" operator="eq" value="Building 10"/>
     </filters>
 </customView>
\ No newline at end of file
diff --git a/nirc_ehr/resources/queries/study/treatmentSchedule/Building 10C.qview.xml b/nirc_ehr/resources/queries/study/treatmentSchedule/Building 10C.qview.xml
index 8f2f4607..3c284c85 100644
--- a/nirc_ehr/resources/queries/study/treatmentSchedule/Building 10C.qview.xml	
+++ b/nirc_ehr/resources/queries/study/treatmentSchedule/Building 10C.qview.xml	
@@ -25,7 +25,6 @@
         <sort column="Id/curLocation/cage"/>
     </sorts>
     <filters>
-        <filter column="calculated_status" operator="eq" value="Alive"/>
-        <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>
\ No newline at end of file
diff --git a/nirc_ehr/resources/queries/study/treatmentSchedule/Building 27.qview.xml b/nirc_ehr/resources/queries/study/treatmentSchedule/Building 27.qview.xml
index f6538ff9..1c63b9e9 100644
--- a/nirc_ehr/resources/queries/study/treatmentSchedule/Building 27.qview.xml	
+++ b/nirc_ehr/resources/queries/study/treatmentSchedule/Building 27.qview.xml	
@@ -25,7 +25,6 @@
         <sort column="Id/curLocation/cage"/>
     </sorts>
     <filters>
-        <filter column="calculated_status" operator="eq" value="Alive"/>
-        <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>
\ No newline at end of file
diff --git a/nirc_ehr/resources/queries/study/treatmentSchedule/Building 28.qview.xml b/nirc_ehr/resources/queries/study/treatmentSchedule/Building 28.qview.xml
index ce9f27ad..71626c2d 100644
--- a/nirc_ehr/resources/queries/study/treatmentSchedule/Building 28.qview.xml	
+++ b/nirc_ehr/resources/queries/study/treatmentSchedule/Building 28.qview.xml	
@@ -25,7 +25,6 @@
         <sort column="Id/curLocation/cage"/>
     </sorts>
     <filters>
-        <filter column="calculated_status" operator="eq" value="Alive"/>
-        <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>
\ No newline at end of file
diff --git a/nirc_ehr/resources/queries/study/treatmentSchedule/Building 29.qview.xml b/nirc_ehr/resources/queries/study/treatmentSchedule/Building 29.qview.xml
index 04a00f4e..51b805f2 100644
--- a/nirc_ehr/resources/queries/study/treatmentSchedule/Building 29.qview.xml	
+++ b/nirc_ehr/resources/queries/study/treatmentSchedule/Building 29.qview.xml	
@@ -25,7 +25,6 @@
         <sort column="Id/curLocation/cage"/>
     </sorts>
     <filters>
-        <filter column="calculated_status" operator="eq" value="Alive"/>
-        <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>
\ No newline at end of file
diff --git a/nirc_ehr/resources/queries/study/treatmentSchedule/Building 30.qview.xml b/nirc_ehr/resources/queries/study/treatmentSchedule/Building 30.qview.xml
index a8dd24a4..b60a8d8b 100644
--- a/nirc_ehr/resources/queries/study/treatmentSchedule/Building 30.qview.xml	
+++ b/nirc_ehr/resources/queries/study/treatmentSchedule/Building 30.qview.xml	
@@ -25,7 +25,6 @@
         <sort column="Id/curLocation/cage"/>
     </sorts>
     <filters>
-        <filter column="calculated_status" operator="eq" value="Alive"/>
-        <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>
\ No newline at end of file
diff --git a/nirc_ehr/resources/queries/study/treatmentSchedule/Building 31.qview.xml b/nirc_ehr/resources/queries/study/treatmentSchedule/Building 31.qview.xml
index fc07c78c..5600c8c3 100644
--- a/nirc_ehr/resources/queries/study/treatmentSchedule/Building 31.qview.xml	
+++ b/nirc_ehr/resources/queries/study/treatmentSchedule/Building 31.qview.xml	
@@ -25,7 +25,6 @@
         <sort column="Id/curLocation/cage"/>
     </sorts>
     <filters>
-        <filter column="calculated_status" operator="eq" value="Alive"/>
-        <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>
\ No newline at end of file
diff --git a/nirc_ehr/resources/queries/study/treatmentSchedule/Building 31C.qview.xml b/nirc_ehr/resources/queries/study/treatmentSchedule/Building 31C.qview.xml
index e7a3550b..d8a6f0ec 100644
--- a/nirc_ehr/resources/queries/study/treatmentSchedule/Building 31C.qview.xml	
+++ b/nirc_ehr/resources/queries/study/treatmentSchedule/Building 31C.qview.xml	
@@ -25,7 +25,6 @@
         <sort column="Id/curLocation/cage"/>
     </sorts>
     <filters>
-        <filter column="calculated_status" operator="eq" value="Alive"/>
-        <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>
\ No newline at end of file
diff --git a/nirc_ehr/resources/queries/study/treatmentSchedule/Building 31D.qview.xml b/nirc_ehr/resources/queries/study/treatmentSchedule/Building 31D.qview.xml
index fd3ea709..b323a42c 100644
--- a/nirc_ehr/resources/queries/study/treatmentSchedule/Building 31D.qview.xml	
+++ b/nirc_ehr/resources/queries/study/treatmentSchedule/Building 31D.qview.xml	
@@ -25,7 +25,6 @@
         <sort column="Id/curLocation/cage"/>
     </sorts>
     <filters>
-        <filter column="calculated_status" operator="eq" value="Alive"/>
-        <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>
\ No newline at end of file
diff --git a/nirc_ehr/resources/queries/study/treatmentSchedule/Building 32.qview.xml b/nirc_ehr/resources/queries/study/treatmentSchedule/Building 32.qview.xml
index 4b5072a1..45336bf8 100644
--- a/nirc_ehr/resources/queries/study/treatmentSchedule/Building 32.qview.xml	
+++ b/nirc_ehr/resources/queries/study/treatmentSchedule/Building 32.qview.xml	
@@ -25,7 +25,6 @@
         <sort column="Id/curLocation/cage"/>
     </sorts>
     <filters>
-        <filter column="calculated_status" operator="eq" value="Alive"/>
-        <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>
\ No newline at end of file
diff --git a/nirc_ehr/resources/queries/study/treatmentSchedule/Building 34.qview.xml b/nirc_ehr/resources/queries/study/treatmentSchedule/Building 34.qview.xml
index e90fa70d..0a36b29e 100644
--- a/nirc_ehr/resources/queries/study/treatmentSchedule/Building 34.qview.xml	
+++ b/nirc_ehr/resources/queries/study/treatmentSchedule/Building 34.qview.xml	
@@ -25,7 +25,6 @@
         <sort column="Id/curLocation/cage"/>
     </sorts>
     <filters>
-        <filter column="calculated_status" operator="eq" value="Alive"/>
-        <filter column="Id/curLocation/room/floor/building" operator="eq" value="Building 34"/>
+        <filter column="Id/curLocation/room/floor/building/Description" operator="eq" value="Building 34"/>
     </filters>
 </customView>
\ No newline at end of file
diff --git a/nirc_ehr/resources/queries/study/treatmentSchedule/Building 37.qview.xml b/nirc_ehr/resources/queries/study/treatmentSchedule/Building 37.qview.xml
index 569c8522..3598574b 100644
--- a/nirc_ehr/resources/queries/study/treatmentSchedule/Building 37.qview.xml	
+++ b/nirc_ehr/resources/queries/study/treatmentSchedule/Building 37.qview.xml	
@@ -25,7 +25,6 @@
         <sort column="Id/curLocation/cage"/>
     </sorts>
     <filters>
-        <filter column="calculated_status" operator="eq" value="Alive"/>
-        <filter column="Id/curLocation/room/floor/building" operator="eq" value="Building 37"/>
+        <filter column="Id/curLocation/room/floor/building/Description" operator="eq" value="Building 37"/>
     </filters>
 </customView>
\ No newline at end of file
diff --git a/nirc_ehr/resources/queries/study/treatmentSchedule/Building 41.qview.xml b/nirc_ehr/resources/queries/study/treatmentSchedule/Building 41.qview.xml
index fa1ead2f..88a27919 100644
--- a/nirc_ehr/resources/queries/study/treatmentSchedule/Building 41.qview.xml	
+++ b/nirc_ehr/resources/queries/study/treatmentSchedule/Building 41.qview.xml	
@@ -25,7 +25,6 @@
         <sort column="Id/curLocation/cage"/>
     </sorts>
     <filters>
-        <filter column="calculated_status" operator="eq" value="Alive"/>
-        <filter column="Id/curLocation/room/floor/building" operator="eq" value="Building 41"/>
+        <filter column="Id/curLocation/room/floor/building/Description" operator="eq" value="Building 41"/>
     </filters>
 </customView>
\ No newline at end of file
diff --git a/nirc_ehr/resources/queries/study/treatmentSchedule/Building 42.qview.xml b/nirc_ehr/resources/queries/study/treatmentSchedule/Building 42.qview.xml
index 6dbde175..53c001b7 100644
--- a/nirc_ehr/resources/queries/study/treatmentSchedule/Building 42.qview.xml	
+++ b/nirc_ehr/resources/queries/study/treatmentSchedule/Building 42.qview.xml	
@@ -25,7 +25,6 @@
         <sort column="Id/curLocation/cage"/>
     </sorts>
     <filters>
-        <filter column="calculated_status" operator="eq" value="Alive"/>
-        <filter column="Id/curLocation/room/floor/building" operator="eq" value="Building 42"/>
+        <filter column="Id/curLocation/room/floor/building/Description" operator="eq" value="Building 42"/>
     </filters>
 </customView>
\ No newline at end of file
diff --git a/nirc_ehr/resources/queries/study/treatmentSchedule/Building 43.qview.xml b/nirc_ehr/resources/queries/study/treatmentSchedule/Building 43.qview.xml
index 0dbb8640..159dcd35 100644
--- a/nirc_ehr/resources/queries/study/treatmentSchedule/Building 43.qview.xml	
+++ b/nirc_ehr/resources/queries/study/treatmentSchedule/Building 43.qview.xml	
@@ -25,7 +25,6 @@
         <sort column="Id/curLocation/cage"/>
     </sorts>
     <filters>
-        <filter column="calculated_status" operator="eq" value="Alive"/>
-        <filter column="Id/curLocation/room/floor/building" operator="eq" value="Building 43"/>
+        <filter column="Id/curLocation/room/floor/building/Description" operator="eq" value="Building 43"/>
     </filters>
 </customView>
\ No newline at end of file
diff --git a/nirc_ehr/resources/queries/study/treatmentSchedule/Building 44.qview.xml b/nirc_ehr/resources/queries/study/treatmentSchedule/Building 44.qview.xml
index 0214545f..92044fa3 100644
--- a/nirc_ehr/resources/queries/study/treatmentSchedule/Building 44.qview.xml	
+++ b/nirc_ehr/resources/queries/study/treatmentSchedule/Building 44.qview.xml	
@@ -25,7 +25,6 @@
         <sort column="Id/curLocation/cage"/>
     </sorts>
     <filters>
-        <filter column="calculated_status" operator="eq" value="Alive"/>
-        <filter column="Id/curLocation/room/floor/building" operator="eq" value="Building 44"/>
+        <filter column="Id/curLocation/room/floor/building/Description" operator="eq" value="Building 44"/>
     </filters>
 </customView>
\ No newline at end of file
diff --git a/nirc_ehr/resources/queries/study/treatmentSchedule/Building 45.qview.xml b/nirc_ehr/resources/queries/study/treatmentSchedule/Building 45.qview.xml
index a7afb757..3b4bdf46 100644
--- a/nirc_ehr/resources/queries/study/treatmentSchedule/Building 45.qview.xml	
+++ b/nirc_ehr/resources/queries/study/treatmentSchedule/Building 45.qview.xml	
@@ -25,7 +25,6 @@
         <sort column="Id/curLocation/cage"/>
     </sorts>
     <filters>
-        <filter column="calculated_status" operator="eq" value="Alive"/>
-        <filter column="Id/curLocation/room/floor/building" operator="eq" value="Building 45"/>
+        <filter column="Id/curLocation/room/floor/building/Description" operator="eq" value="Building 45"/>
     </filters>
 </customView>
\ No newline at end of file
diff --git a/nirc_ehr/resources/queries/study/treatmentSchedule/Building 46.qview.xml b/nirc_ehr/resources/queries/study/treatmentSchedule/Building 46.qview.xml
index 33be6c2d..ab88e996 100644
--- a/nirc_ehr/resources/queries/study/treatmentSchedule/Building 46.qview.xml	
+++ b/nirc_ehr/resources/queries/study/treatmentSchedule/Building 46.qview.xml	
@@ -25,7 +25,6 @@
         <sort column="Id/curLocation/cage"/>
     </sorts>
     <filters>
-        <filter column="calculated_status" operator="eq" value="Alive"/>
-        <filter column="Id/curLocation/room/floor/building" operator="eq" value="Building 46"/>
+        <filter column="Id/curLocation/room/floor/building/Description" operator="eq" value="Building 46"/>
     </filters>
 </customView>
\ No newline at end of file
diff --git a/nirc_ehr/resources/queries/study/treatmentSchedule/Building 50.qview.xml b/nirc_ehr/resources/queries/study/treatmentSchedule/Building 50.qview.xml
index e4816f74..696895c2 100644
--- a/nirc_ehr/resources/queries/study/treatmentSchedule/Building 50.qview.xml	
+++ b/nirc_ehr/resources/queries/study/treatmentSchedule/Building 50.qview.xml	
@@ -25,7 +25,6 @@
         <sort column="Id/curLocation/cage"/>
     </sorts>
     <filters>
-        <filter column="calculated_status" operator="eq" value="Alive"/>
-        <filter column="Id/curLocation/room/floor/building" operator="eq" value="Building 50"/>
+        <filter column="Id/curLocation/room/floor/building/Description" operator="eq" value="Building 50"/>
     </filters>
 </customView>
\ No newline at end of file
diff --git a/nirc_ehr/resources/queries/study/treatmentSchedule/Building 52.qview.xml b/nirc_ehr/resources/queries/study/treatmentSchedule/Building 52.qview.xml
index 37d665b1..dc6ad0ab 100644
--- a/nirc_ehr/resources/queries/study/treatmentSchedule/Building 52.qview.xml	
+++ b/nirc_ehr/resources/queries/study/treatmentSchedule/Building 52.qview.xml	
@@ -25,7 +25,6 @@
         <sort column="Id/curLocation/cage"/>
     </sorts>
     <filters>
-        <filter column="calculated_status" operator="eq" value="Alive"/>
-        <filter column="Id/curLocation/room/floor/building" operator="eq" value="Building 52"/>
+        <filter column="Id/curLocation/room/floor/building/Description" operator="eq" value="Building 52"/>
     </filters>
 </customView>
\ No newline at end of file
diff --git a/nirc_ehr/resources/queries/study/treatmentSchedule/Building 53.qview.xml b/nirc_ehr/resources/queries/study/treatmentSchedule/Building 53.qview.xml
index c7e54d65..73ca7b16 100644
--- a/nirc_ehr/resources/queries/study/treatmentSchedule/Building 53.qview.xml	
+++ b/nirc_ehr/resources/queries/study/treatmentSchedule/Building 53.qview.xml	
@@ -25,7 +25,6 @@
         <sort column="Id/curLocation/cage"/>
     </sorts>
     <filters>
-        <filter column="calculated_status" operator="eq" value="Alive"/>
-        <filter column="Id/curLocation/room/floor/building" operator="eq" value="Building 53"/>
+        <filter column="Id/curLocation/room/floor/building/Description" operator="eq" value="Building 53"/>
     </filters>
 </customView>
\ No newline at end of file
diff --git a/nirc_ehr/resources/queries/study/treatmentSchedule/Building 54A.qview.xml b/nirc_ehr/resources/queries/study/treatmentSchedule/Building 54A.qview.xml
index 1b1e5a3b..4943b373 100644
--- a/nirc_ehr/resources/queries/study/treatmentSchedule/Building 54A.qview.xml	
+++ b/nirc_ehr/resources/queries/study/treatmentSchedule/Building 54A.qview.xml	
@@ -25,7 +25,6 @@
         <sort column="Id/curLocation/cage"/>
     </sorts>
     <filters>
-        <filter column="calculated_status" operator="eq" value="Alive"/>
-        <filter column="Id/curLocation/room/floor/building" operator="eq" value="Building 54A"/>
+        <filter column="Id/curLocation/room/floor/building/Description" operator="eq" value="Building 54A"/>
     </filters>
 </customView>
\ No newline at end of file
diff --git a/nirc_ehr/resources/queries/study/treatmentSchedule/Building 54B.qview.xml b/nirc_ehr/resources/queries/study/treatmentSchedule/Building 54B.qview.xml
index 838b7dca..58ae6bd5 100644
--- a/nirc_ehr/resources/queries/study/treatmentSchedule/Building 54B.qview.xml	
+++ b/nirc_ehr/resources/queries/study/treatmentSchedule/Building 54B.qview.xml	
@@ -25,7 +25,6 @@
         <sort column="Id/curLocation/cage"/>
     </sorts>
     <filters>
-        <filter column="calculated_status" operator="eq" value="Alive"/>
-        <filter column="Id/curLocation/room/floor/building" operator="eq" value="Building 54B"/>
+        <filter column="Id/curLocation/room/floor/building/Description" operator="eq" value="Building 54B"/>
     </filters>
 </customView>
\ No newline at end of file
diff --git a/nirc_ehr/resources/queries/study/treatmentSchedule/Clinical Medications.qview.xml b/nirc_ehr/resources/queries/study/treatmentSchedule/Clinical Medications.qview.xml
index 9b9161ae..c6492ae8 100644
--- a/nirc_ehr/resources/queries/study/treatmentSchedule/Clinical Medications.qview.xml	
+++ b/nirc_ehr/resources/queries/study/treatmentSchedule/Clinical Medications.qview.xml	
@@ -1,8 +1,6 @@
 <customView xmlns="http://labkey.org/data/xml/queryCustomView">
     <sorts>
         <sort column="date"/>
-        <sort column="Id/curLocation/room"/>
-        <sort column="Id/curLocation/cage"/>
     </sorts>
     <filters>
         <filter column="calculated_status" operator="eq" value="Alive"/>
diff --git a/nirc_ehr/resources/queries/study/treatment_order/.qview.xml b/nirc_ehr/resources/queries/study/treatment_order/.qview.xml
index c4e3c2f3..27608aff 100644
--- a/nirc_ehr/resources/queries/study/treatment_order/.qview.xml
+++ b/nirc_ehr/resources/queries/study/treatment_order/.qview.xml
@@ -2,7 +2,7 @@
     <columns>
         <column name="Id"/>
         <column name="Id/Demographics/species"/>
-        <column name="Id/curLocation/room"/>
+        <column name="Id/curLocation/cage/room/floor/building"/>
         <column name="Id/curLocation/cage"/>
 
         <column name="date"/>
diff --git a/nirc_ehr/resources/queries/study/vitals/.qview.xml b/nirc_ehr/resources/queries/study/vitals/.qview.xml
index 84490249..f3b831c2 100644
--- a/nirc_ehr/resources/queries/study/vitals/.qview.xml
+++ b/nirc_ehr/resources/queries/study/vitals/.qview.xml
@@ -4,6 +4,9 @@
     </sorts>
     <columns>
         <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="bloodPressure"/>
         <column name="heartRate"/>

From ec01e10c45cee25872b6faf782e6e50c79076c65 Mon Sep 17 00:00:00 2001
From: Marty Pradere <martyp@labkey.com>
Date: Sun, 11 May 2025 21:20:06 -0700
Subject: [PATCH 2/4] pedigree - modified

---
 nirc_ehr/resources/queries/study/Pedigree.sql | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/nirc_ehr/resources/queries/study/Pedigree.sql b/nirc_ehr/resources/queries/study/Pedigree.sql
index 993d36ad..f4a74847 100644
--- a/nirc_ehr/resources/queries/study/Pedigree.sql
+++ b/nirc_ehr/resources/queries/study/Pedigree.sql
@@ -24,7 +24,8 @@ SELECT
     d.id.demographics.calculated_status as status_code,
     d.id.demographics.species.common_name as species,
     '' as Display,
-    'Demographics' as source
+    'Demographics' as source,
+    d.modified
 
 FROM study.demographics d
 WHERE d.Dam IS NOT NULL OR d.Sire IS NOT NULL

From e74df37a5cad1a21a250f826dea3f22e4acfe121 Mon Sep 17 00:00:00 2001
From: Marty Pradere <martyp@labkey.com>
Date: Sun, 11 May 2025 21:20:39 -0700
Subject: [PATCH 3/4] lab results - requires admin

---
 .../dataentry/form/NIRCChemistryImportFormType.java    | 10 ----------
 .../dataentry/form/NIRCSerologyImportFormType.java     | 10 ----------
 2 files changed, 20 deletions(-)

diff --git a/nirc_ehr/src/org/labkey/nirc_ehr/dataentry/form/NIRCChemistryImportFormType.java b/nirc_ehr/src/org/labkey/nirc_ehr/dataentry/form/NIRCChemistryImportFormType.java
index 2a826c53..b0428cc4 100644
--- a/nirc_ehr/src/org/labkey/nirc_ehr/dataentry/form/NIRCChemistryImportFormType.java
+++ b/nirc_ehr/src/org/labkey/nirc_ehr/dataentry/form/NIRCChemistryImportFormType.java
@@ -3,7 +3,6 @@
 import org.json.JSONObject;
 import org.labkey.api.ehr.dataentry.AbstractDataEntryForm;
 import org.labkey.api.ehr.dataentry.DataEntryFormContext;
-import org.labkey.api.ehr.security.EHRDataAdminPermission;
 import org.labkey.api.module.Module;
 import org.labkey.api.view.ActionURL;
 
@@ -30,13 +29,4 @@ public JSONObject toJSON(boolean includeFormElements)
 
         return json;
     }
-
-    @Override
-    protected boolean canInsert()
-    {
-        if (!getCtx().getContainer().hasPermission(getCtx().getUser(), EHRDataAdminPermission.class))
-            return false;
-
-        return super.canInsert();
-    }
 }
diff --git a/nirc_ehr/src/org/labkey/nirc_ehr/dataentry/form/NIRCSerologyImportFormType.java b/nirc_ehr/src/org/labkey/nirc_ehr/dataentry/form/NIRCSerologyImportFormType.java
index 47773c3f..29dad446 100644
--- a/nirc_ehr/src/org/labkey/nirc_ehr/dataentry/form/NIRCSerologyImportFormType.java
+++ b/nirc_ehr/src/org/labkey/nirc_ehr/dataentry/form/NIRCSerologyImportFormType.java
@@ -3,7 +3,6 @@
 import org.json.JSONObject;
 import org.labkey.api.ehr.dataentry.AbstractDataEntryForm;
 import org.labkey.api.ehr.dataentry.DataEntryFormContext;
-import org.labkey.api.ehr.security.EHRDataAdminPermission;
 import org.labkey.api.module.Module;
 import org.labkey.api.view.ActionURL;
 
@@ -30,13 +29,4 @@ public JSONObject toJSON(boolean includeFormElements)
 
         return json;
     }
-
-    @Override
-    protected boolean canInsert()
-    {
-        if (!getCtx().getContainer().hasPermission(getCtx().getUser(), EHRDataAdminPermission.class))
-            return false;
-
-        return super.canInsert();
-    }
 }

From 6964c60b1c17ccaec9c4f1b2f23992a0c299c02b Mon Sep 17 00:00:00 2001
From: Marty Pradere <martyp@labkey.com>
Date: Sun, 11 May 2025 21:21:07 -0700
Subject: [PATCH 4/4] Set up protocol/project perms

---
 .../nirc_ehr/dataentry/form/NIRCProjectFormType.java       | 7 +++++++
 .../nirc_ehr/dataentry/form/NIRCProtocolFormType.java      | 7 +++++++
 2 files changed, 14 insertions(+)

diff --git a/nirc_ehr/src/org/labkey/nirc_ehr/dataentry/form/NIRCProjectFormType.java b/nirc_ehr/src/org/labkey/nirc_ehr/dataentry/form/NIRCProjectFormType.java
index 97ba09ca..35f064e9 100644
--- a/nirc_ehr/src/org/labkey/nirc_ehr/dataentry/form/NIRCProjectFormType.java
+++ b/nirc_ehr/src/org/labkey/nirc_ehr/dataentry/form/NIRCProjectFormType.java
@@ -2,6 +2,7 @@
 
 import org.labkey.api.ehr.dataentry.DataEntryFormContext;
 import org.labkey.api.ehr.dataentry.forms.AdminLinksFormType;
+import org.labkey.api.ehr.security.EHRProtocolEditPermission;
 import org.labkey.api.module.Module;
 import org.labkey.api.view.ActionURL;
 
@@ -23,4 +24,10 @@ protected ActionURL dataEntryLink()
         url.addParameter("showImport", "true");
         return url;
     }
+
+    @Override
+    public boolean isAvailable()
+    {
+        return (super.isAvailable() || getCtx().getContainer().hasPermission(getCtx().getUser(), EHRProtocolEditPermission.class));
+    }
 }
diff --git a/nirc_ehr/src/org/labkey/nirc_ehr/dataentry/form/NIRCProtocolFormType.java b/nirc_ehr/src/org/labkey/nirc_ehr/dataentry/form/NIRCProtocolFormType.java
index c3e21171..25f10b3e 100644
--- a/nirc_ehr/src/org/labkey/nirc_ehr/dataentry/form/NIRCProtocolFormType.java
+++ b/nirc_ehr/src/org/labkey/nirc_ehr/dataentry/form/NIRCProtocolFormType.java
@@ -2,6 +2,7 @@
 
 import org.labkey.api.ehr.dataentry.DataEntryFormContext;
 import org.labkey.api.ehr.dataentry.forms.AdminLinksFormType;
+import org.labkey.api.ehr.security.EHRProtocolEditPermission;
 import org.labkey.api.module.Module;
 import org.labkey.api.view.ActionURL;
 
@@ -23,4 +24,10 @@ protected ActionURL dataEntryLink()
         url.addParameter("showImport", "true");
         return url;
     }
+
+    @Override
+    public boolean isAvailable()
+    {
+        return (super.isAvailable() || getCtx().getContainer().hasPermission(getCtx().getUser(), EHRProtocolEditPermission.class));
+    }
 }