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

Jump to bottom

POC-158: Wrong Visit for DC clients #1295

Merged
merged 4 commits into from
Aug 2, 2023
Merged

POC-158: Wrong Visit for DC clients #1295

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0cc4d4c
POC-158:Wrong visits for DC clients
sainingo Jul 3, 2023
e18e74e
Add visit and encounter types
sainingo Jul 4, 2023
4c30b2a
Add adult return hiv visit ID
sainingo Jul 6, 2023
b587673
Merge branch 'master' into POC-158
drizzentic Aug 2, 2023
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
16 changes: 8 additions & 8 deletions service/dc-patient-visit-evaluator.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ const def = {

function getPatientQualifiedDcVisits(patientUuid) {
return new Promise((resolve, reject) => {
const sql = `SELECT
const sql = `SELECT
p.person_id,
latest_medication_visit.*,
latest_standard_visit.*,
Expand All @@ -32,13 +32,13 @@ function getPatientQualifiedDcVisits(patientUuid) {
AND latest_standard_visit.latest_standard_visit is null THEN @recent_dc_enrolment_program_manager:=1
WHEN latest_new_dc_enrollment_date.latest_new_dc_enrollment_date > latest_standard_visit.latest_standard_visit
AND latest_medication_visit.latest_medication_visit is null THEN @recent_dc_enrolment_program_manager:=1
WHEN latest_new_dc_enrollment_date.latest_new_dc_enrollment_date is not null and latest_medication_visit.latest_medication_visit is null
WHEN latest_new_dc_enrollment_date.latest_new_dc_enrollment_date is not null and latest_medication_visit.latest_medication_visit is null
AND latest_standard_visit.latest_standard_visit is null then @recent_dc_enrolment_program_manager:=1
ELSE @recent_dc_enrolment_program_manager:=0
END AS 'recent_dc_enrolment_program_manager',
@recent_dc_enrolment_program_manager,
CASE
WHEN @recent_dc_enrolment = 1 THEN 1
WHEN @recent_dc_enrolment = 1 THEN 1
WHEN @recent_dc_enrolment_program_manager = 1 THEN 0
WHEN latest_standard_visit.latest_standard_visit > latest_medication_visit.latest_medication_visit THEN 1
WHEN latest_standard_visit.latest_standard_visit is not null AND latest_medication_visit.latest_medication_visit is NULL THEN 1
Expand All @@ -55,7 +55,7 @@ function getPatientQualifiedDcVisits(patientUuid) {
FROM
amrs.person p
LEFT JOIN (
SELECT
SELECT
e.patient_id,
e.encounter_datetime as 'latest_medication_visit'
FROM
Expand All @@ -69,21 +69,21 @@ FROM
order by encounter_datetime desc limit 1
) latest_medication_visit on (latest_medication_visit.patient_id = p.person_id)
LEFT JOIN (
SELECT
SELECT
e.patient_id,
e.encounter_datetime AS 'latest_standard_visit'
FROM
amrs.encounter e
join amrs.person p on (e.patient_id = p.person_id)
join amrs.visit v on (e.visit_id = v.visit_id)
where e.encounter_type in (2)
AND v.visit_type_id in (59)
where e.encounter_type in (2, 106)
AND v.visit_type_id in (59,2, 9, 15)
AND e.voided = 0
AND p.uuid = '${patientUuid}'
order by encounter_datetime desc limit 1
) latest_standard_visit on (latest_standard_visit.patient_id = p.person_id)
LEFT JOIN (
SELECT
SELECT
e.patient_id,
e.encounter_datetime AS 'latest_dc_enrolment_visit'
FROM
Expand Down
Loading