Skip to content

[bot] Merge 25.7 to 25.11 #927

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
github-actions wants to merge 2 commits into
base: release25.11-SNAPSHOT
Choose a base branch
from
+7 −1
Open

[bot] Merge 25.7 to 25.11 #927

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9267320
Fix cost account ETL view returning multiple rows per charge id when …
jallentxbiomed May 6, 2026
3947bb5
Merge 25.7 to 25.11
labkey-teamcity May 8, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion snprc_ehr/resources/source_queries/create_v_charge_account.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ ALTER VIEW [labkey_etl].[v_charge_account] AS
-- 11/11/2016 added modified, modifiedby, created, and createdby columns tjh
-- 10/22/2019 removed distinct clause from valid_charge_by_species join tjh
-- 02/15/2020 Added fallback for missing created & createdBy columns tjh
-- 04/23/2026 Removed join on species table and added OUTER APPLY ja
-- ==========================================================================================


Expand All @@ -47,7 +48,12 @@ ALTER VIEW [labkey_etl].[v_charge_account] AS
ca.timestamp AS timestamp
FROM dbo.charge_account AS ca
LEFT OUTER JOIN dbo.TAC_COLUMNS AS tc ON tc.object_id = ca.object_id
LEFT OUTER JOIN dbo.valid_charge_by_species AS vcs ON ca.charge_id = vcs.charge_id
OUTER APPLY (
SELECT TOP 1 vcs2.charge_id, vcs2.arc_species_code
FROM dbo.valid_charge_by_species vcs2
WHERE vcs2.charge_id = ca.charge_id
ORDER BY vcs2.arc_species_code
) vcs
LEFT OUTER JOIN dbo.prd_cost_account AS pca on pca.account_id = ca.account_id


Expand Down
Loading