From 394d2636cecc15dad2e1b9e2664aed43781d0ac3 Mon Sep 17 00:00:00 2001
From: Marty Pradere <martyp@labkey.com>
Date: Wed, 12 Nov 2025 12:34:57 -0800
Subject: [PATCH 1/2] fix dest name

---
 nirc_ehr/resources/queries/dbo/q_departure.sql | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/nirc_ehr/resources/queries/dbo/q_departure.sql b/nirc_ehr/resources/queries/dbo/q_departure.sql
index 2acc68f5..2a0346aa 100644
--- a/nirc_ehr/resources/queries/dbo/q_departure.sql
+++ b/nirc_ehr/resources/queries/dbo/q_departure.sql
@@ -10,7 +10,7 @@ FROM
 (
    SELECT MAX(anmEvt.ANIMAL_EVENT_ID)                                                  AS objectid,
           anm.ANIMAL_ID_NUMBER                                                         AS Id,
-          anm.ANIMAL_DISPOSITION_ID                                                    AS destination,
+          src.NAME                                                                     AS destination,
           CAST(anmEvt.EVENT_DATETIME AS TIMESTAMP)                                     AS eventDate,
           evt.NAME                                                                     AS description,
           MAX(anmEvt.STAFF_ID)                                                         AS staff,
@@ -19,10 +19,12 @@ FROM
             LEFT JOIN ANIMAL anm ON anmEvt.ANIMAL_ID = anm.ANIMAL_ID
             LEFT JOIN EVENT evt ON anmEvt.EVENT_ID = evt.EVENT_ID
             LEFT JOIN q_modified_event adt ON anmEvt.ANIMAL_EVENT_ID = adt.event_id
+            LEFT JOIN ANIMAL_DISPOSITION src ON src.ID = anm.ANIMAL_DISPOSITION_ID
    WHERE anmEvt.EVENT_ID IN (SELECT EVENT_ID FROM EVENT WHERE NAME LIKE 'Lab Transfer To%' OR NAME LIKE 'Lab Transfer to%')
    GROUP BY anm.ANIMAL_ID_NUMBER,
             anm.ANIMAL_DISPOSITION_ID,
             anmEvt.EVENT_DATETIME,
-            evt.NAME
+            evt.NAME,
+            src.NAME
 ) i
 LEFT JOIN STAFF st ON i.staff = st.STAFF_ID

From 3ccf266d09ec286b2dfed40ea065c4cf1b5ba4d9 Mon Sep 17 00:00:00 2001
From: Marty Pradere <martyp@labkey.com>
Date: Thu, 13 Nov 2025 14:46:33 -0800
Subject: [PATCH 2/2] Add excluded Ids

---
 .../resources/queries/dbo/q_departure.sql     | 194 ++++++++++++++++++
 1 file changed, 194 insertions(+)

diff --git a/nirc_ehr/resources/queries/dbo/q_departure.sql b/nirc_ehr/resources/queries/dbo/q_departure.sql
index 2a0346aa..c76a3043 100644
--- a/nirc_ehr/resources/queries/dbo/q_departure.sql
+++ b/nirc_ehr/resources/queries/dbo/q_departure.sql
@@ -28,3 +28,197 @@ FROM
             src.NAME
 ) i
 LEFT JOIN STAFF st ON i.staff = st.STAFF_ID
+WHERE i.Id NOT IN
+    (
+     '07-162',
+     '11C044',
+     '13A31451',
+     '16-4234',
+     '170239',
+     '18-4048',
+     '180176',
+     '20-4049',
+     '20-4069',
+     '20-4073',
+     '20-4079',
+     'A10L018',
+     'A10L131',
+     'A10N037',
+     'A10N096',
+     'A10N127',
+     'A10R025',
+     'A11L055',
+     'A11N119',
+     'A11N123',
+     'A11R024',
+     'A12L162',
+     'A13N113',
+     'A13N130',
+     'A13N159',
+     'A14L023',
+     'A14L078',
+     'A14L114',
+     'A15N026',
+     'A15N090',
+     'A15N118',
+     'A15N137',
+     'A15N152',
+     'A16L053',
+     'A16N009',
+     'A16N057',
+     'A16N106',
+     'A16N154',
+     'A17L125',
+     'A17L145',
+     'A18M014',
+     'A18U011',
+     'A19U013',
+     'A1K036',
+     'A20U002',
+     'A20U003',
+     'A20U006',
+     'A20U008',
+     'A21U004',
+     'A21U005',
+     'A21U006',
+     'A21U007',
+     'A25C058',
+     'A25C059',
+     'A25M103',
+     'A25N094',
+     'A25U031',
+     'A2L070',
+     'A2M062',
+     'A3A005',
+     'A3A021',
+     'A3M058',
+     'A4S005',
+     'A5A006',
+     'A5A008',
+     'A5A010',
+     'A5M022',
+     'A5M044',
+     'A6A003',
+     'A6A004',
+     'A6A012',
+     'A6E081',
+     'A6M005',
+     'A6M037',
+     'A6M052',
+     'A7N086',
+     'A7N137',
+     'A7N156',
+     'A8A007',
+     'A8R029',
+     'A8R032',
+     'A9A002',
+     'A9A011',
+     'AK340I',
+     'AM535I',
+     'AM541J',
+     'AR709D',
+     'AT667F',
+     'BF702G',
+     'BF737H',
+     'BY381J',
+     'CKE036',
+     'CKG004',
+     'CKG005',
+     'CKG016',
+     'CKG026',
+     'CKG041',
+     'CKG047',
+     'CKG080',
+     'CKH026',
+     'CKH051',
+     'CKH078',
+     'CKH084',
+     'CKI003',
+     'CKI038',
+     'CKI080',
+     'CR31',
+     'CR45',
+     'CT73',
+     'CT74',
+     'DCGM',
+     'DE2E',
+     'G97003',
+     'GB75B',
+     'JR29I',
+     'N11801241',
+     'N4544916',
+     'N4591982',
+     'N88411011',
+     'N9961471',
+     'N9961472',
+     'O10831233',
+     'O10831242',
+     'O10831363',
+     'O13131543',
+     'O1344845',
+     'O1344846',
+     'O159341211',
+     'O16253113',
+     'O16253210',
+     'O16451432',
+     'O16651162',
+     'O16651163',
+     'O1669712',
+     'O1669852',
+     'O17202122',
+     'O17202123',
+     'O17312681',
+     'O1842672',
+     'O18732525',
+     'O18732533',
+     'O19612254',
+     'O19612316',
+     'O20121233',
+     'O2071438',
+     'O20813341',
+     'O20813451',
+     'O20813453',
+     'O21162181',
+     'O22082333',
+     'O22517112',
+     'O2301711',
+     'O2301734',
+     'O2307197',
+     'O2418381',
+     'O2659166',
+     'O270573',
+     'O2705731',
+     'O2707213',
+     'O2733136',
+     'O2899141',
+     'O3087125',
+     'O311019',
+     'O3345221',
+     'O4001210',
+     'O400129',
+     'O5322112',
+     'O644815',
+     'O8253762',
+     'O8284861',
+     'O8456105',
+     'O8711107',
+     'O87117111',
+     'O8711871',
+     'O87641',
+     'O88533',
+     'O88803',
+     'O89142',
+     'O89152',
+     'O915089',
+     'O9184343',
+     'O9184616',
+     'O92861',
+     'O94691',
+     'RE3I',
+     'S111221',
+     'SZ218A',
+     'U564',
+     'U682',
+     'VL111C',
+     'YS94F'
+    )