Skip to content
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

Hotfix for v_getobscode and v_getobstxt #247

Merged
merged 9 commits into from
Mar 12, 2025
Merged

Hotfix for v_getobscode and v_getobstxt #247

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
67cb5fe
CNDE-2351: update to join logic, v_rdb_obs_mapping
joshua-mills-cdw Mar 6, 2025
213544c
CNDE-2351: change case to ISNULL
joshua-mills-cdw Mar 6, 2025
a5b9691
CNDE-2531: documentation
joshua-mills-cdw Mar 6, 2025
d5e72a7
CNDE-2351: fix removal of old records
joshua-mills-cdw Mar 6, 2025
aaca593
Merge branch 'main' of github.com:CDCgov/NEDSS-DataReporting into CND…
joshua-mills-cdw Mar 6, 2025
15424d9
CNDE-2351: add nolock to nrt references
joshua-mills-cdw Mar 6, 2025
56a1d0b
CNDE-2351: remove unnecessary join condition
joshua-mills-cdw Mar 6, 2025
00f64b3
Merge branch 'main' of github.com:CDCgov/NEDSS-DataReporting into CND…
joshua-mills-cdw Mar 12, 2025
bedb0f4
CNDE-2351: fix join condition in obstxt and obscode views
joshua-mills-cdw Mar 12, 2025
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
2 changes: 1 addition & 1 deletion db/upgrade/rdb_modern/views/001-v_getobscode.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ WITH InvFormQObservations AS
dbo.nrt_investigation_observation tnio with (nolock)
INNER JOIN dbo.nrt_investigation inv with (nolock) on tnio.public_health_case_uid = inv.public_health_case_uid and ISNULL(tnio.batch_id, 1) = ISNULL(inv.batch_id, 1)
inner join dbo.nrt_observation_coded ovc with (nolock) ON ovc.observation_uid = tnio.branch_id
inner join dbo.nrt_observation o with (nolock) ON o.observation_uid = ovc.observation_uid
inner join dbo.nrt_observation o with (nolock) ON o.observation_uid = ovc.observation_uid and ISNULL(o.batch_id,1) = ISNULL(ovc.batch_id,1)
WHERE branch_type_cd = 'InvFrmQ'

)
Expand Down
2 changes: 1 addition & 1 deletion db/upgrade/rdb_modern/views/004-v_getobstxt.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,5 +12,5 @@ FROM
dbo.nrt_investigation_observation tnio with (nolock)
INNER JOIN dbo.nrt_investigation inv with (nolock) on tnio.public_health_case_uid = inv.public_health_case_uid and ISNULL(tnio.batch_id, 1) = ISNULL(inv.batch_id, 1)
LEFT JOIN dbo.nrt_observation o with (nolock) ON o.observation_uid = tnio.branch_id
LEFT JOIN dbo.nrt_observation_txt ovt with (nolock) ON ovt.observation_uid = o.observation_uid
LEFT JOIN dbo.nrt_observation_txt ovt with (nolock) ON ovt.observation_uid = o.observation_uid and ISNULL(o.batch_id,1) = ISNULL(ovt.batch_id,1)
WHERE tnio.branch_type_cd = 'InvFrmQ' AND ovt.ovt_seq = 1;
2 changes: 1 addition & 1 deletion liquibase-service/src/main/resources/db/rdb_modern/views/001-v_getobscode-001.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ WITH InvFormQObservations AS
dbo.nrt_investigation_observation tnio with (nolock)
INNER JOIN dbo.nrt_investigation inv with (nolock) on tnio.public_health_case_uid = inv.public_health_case_uid and ISNULL(tnio.batch_id, 1) = ISNULL(inv.batch_id, 1)
inner join dbo.nrt_observation_coded ovc with (nolock) ON ovc.observation_uid = tnio.branch_id
inner join dbo.nrt_observation o with (nolock) ON o.observation_uid = ovc.observation_uid
inner join dbo.nrt_observation o with (nolock) ON o.observation_uid = ovc.observation_uid and ISNULL(o.batch_id,1) = ISNULL(ovc.batch_id,1)
WHERE branch_type_cd = 'InvFrmQ'

)
Expand Down
2 changes: 1 addition & 1 deletion liquibase-service/src/main/resources/db/rdb_modern/views/004-v_getobstxt-001.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,5 +12,5 @@ FROM
dbo.nrt_investigation_observation tnio with (nolock)
INNER JOIN dbo.nrt_investigation inv with (nolock) on tnio.public_health_case_uid = inv.public_health_case_uid and ISNULL(tnio.batch_id, 1) = ISNULL(inv.batch_id, 1)
LEFT JOIN dbo.nrt_observation o with (nolock) ON o.observation_uid = tnio.branch_id
LEFT JOIN dbo.nrt_observation_txt ovt with (nolock) ON ovt.observation_uid = o.observation_uid
LEFT JOIN dbo.nrt_observation_txt ovt with (nolock) ON ovt.observation_uid = o.observation_uid and ISNULL(o.batch_id,1) = ISNULL(ovt.batch_id,1)
WHERE tnio.branch_type_cd = 'InvFrmQ' AND ovt.ovt_seq = 1;