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

corrected vl column in otz apis #685

Merged
merged 2 commits into from
Dec 20, 2023
Merged

corrected vl column in otz apis #685

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9202d53
corrected vl column in otz apis
cbrianbet Dec 20, 2023
63a5c9e
Merge pull request #684 from cbrianbet/feat/new-reporting-layer
cbrianbet Dec 20, 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
6 changes: 3 additions & 3 deletions ...queries/handlers/get-otz-vl-suppression-among-alhiv-not-enrolled-in-otz-by-age.handler.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,10 @@ export class GetOtzVlSuppressionAmongAlhivNotEnrolledInOtzByAgeHandler
let vlSuppressionOtzByAgeAlhiv = this.repository
.createQueryBuilder('f')
.select([
'[AgeGroup] ageGroup, ValidVLResultCategory Last12MVLResult, SUM([HasValidVL]) AS vlSuppression',
'[AgeGroup] ageGroup, ValidVLResultCategory2 Last12MVLResult, SUM([HasValidVL]) AS vlSuppression',
])
.andWhere(
'f.MFLCode IS NOT NULL AND ValidVLResultCategory IS NOT NULL AND Enrolled = 0',
'f.MFLCode IS NOT NULL AND ValidVLResultCategory2 IS NOT NULL AND Enrolled = 0',
);

if (query.county) {
Expand Down Expand Up @@ -80,7 +80,7 @@ export class GetOtzVlSuppressionAmongAlhivNotEnrolledInOtzByAgeHandler
}

return await vlSuppressionOtzByAgeAlhiv
.groupBy('[AgeGroup], ValidVLResultCategory')
.groupBy('[AgeGroup], ValidVLResultCategory2')
.orderBy('[AgeGroup]')
.getRawMany();
}
Expand Down
6 changes: 3 additions & 3 deletions ...ries/handlers/get-otz-vl-suppression-among-alhiv-not-enrolled-in-otz-by-county.handler.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,10 @@ export class GetOtzVlSuppressionAmongAlhivNotEnrolledInOtzByCountyHandler
const vlSuppressionOtzByCounty = this.repository
.createQueryBuilder('f')
.select([
'[County], ValidVLResultCategory Last12MVLResult, SUM([HasValidVL]) AS vlSuppression',
'[County], ValidVLResultCategory2 Last12MVLResult, SUM([HasValidVL]) AS vlSuppression',
])
.andWhere(
'f.MFLCode IS NOT NULL AND ValidVLResultCategory IS NOT NULL AND Enrolled = 0',
'f.MFLCode IS NOT NULL AND ValidVLResultCategory2 IS NOT NULL AND Enrolled = 0',
);

if (query.county) {
Expand Down Expand Up @@ -80,7 +80,7 @@ export class GetOtzVlSuppressionAmongAlhivNotEnrolledInOtzByCountyHandler
}

return await vlSuppressionOtzByCounty
.groupBy('[County], ValidVLResultCategory')
.groupBy('[County], ValidVLResultCategory2')
.orderBy('[County]')
.getRawMany();
}
Expand Down
6 changes: 3 additions & 3 deletions ...ies/handlers/get-otz-vl-suppression-among-alhiv-not-enrolled-in-otz-by-partner.handler.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,10 @@ export class GetOtzVlSuppressionAmongAlhivNotEnrolledInOtzByPartnerHandler
const vlSuppressionOtzByPartner = this.repository
.createQueryBuilder('f')
.select([
'[PartnerName] CTPartner, ValidVLResultCategory Last12MVLResult, SUM([HasValidVL]) AS vlSuppression',
'[PartnerName] CTPartner, ValidVLResultCategory2 Last12MVLResult, SUM([HasValidVL]) AS vlSuppression',
])
.andWhere(
'f.MFLCode IS NOT NULL AND ValidVLResultCategory IS NOT NULL AND Enrolled = 0',
'f.MFLCode IS NOT NULL AND ValidVLResultCategory2 IS NOT NULL AND Enrolled = 0',
);

if (query.county) {
Expand Down Expand Up @@ -79,7 +79,7 @@ export class GetOtzVlSuppressionAmongAlhivNotEnrolledInOtzByPartnerHandler
}

return await vlSuppressionOtzByPartner
.groupBy('[PartnerName], ValidVLResultCategory')
.groupBy('[PartnerName], ValidVLResultCategory2')
.orderBy('[PartnerName]')
.getRawMany();
}
Expand Down
6 changes: 3 additions & 3 deletions ...queries/handlers/get-otz-vl-suppression-among-alhiv-not-enrolled-in-otz-by-sex.handler.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,10 @@ export class GetOtzVlSuppressionAmongAlhivNotEnrolledInOtzBySexHandler
const vlSuppressionOtzBySex = this.repository
.createQueryBuilder('f')
.select([
'[Gender], ValidVLResultCategory Last12MVLResult, SUM([HasValidVL]) AS vlSuppression',
'[Gender], ValidVLResultCategory2 Last12MVLResult, SUM([HasValidVL]) AS vlSuppression',
])
.andWhere(
'f.MFLCode IS NOT NULL AND ValidVLResultCategory IS NOT NULL AND Enrolled = 0',
'f.MFLCode IS NOT NULL AND ValidVLResultCategory2 IS NOT NULL AND Enrolled = 0',
);

if (query.county) {
Expand Down Expand Up @@ -71,7 +71,7 @@ export class GetOtzVlSuppressionAmongAlhivNotEnrolledInOtzBySexHandler
}

return await vlSuppressionOtzBySex
.groupBy('[Gender], ValidVLResultCategory')
.groupBy('[Gender], ValidVLResultCategory2')
.orderBy('[Gender]')
.getRawMany();
}
Expand Down
4 changes: 0 additions & 4 deletions src/manifests/queries/handlers/get-recency-uploads.handler.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,6 @@ export class GetRecencyUploadsHandler
.toString()
.replace(/,/g, "','")}')`
}
// if (query.facility) {
// recencySql = `${recencySql} and facility IN (?)`;
// params.push(query.facility);
// }
if (query.partner) {
recencySql = `${recencySql} and Partner IN ('${query.partner
.toString()
Expand Down