diff --git a/src/care-treatment/otz/queries/handlers/get-otz-enrolled-adolescents-by-age.handler.ts b/src/care-treatment/otz/queries/handlers/get-otz-enrolled-adolescents-by-age.handler.ts index 46ab7221..c7716d0a 100644 --- a/src/care-treatment/otz/queries/handlers/get-otz-enrolled-adolescents-by-age.handler.ts +++ b/src/care-treatment/otz/queries/handlers/get-otz-enrolled-adolescents-by-age.handler.ts @@ -15,7 +15,6 @@ export class GetOtzEnrolledAdolescentsByAgeHandler implements IQueryHandler { const otzTotalAdolescentsByAgeGroup = this.repository.createQueryBuilder('f') .select(['Sum(Eligible) totalAdolescents, AgeGroup ageGroup']); - if (query.county) { otzTotalAdolescentsByAgeGroup.andWhere('f.County IN (:...counties)', { counties: query.county }); } diff --git a/src/care-treatment/viral-load/queries/handlers/get-vl-overall-number-with-follow-vl-tests-at-gt1000-copies-second-line-regiment.handler.ts b/src/care-treatment/viral-load/queries/handlers/get-vl-overall-number-with-follow-vl-tests-at-gt1000-copies-second-line-regiment.handler.ts index 11411f76..7ccd46d7 100644 --- a/src/care-treatment/viral-load/queries/handlers/get-vl-overall-number-with-follow-vl-tests-at-gt1000-copies-second-line-regiment.handler.ts +++ b/src/care-treatment/viral-load/queries/handlers/get-vl-overall-number-with-follow-vl-tests-at-gt1000-copies-second-line-regiment.handler.ts @@ -43,7 +43,7 @@ export class GetVlOverallNumberWithFollowVlTestsAtGt1000CopiesSecondLineRegiment .leftJoin( 'LineListViralLoad', 'c', - 'cohort.PatientidHash= c.PatientID AND cohort.PatientPKHash= c.PatientPK AND cohort.SiteCode= c.MFLCode ', + 'cohort.PatientidHash= c.PatientID AND cohort.PatientPKHash= c.PatientPKHash AND cohort.SiteCode= c.MFLCode ', ); if (query.county) { diff --git a/src/care-treatment/viral-load/queries/handlers/get-vl-uptake-U-to-U.handler.ts b/src/care-treatment/viral-load/queries/handlers/get-vl-uptake-U-to-U.handler.ts index 39565759..1ab7283d 100644 --- a/src/care-treatment/viral-load/queries/handlers/get-vl-uptake-U-to-U.handler.ts +++ b/src/care-treatment/viral-load/queries/handlers/get-vl-uptake-U-to-U.handler.ts @@ -18,7 +18,8 @@ export class GetVlUptakeUToUHandler .select([ `SUM(TXCurr) TXCurr, SUM(EligibleVL) EligibleVL, SUM(HasValidVL) HasValidVL, SUM(CountTwoConsecutiveTestsWithinTheYear) TwoConsTests, - SUM(CountEligibleForTwoVLTests) TwoEligibleTests, SUM(CountDurableLDL) DurableLDL, + SUM(CountEligibleForTwoVLTests) TwoEligibleTests, + SUM(CountDurableLDL) DurableLDL, SUM(CountLDLLastOneTest) LDLLastOneTest`, ]) .where('f.Gender IS NOT NULL');