Skip to content

Commit 6b46cb9

Browse files
labkey-teamcitylabkey-teamcity
committed
Merge 25.7 to 25.11
2 parents 7e1ee0c + 9aa1174 commit 6b46cb9

1 file changed

Lines changed: 198 additions & 2 deletions

File tree

‎nirc_ehr/resources/queries/dbo/q_departure.sql‎

Lines changed: 198 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ FROM
1010
(
1111
SELECT MAX(anmEvt.ANIMAL_EVENT_ID) AS objectid,
1212
anm.ANIMAL_ID_NUMBER AS Id,
13-
anm.ANIMAL_DISPOSITION_ID AS destination,
13+
src.NAME AS destination,
1414
CAST(anmEvt.EVENT_DATETIME AS TIMESTAMP) AS eventDate,
1515
evt.NAME AS description,
1616
MAX(anmEvt.STAFF_ID) AS staff,
@@ -19,10 +19,206 @@ FROM
1919
LEFT JOIN ANIMAL anm ON anmEvt.ANIMAL_ID = anm.ANIMAL_ID
2020
LEFT JOIN EVENT evt ON anmEvt.EVENT_ID = evt.EVENT_ID
2121
LEFT JOIN q_modified_event adt ON anmEvt.ANIMAL_EVENT_ID = adt.event_id
22+
LEFT JOIN ANIMAL_DISPOSITION src ON src.ID = anm.ANIMAL_DISPOSITION_ID
2223
WHERE anmEvt.EVENT_ID IN (SELECT EVENT_ID FROM EVENT WHERE NAME LIKE 'Lab Transfer To%' OR NAME LIKE 'Lab Transfer to%')
2324
GROUP BY anm.ANIMAL_ID_NUMBER,
2425
anm.ANIMAL_DISPOSITION_ID,
2526
anmEvt.EVENT_DATETIME,
26-
evt.NAME
27+
evt.NAME,
28+
src.NAME
2729
) i
2830
LEFT JOIN STAFF st ON i.staff = st.STAFF_ID
31+
WHERE i.Id NOT IN
32+
(
33+
'07-162',
34+
'11C044',
35+
'13A31451',
36+
'16-4234',
37+
'170239',
38+
'18-4048',
39+
'180176',
40+
'20-4049',
41+
'20-4069',
42+
'20-4073',
43+
'20-4079',
44+
'A10L018',
45+
'A10L131',
46+
'A10N037',
47+
'A10N096',
48+
'A10N127',
49+
'A10R025',
50+
'A11L055',
51+
'A11N119',
52+
'A11N123',
53+
'A11R024',
54+
'A12L162',
55+
'A13N113',
56+
'A13N130',
57+
'A13N159',
58+
'A14L023',
59+
'A14L078',
60+
'A14L114',
61+
'A15N026',
62+
'A15N090',
63+
'A15N118',
64+
'A15N137',
65+
'A15N152',
66+
'A16L053',
67+
'A16N009',
68+
'A16N057',
69+
'A16N106',
70+
'A16N154',
71+
'A17L125',
72+
'A17L145',
73+
'A18M014',
74+
'A18U011',
75+
'A19U013',
76+
'A1K036',
77+
'A20U002',
78+
'A20U003',
79+
'A20U006',
80+
'A20U008',
81+
'A21U004',
82+
'A21U005',
83+
'A21U006',
84+
'A21U007',
85+
'A25C058',
86+
'A25C059',
87+
'A25M103',
88+
'A25N094',
89+
'A25U031',
90+
'A2L070',
91+
'A2M062',
92+
'A3A005',
93+
'A3A021',
94+
'A3M058',
95+
'A4S005',
96+
'A5A006',
97+
'A5A008',
98+
'A5A010',
99+
'A5M022',
100+
'A5M044',
101+
'A6A003',
102+
'A6A004',
103+
'A6A012',
104+
'A6E081',
105+
'A6M005',
106+
'A6M037',
107+
'A6M052',
108+
'A7N086',
109+
'A7N137',
110+
'A7N156',
111+
'A8A007',
112+
'A8R029',
113+
'A8R032',
114+
'A9A002',
115+
'A9A011',
116+
'AK340I',
117+
'AM535I',
118+
'AM541J',
119+
'AR709D',
120+
'AT667F',
121+
'BF702G',
122+
'BF737H',
123+
'BY381J',
124+
'CKE036',
125+
'CKG004',
126+
'CKG005',
127+
'CKG016',
128+
'CKG026',
129+
'CKG041',
130+
'CKG047',
131+
'CKG080',
132+
'CKH026',
133+
'CKH051',
134+
'CKH078',
135+
'CKH084',
136+
'CKI003',
137+
'CKI038',
138+
'CKI080',
139+
'CR31',
140+
'CR45',
141+
'CT73',
142+
'CT74',
143+
'DCGM',
144+
'DE2E',
145+
'G97003',
146+
'GB75B',
147+
'JR29I',
148+
'N11801241',
149+
'N4544916',
150+
'N4591982',
151+
'N88411011',
152+
'N9961471',
153+
'N9961472',
154+
'O10831233',
155+
'O10831242',
156+
'O10831363',
157+
'O13131543',
158+
'O1344845',
159+
'O1344846',
160+
'O159341211',
161+
'O16253113',
162+
'O16253210',
163+
'O16451432',
164+
'O16651162',
165+
'O16651163',
166+
'O1669712',
167+
'O1669852',
168+
'O17202122',
169+
'O17202123',
170+
'O17312681',
171+
'O1842672',
172+
'O18732525',
173+
'O18732533',
174+
'O19612254',
175+
'O19612316',
176+
'O20121233',
177+
'O2071438',
178+
'O20813341',
179+
'O20813451',
180+
'O20813453',
181+
'O21162181',
182+
'O22082333',
183+
'O22517112',
184+
'O2301711',
185+
'O2301734',
186+
'O2307197',
187+
'O2418381',
188+
'O2659166',
189+
'O270573',
190+
'O2705731',
191+
'O2707213',
192+
'O2733136',
193+
'O2899141',
194+
'O3087125',
195+
'O311019',
196+
'O3345221',
197+
'O4001210',
198+
'O400129',
199+
'O5322112',
200+
'O644815',
201+
'O8253762',
202+
'O8284861',
203+
'O8456105',
204+
'O8711107',
205+
'O87117111',
206+
'O8711871',
207+
'O87641',
208+
'O88533',
209+
'O88803',
210+
'O89142',
211+
'O89152',
212+
'O915089',
213+
'O9184343',
214+
'O9184616',
215+
'O92861',
216+
'O94691',
217+
'RE3I',
218+
'S111221',
219+
'SZ218A',
220+
'U564',
221+
'U682',
222+
'VL111C',
223+
'YS94F'
224+
)

0 commit comments

Comments
 (0)