From ffa19f6eca24526643c2fb166bf4e0b80e9a282e Mon Sep 17 00:00:00 2001
From: Marty Pradere <martyp@labkey.com>
Date: Sat, 23 Aug 2025 13:06:15 -0700
Subject: [PATCH 1/3] invalid col name

---
 .../nirc_ehr/history/NIRCEndTreatmentOrderDataSource.java       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nirc_ehr/src/org/labkey/nirc_ehr/history/NIRCEndTreatmentOrderDataSource.java b/nirc_ehr/src/org/labkey/nirc_ehr/history/NIRCEndTreatmentOrderDataSource.java
index 1897871f..1e4d9e58 100644
--- a/nirc_ehr/src/org/labkey/nirc_ehr/history/NIRCEndTreatmentOrderDataSource.java
+++ b/nirc_ehr/src/org/labkey/nirc_ehr/history/NIRCEndTreatmentOrderDataSource.java
@@ -43,7 +43,7 @@ else if (amountExists)
         }
         else if (volumeExists)
         {
-            sb.append(safeAppend(rs, "Volume", rs.getString("volume") + " " + rs.getString("volume_units")));
+            sb.append(safeAppend(rs, "Volume", rs.getString("volume") + " " + rs.getString("vol_units")));
         }
         sb.append(safeAppend(rs, "End Ordered By", "orderedby/displayName"));
 

From c2a3f15cdfe4ea3095b90693785d944a71d3c1fd Mon Sep 17 00:00:00 2001
From: Marty Pradere <martyp@labkey.com>
Date: Sat, 23 Aug 2025 13:06:25 -0700
Subject: [PATCH 2/3] update view

---
 nirc_ehr/resources/queries/study/obs/.qview.xml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/nirc_ehr/resources/queries/study/obs/.qview.xml b/nirc_ehr/resources/queries/study/obs/.qview.xml
index 46e1dc2e..61b1fb8e 100644
--- a/nirc_ehr/resources/queries/study/obs/.qview.xml
+++ b/nirc_ehr/resources/queries/study/obs/.qview.xml
@@ -12,7 +12,4 @@
         <column name="diagnosis"/>
         <column name="remark"/>
     </columns>
-    <filters>
-        <filter column="category" operator="eq" value="Clinical"/>
-    </filters>
 </customView>
\ No newline at end of file

From c8f17cbc62f59c014da735bd0139629dfd3167b0 Mon Sep 17 00:00:00 2001
From: Marty Pradere <martyp@labkey.com>
Date: Mon, 25 Aug 2025 09:57:21 -0700
Subject: [PATCH 3/3] obs dataset removed

---
 nirc_ehr/resources/queries/study/obs/.qview.xml | 15 ---------------
 1 file changed, 15 deletions(-)
 delete mode 100644 nirc_ehr/resources/queries/study/obs/.qview.xml

diff --git a/nirc_ehr/resources/queries/study/obs/.qview.xml b/nirc_ehr/resources/queries/study/obs/.qview.xml
deleted file mode 100644
index 61b1fb8e..00000000
--- a/nirc_ehr/resources/queries/study/obs/.qview.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<customView xmlns="http://labkey.org/data/xml/queryCustomView" canOverride="true">
-    <sorts>
-        <sort column="date" descending="true"/>
-    </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"/>
-        <column name="remark"/>
-    </columns>
-</customView>
\ No newline at end of file