From 8a6d826ef543bcbe920f42205d82a19773d5a0ec Mon Sep 17 00:00:00 2001 From: cbrianbet Date: Mon, 18 Dec 2023 21:39:48 +0300 Subject: [PATCH 1/3] Added facility implemetation apis --- src/manifests/entities/emr-info.entity.ts | 17 +++ .../entities/facility-info.entity.ts | 17 +++ src/manifests/manifests.controller.ts | 114 +++++++++++++++--- src/manifests/manifests.module.ts | 17 ++- .../queries/handlers/get-emr-info.handler.ts | 61 ++++++++++ .../handlers/get-facility-info.handler.ts | 72 +++++++++++ .../handlers/get-recency-by-county.handler.ts | 34 ------ .../queries/impl/get-emr-info.query.ts | 12 ++ .../queries/impl/get-facility-info.query.ts | 12 ++ .../get-issue-status-by-month.handler.ts | 4 +- .../get-open-issues-by-month.handler.ts | 4 +- 11 files changed, 304 insertions(+), 60 deletions(-) create mode 100644 src/manifests/entities/emr-info.entity.ts create mode 100644 src/manifests/entities/facility-info.entity.ts create mode 100644 src/manifests/queries/handlers/get-emr-info.handler.ts create mode 100644 src/manifests/queries/handlers/get-facility-info.handler.ts create mode 100644 src/manifests/queries/impl/get-emr-info.query.ts create mode 100644 src/manifests/queries/impl/get-facility-info.query.ts diff --git a/src/manifests/entities/emr-info.entity.ts b/src/manifests/entities/emr-info.entity.ts new file mode 100644 index 00000000..410874f0 --- /dev/null +++ b/src/manifests/entities/emr-info.entity.ts @@ -0,0 +1,17 @@ +import { Entity, PrimaryColumn, Column } from 'typeorm'; + +@Entity('mfl_interface_db.facilities_emr_info') +export class EMRInfo { + @PrimaryColumn({ type: 'uuid' }) + manifestId: string; + @Column({ type: 'datetime' }) + timeId: Date; + @Column({ type: 'int' }) + facilityId: number; + @Column({ type: 'text' }) + emrId: string; + @Column({ type: 'text' }) + docketId: string; + @Column({ type: 'int' }) + upload: number; +} diff --git a/src/manifests/entities/facility-info.entity.ts b/src/manifests/entities/facility-info.entity.ts new file mode 100644 index 00000000..c5f0d0e6 --- /dev/null +++ b/src/manifests/entities/facility-info.entity.ts @@ -0,0 +1,17 @@ +import { Entity, PrimaryColumn, Column } from 'typeorm'; + +@Entity('mfl_interface_db.facilities_facility_info') +export class FacilityInfo { + @PrimaryColumn({ type: 'uuid' }) + manifestId: string; + @Column({ type: 'datetime' }) + timeId: Date; + @Column({ type: 'int' }) + facilityId: number; + @Column({ type: 'text' }) + emrId: string; + @Column({ type: 'text' }) + docketId: string; + @Column({ type: 'int' }) + upload: number; +} diff --git a/src/manifests/manifests.controller.ts b/src/manifests/manifests.controller.ts index 9fa306ea..f9774f05 100644 --- a/src/manifests/manifests.controller.ts +++ b/src/manifests/manifests.controller.ts @@ -13,6 +13,8 @@ import { GetRecencyByPartnerQuery } from './queries/impl/get-recency-by-partner. import { GetRecencyByCountyQuery } from './queries/impl/get-recency-by-county.query'; import { GetConsistencyByCountyPartnerQuery } from './queries/impl/get-consistency-by-county-partner.query'; import { GetExpectedUploadsPartnerCountyQuery } from './queries/impl/get-expected-uploads-partner-county.query'; +import { GetEMRInfoQuery } from './queries/impl/get-emr-info.query'; +import { GetFacilityInfoQuery } from './queries/impl/get-facility-info.query'; @Controller('manifests') export class ManifestsController { @@ -64,7 +66,7 @@ export class ManifestsController { @Query('agency') agency, @Query('year') year, @Query('month') month, - @Query('reportingType') reportingType + @Query('reportingType') reportingType, ): Promise { const query = new GetExpectedUploadsPartnerCountyQuery(docket); if (county) { @@ -88,7 +90,7 @@ export class ManifestsController { if (month) { query.month = month; } - if(reportingType) { + if (reportingType) { query.reportingType = reportingType; } return this.queryBus.execute(query); @@ -269,7 +271,7 @@ export class ManifestsController { @Query('year') year, @Query('month') month, @Query('period') period, - @Query('reportingType') reportingType + @Query('reportingType') reportingType, ): Promise { const query = new GetEmrDistributionQuery(docket); if (county) { @@ -296,7 +298,7 @@ export class ManifestsController { if (period) { query.period = period; } - if(reportingType) { + if (reportingType) { query.reportingType = reportingType; } @@ -314,7 +316,7 @@ export class ManifestsController { @Query('year') year, @Query('month') month, @Query('period') period, - @Query('reportingType') reportingType + @Query('reportingType') reportingType, ): Promise { const query = new GetOverallReportingQuery(docket); if (county) { @@ -341,7 +343,7 @@ export class ManifestsController { if (period) { query.period = period; } - if(reportingType) { + if (reportingType) { query.reportingType = reportingType; } return this.queryBus.execute(query); @@ -358,7 +360,7 @@ export class ManifestsController { @Query('year') year, @Query('month') month, @Query('period') period, - @Query('reportingType') reportingType + @Query('reportingType') reportingType, ): Promise { const query = new GetOverallReportingByFacilityQuery(docket); if (county) { @@ -385,14 +387,12 @@ export class ManifestsController { if (period) { query.period = period; } - if(reportingType) { + if (reportingType) { query.reportingType = reportingType; } return this.queryBus.execute(query); } - - @Get('consistencyByFacility/:docket') async getConsistencyByFacility( @Param('docket') docket, @@ -404,7 +404,7 @@ export class ManifestsController { @Query('year') year, @Query('month') month, @Query('period') period, - @Query('reportingType') reportingType + @Query('reportingType') reportingType, ): Promise { const query = new GetConsistencyByFacilityQuery(docket); if (county) { @@ -431,7 +431,7 @@ export class ManifestsController { if (period) { query.period = period; } - if(reportingType) { + if (reportingType) { query.reportingType = reportingType; } return this.queryBus.execute(query); @@ -447,7 +447,7 @@ export class ManifestsController { @Query('agency') agency, @Query('year') year, @Query('month') month, - @Query('period') period + @Query('period') period, ): Promise { const query = new GetRecencyByCountyQuery(docket); if (county) { @@ -487,7 +487,7 @@ export class ManifestsController { @Query('agency') agency, @Query('year') year, @Query('month') month, - @Query('period') period + @Query('period') period, ): Promise { const query = new GetRecencyByPartnerQuery(docket); if (county) { @@ -528,7 +528,7 @@ export class ManifestsController { @Query('year') year, @Query('month') month, @Query('period') period, - @Query('reportingType') reportingType + @Query('reportingType') reportingType, ): Promise { const query = new GetConsistencyByCountyPartnerQuery(docket); if (county) { @@ -555,7 +555,89 @@ export class ManifestsController { if (period) { query.period = period; } - if(reportingType) { + if (reportingType) { + query.reportingType = reportingType; + } + return this.queryBus.execute(query); + } + + @Get('emrinfo/:docket') + async getEMRInfo( + @Param('docket') docket, + @Query('county') county, + @Query('subCounty') subCounty, + @Query('facility') facility, + @Query('partner') partner, + @Query('agency') agency, + @Query('year') year, + @Query('month') month, + // @Query('period') period, + @Query('reportingType') reportingType, + ): Promise { + const query = new GetEMRInfoQuery(docket); + if (county) { + query.county = county; + } + if (subCounty) { + query.subCounty = subCounty; + } + if (facility) { + query.facility = facility; + } + if (partner) { + query.partner = partner; + } + if (agency) { + query.agency = agency; + } + if (year) { + query.year = year; + } + if (month) { + query.month = month; + } + if (reportingType) { + query.reportingType = reportingType; + } + return this.queryBus.execute(query); + } + + @Get('implementationDate/:docket') + async getImplementationDateInfo( + @Param('docket') docket, + @Query('county') county, + @Query('subCounty') subCounty, + @Query('facility') facility, + @Query('partner') partner, + @Query('agency') agency, + @Query('year') year, + @Query('month') month, + // @Query('period') period, + @Query('reportingType') reportingType, + ): Promise { + const query = new GetFacilityInfoQuery(docket); + if (county) { + query.county = county; + } + if (subCounty) { + query.subCounty = subCounty; + } + if (facility) { + query.facility = facility; + } + if (partner) { + query.partner = partner; + } + if (agency) { + query.agency = agency; + } + if (year) { + query.year = year; + } + if (month) { + query.month = month; + } + if (reportingType) { query.reportingType = reportingType; } return this.queryBus.execute(query); diff --git a/src/manifests/manifests.module.ts b/src/manifests/manifests.module.ts index 265ced92..116d1dd3 100644 --- a/src/manifests/manifests.module.ts +++ b/src/manifests/manifests.module.ts @@ -17,12 +17,18 @@ import { GetRecencyByPartnerHandler } from './queries/handlers/get-recency-by-pa import { GetRecencyByCountyHandler } from './queries/handlers/get-recency-by-county.handler'; import { GetConsistencyByCountyPartnerHandler } from './queries/handlers/get-consistency-by-county-partner.handler'; import { GetExpectedUploadsPartnerCountyHandler } from './queries/handlers/get-expected-uploads-partner-county.handler'; +import { GetEMRInfoHandler } from './queries/handlers/get-emr-info.handler'; +import { GetFacilityInfoHandler } from './queries/handlers/get-facility-info.handler'; +import { EMRInfo } from './entities/emr-info.entity'; +import { FacilityInfo } from './entities/facility-info.entity'; @Module({ imports: [ CqrsModule, ConfigurationModule, - TypeOrmModule.forFeature([FactManifest], 'mssql')], + TypeOrmModule.forFeature([EMRInfo, FacilityInfo]), + TypeOrmModule.forFeature([FactManifest], 'mssql'), + ], providers: [ GetConsistencyUploadsHandler, GetConsistencyByFacilityHandler, @@ -36,11 +42,10 @@ import { GetExpectedUploadsPartnerCountyHandler } from './queries/handlers/get-e GetRecencyByCountyHandler, GetRecencyByPartnerHandler, GetConsistencyByCountyPartnerHandler, - GetExpectedUploadsPartnerCountyHandler + GetExpectedUploadsPartnerCountyHandler, + GetEMRInfoHandler, + GetFacilityInfoHandler, ], controllers: [ManifestsController], }) - -export class ManifestsModule { - -} +export class ManifestsModule {} diff --git a/src/manifests/queries/handlers/get-emr-info.handler.ts b/src/manifests/queries/handlers/get-emr-info.handler.ts new file mode 100644 index 00000000..5e0cc070 --- /dev/null +++ b/src/manifests/queries/handlers/get-emr-info.handler.ts @@ -0,0 +1,61 @@ +import { IQueryHandler, QueryHandler } from '@nestjs/cqrs'; +import { InjectRepository } from '@nestjs/typeorm'; +import { FactManifest } from '../../entities/fact-manifest.model'; +import { FacilityInfo } from 'src/manifests/entities/facility-info.entity'; +import { Repository } from 'typeorm'; +import { GetEMRInfoQuery } from './../impl/get-emr-info.query'; + +@QueryHandler(GetEMRInfoQuery) +export class GetEMRInfoHandler implements IQueryHandler { + constructor( + @InjectRepository(FacilityInfo) + private readonly repository: Repository, + @InjectRepository(FactManifest, 'mssql') + private readonly repository2: Repository, + ) {} + + async execute(query: GetEMRInfoQuery): Promise { + const params = []; + params.push(query.docket); + + let expectedSql = `SELECT DISTINCT MFLCode AS expected + FROM NDWH.DBO.DimFacility f + INNER JOIN ODS.dbo.All_EMRSites a on a.MFL_Code = MFLCode + WHERE (isCT = 1)`; + if (query.county) { + expectedSql = `${expectedSql} and f.County IN ('${query.county + .toString() + .replace(/,/g, "','")}')`; + } + if (query.subCounty) { + expectedSql = `${expectedSql} and f.subCounty IN ('${query.subCounty + .toString() + .replace(/,/g, "','")}')`; + } + if (query.agency) { + expectedSql = `${expectedSql} and SDP_Agency IN ('${query.agency + .toString() + .replace(/,/g, "','")}')`; + } + if (query.partner) { + expectedSql = `${expectedSql} and SDP IN ('${query.partner + .toString() + .replace(/,/g, "','")}')`; + } + let expected = await this.repository2.query(expectedSql, params) + + const facilities = this.repository + .createQueryBuilder('f') + .select( + `distinct count(DISTINCT mfl_code) facilities_number, infrastructure_type `, + ) + .where(`mfl_code IN (:...mfl_codes)`, { + mfl_codes: expected.map( + (e: { expected: string }) => e.expected, + ), + }); + + return await facilities.groupBy('infrastructure_type').getRawMany(); + + } +} diff --git a/src/manifests/queries/handlers/get-facility-info.handler.ts b/src/manifests/queries/handlers/get-facility-info.handler.ts new file mode 100644 index 00000000..ac73e596 --- /dev/null +++ b/src/manifests/queries/handlers/get-facility-info.handler.ts @@ -0,0 +1,72 @@ +import { IQueryHandler, QueryHandler } from '@nestjs/cqrs'; +import { InjectRepository } from '@nestjs/typeorm'; +import { FactManifest } from '../../entities/fact-manifest.model'; +import { FacilityInfo } from 'src/manifests/entities/facility-info.entity'; +import { Repository } from 'typeorm'; +import { GetFacilityInfoQuery } from '../impl/get-facility-info.query'; +import { EMRInfo } from 'src/manifests/entities/emr-info.entity'; + +@QueryHandler(GetFacilityInfoQuery) +export class GetFacilityInfoHandler + implements IQueryHandler { + constructor( + @InjectRepository(FacilityInfo) + private readonly repository: Repository, + @InjectRepository(EMRInfo) + private readonly repository1: Repository, + @InjectRepository(FactManifest, 'mssql') + private readonly repository2: Repository, + ) {} + + async execute(query: GetFacilityInfoQuery): Promise { + const params = []; + params.push(query.docket); + + let expectedSql = `SELECT DISTINCT MFLCode AS expected + FROM NDWH.DBO.DimFacility f + INNER JOIN ODS.dbo.All_EMRSites a on a.MFL_Code = MFLCode + WHERE (isCT = 1)`; + if (query.county) { + expectedSql = `${expectedSql} and f.County IN ('${query.county + .toString() + .replace(/,/g, "','")}')`; + } + if (query.subCounty) { + expectedSql = `${expectedSql} and f.subCounty IN ('${query.subCounty + .toString() + .replace(/,/g, "','")}')`; + } + if (query.agency) { + expectedSql = `${expectedSql} and SDP_Agency IN ('${query.agency + .toString() + .replace(/,/g, "','")}')`; + } + if (query.partner) { + expectedSql = `${expectedSql} and SDP IN ('${query.partner + .toString() + .replace(/,/g, "','")}')`; + } + let expected = await this.repository2.query(expectedSql, params); + + const facilities = this.repository + .createQueryBuilder('fac') + .select(`distinct count(DISTINCT mfl_code) facilities_number`) + .leftJoin(EMRInfo, 'emr', 'emr.facility_info_id = fac.id') + .where(`mfl_code IN (:...mfl_codes)`, { + mfl_codes: expected.map( + (e: { expected: string }) => e.expected, + ), + }); + + if (query.year && query.month) { + facilities.andWhere('month(date_of_emr_impl) = :month', { + month: query.month, + }); + facilities.andWhere('year(date_of_emr_impl) = :year', { + year: query.year, + }); + } + + return await facilities.getRawOne(); + } +} diff --git a/src/manifests/queries/handlers/get-recency-by-county.handler.ts b/src/manifests/queries/handlers/get-recency-by-county.handler.ts index b4d3acc0..826fad65 100644 --- a/src/manifests/queries/handlers/get-recency-by-county.handler.ts +++ b/src/manifests/queries/handlers/get-recency-by-county.handler.ts @@ -37,11 +37,6 @@ export class GetRecencyByCountyHandler .replace(/,/g, "','")}')` } - // if(query.facility) { - // recencyOfReportingByCountySql = `${recencyOfReportingByCountySql} and facility IN (?)`; - // params.push(query.facility); - // } - if (query.partner) { recencyOfReportingByCountySql = `${recencyOfReportingByCountySql} and Partner IN ('${query.partner .toString() @@ -72,35 +67,6 @@ export class GetRecencyByCountyHandler params.push(query.docket); } - if (query.county) { - recencyOfReportingByCountySql = `${recencyOfReportingByCountySql} and County IN ('${query.county - .toString() - .replace(/,/g, "','")}')` - } - - if (query.subCounty) { - recencyOfReportingByCountySql = `${recencyOfReportingByCountySql} and subCounty IN ('${query.subCounty - .toString() - .replace(/,/g, "','")}')` - } - - // if(query.facility) { - // recencyOfReportingByCountySql = `${recencyOfReportingByCountySql} and facility IN (?)`; - // params.push(query.facility); - // } - - if (query.partner) { - recencyOfReportingByCountySql = `${recencyOfReportingByCountySql} and Partner IN ('${query.partner - .toString() - .replace(/,/g, "','")}')` - } - - if (query.agency) { - recencyOfReportingByCountySql = `${recencyOfReportingByCountySql} and agency IN ('${query.agency - .toString() - .replace(/,/g, "','")}')` - } - recencyOfReportingByCountySql = `${recencyOfReportingByCountySql} GROUP BY county ) b ON b.county = a.county`; diff --git a/src/manifests/queries/impl/get-emr-info.query.ts b/src/manifests/queries/impl/get-emr-info.query.ts new file mode 100644 index 00000000..dd10d202 --- /dev/null +++ b/src/manifests/queries/impl/get-emr-info.query.ts @@ -0,0 +1,12 @@ +export class GetEMRInfoQuery { + county?: string[]; + subCounty?: string[]; + facility?: string[]; + partner?: string[]; + agency?: string[]; + year?: number; + month?: number; + reportingType?: string; + + constructor(public docket: string) {} +} diff --git a/src/manifests/queries/impl/get-facility-info.query.ts b/src/manifests/queries/impl/get-facility-info.query.ts new file mode 100644 index 00000000..2be49896 --- /dev/null +++ b/src/manifests/queries/impl/get-facility-info.query.ts @@ -0,0 +1,12 @@ +export class GetFacilityInfoQuery { + county?: string[]; + subCounty?: string[]; + facility?: string[]; + partner?: string[]; + agency?: string[]; + year?: number; + month?: number; + reportingType?: string; + + constructor(public docket: string) {} +} diff --git a/src/operational-his/help-desk/queries/handlers/get-issue-status-by-month.handler.ts b/src/operational-his/help-desk/queries/handlers/get-issue-status-by-month.handler.ts index 741335cb..fb8d0dc7 100644 --- a/src/operational-his/help-desk/queries/handlers/get-issue-status-by-month.handler.ts +++ b/src/operational-his/help-desk/queries/handlers/get-issue-status-by-month.handler.ts @@ -71,8 +71,8 @@ export class GetIssueStatusByMonthHandler .groupBy( 'MONTH ( [Created On] ), YEAR ( [Created On] )', ) - .orderBy(`YEAR ( [Created On] )`, `DESC`) - .addOrderBy(` MONTH ( [Created On] )`, `DESC`); + .orderBy(`YEAR ( [Created On] )`) + .addOrderBy(` MONTH ( [Created On] )`); return await ticketOverview.getRawMany(); } diff --git a/src/operational-his/help-desk/queries/handlers/get-open-issues-by-month.handler.ts b/src/operational-his/help-desk/queries/handlers/get-open-issues-by-month.handler.ts index f8a6bea5..2b56588e 100644 --- a/src/operational-his/help-desk/queries/handlers/get-open-issues-by-month.handler.ts +++ b/src/operational-his/help-desk/queries/handlers/get-open-issues-by-month.handler.ts @@ -71,8 +71,8 @@ export class GetOpenIssuesByMonthHandler .groupBy( 'MONTH ( [Created On] ), YEAR ( [Created On] ), [Issue Type]', ) - .orderBy(`YEAR ( [Created On] )`, `DESC`) - .addOrderBy(` MONTH ( [Created On] )`, `DESC`); + .orderBy(`YEAR ( [Created On] )`) + .addOrderBy(` MONTH ( [Created On] )`); return await ticketOverview.getRawMany(); } From 3697c243da7082e2bf578da26469f543b24ea6bc Mon Sep 17 00:00:00 2001 From: cbrianbet Date: Tue, 19 Dec 2023 09:51:41 +0300 Subject: [PATCH 2/3] Update get-consistency-uploads.handler.ts --- .../queries/handlers/get-consistency-uploads.handler.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/manifests/queries/handlers/get-consistency-uploads.handler.ts b/src/manifests/queries/handlers/get-consistency-uploads.handler.ts index a7034515..49792dcf 100644 --- a/src/manifests/queries/handlers/get-consistency-uploads.handler.ts +++ b/src/manifests/queries/handlers/get-consistency-uploads.handler.ts @@ -57,7 +57,7 @@ export class GetConsistencyUploadsHandler } totalconsistency = consistencyResult .map(this.consistencyCount) - .reduce(this.consistencySum); + .reduce(this.consistencySum, 0); } return new ConsistencyUploadsTileDto(query.docket, totalconsistency); } From def717bdc8c1f79f87f54e8e58d8a9dd4b108237 Mon Sep 17 00:00:00 2001 From: cbrianbet Date: Tue, 19 Dec 2023 10:36:55 +0300 Subject: [PATCH 3/3] corrected adverse events column --- .../adverse-events/entities/aggregate-adverse-events.model.ts | 2 +- .../queries/handlers/get-adults-adverse-events.handler.ts | 2 +- .../queries/handlers/get-adverse-events.handler.ts | 2 +- .../queries/handlers/get-ae-actions-by-drugs-new.handler.ts | 2 +- .../queries/handlers/get-ae-actions-by-drugs.handler.ts | 2 +- .../queries/handlers/get-ae-actions-by-severity.handler.ts | 2 +- .../queries/handlers/get-ae-severity-grading.handler.ts | 2 +- .../queries/handlers/get-ae-type-by-severity.handler.ts | 2 +- .../queries/handlers/get-children-adverse-events.handler.ts | 2 +- .../get-number-ae-reported-in-adults-over-15.handler.ts | 2 +- .../get-number-ae-reported-in-children-over-15.handler.ts | 2 +- ...rt-with-ae-by-type-of-suspected-causative-drugs.handler.ts | 4 ++-- .../get-proportion-of-plhiv-with-ae-related-to-art.handler.ts | 4 ++-- ...oportion-of-plhiv-with-ae-whose-regimen-changed.handler.ts | 2 +- ...-of-plhiv-with-ae-whose-regimen-was-not-altered.handler.ts | 2 +- ...tion-of-plhiv-with-ae-whose-regimen-was-stopped.handler.ts | 2 +- .../handlers/get-reported-aes-with-severity-levels.handler.ts | 4 ++-- .../queries/handlers/get-reported-causes-of-ae.handler.ts | 2 +- 18 files changed, 21 insertions(+), 21 deletions(-) diff --git a/src/care-treatment/adverse-events/entities/aggregate-adverse-events.model.ts b/src/care-treatment/adverse-events/entities/aggregate-adverse-events.model.ts index f55e69ab..50b8a539 100644 --- a/src/care-treatment/adverse-events/entities/aggregate-adverse-events.model.ts +++ b/src/care-treatment/adverse-events/entities/aggregate-adverse-events.model.ts @@ -42,5 +42,5 @@ export class AggregateAdverseEvents { Severity: string; @Column('int') - AdverseEventCount: string; + AdverseEventsCount: string; } \ No newline at end of file diff --git a/src/care-treatment/adverse-events/queries/handlers/get-adults-adverse-events.handler.ts b/src/care-treatment/adverse-events/queries/handlers/get-adults-adverse-events.handler.ts index 4caf15e2..05f588e3 100644 --- a/src/care-treatment/adverse-events/queries/handlers/get-adults-adverse-events.handler.ts +++ b/src/care-treatment/adverse-events/queries/handlers/get-adults-adverse-events.handler.ts @@ -16,7 +16,7 @@ export class GetAdultsAdverseEventsHandler implements IQueryHandler 0') .andWhere('[AdverseEventCause] IS NOT NULL') diff --git a/src/care-treatment/adverse-events/queries/handlers/get-ae-actions-by-drugs.handler.ts b/src/care-treatment/adverse-events/queries/handlers/get-ae-actions-by-drugs.handler.ts index c42c949b..b66d0181 100644 --- a/src/care-treatment/adverse-events/queries/handlers/get-ae-actions-by-drugs.handler.ts +++ b/src/care-treatment/adverse-events/queries/handlers/get-ae-actions-by-drugs.handler.ts @@ -17,7 +17,7 @@ export class GetAeActionsByDrugsHandler implements IQueryHandler ''"); diff --git a/src/care-treatment/adverse-events/queries/handlers/get-ae-severity-grading.handler.ts b/src/care-treatment/adverse-events/queries/handlers/get-ae-severity-grading.handler.ts index 8b5b4bed..fd554a1f 100644 --- a/src/care-treatment/adverse-events/queries/handlers/get-ae-severity-grading.handler.ts +++ b/src/care-treatment/adverse-events/queries/handlers/get-ae-severity-grading.handler.ts @@ -17,7 +17,7 @@ export class GetAeSeverityGradingHandler const aeSeverityGrading = this.repository .createQueryBuilder('f') .select( - '[Severity], DATIMAgeGroup ageGroup, SUM([AdverseEventCount]) total', + '[Severity], DATIMAgeGroup ageGroup, SUM([AdverseEventsCount]) total', ) .where("ISNULL([Severity],'') <> ''"); diff --git a/src/care-treatment/adverse-events/queries/handlers/get-ae-type-by-severity.handler.ts b/src/care-treatment/adverse-events/queries/handlers/get-ae-type-by-severity.handler.ts index 4790a02e..41cb3809 100644 --- a/src/care-treatment/adverse-events/queries/handlers/get-ae-type-by-severity.handler.ts +++ b/src/care-treatment/adverse-events/queries/handlers/get-ae-type-by-severity.handler.ts @@ -16,7 +16,7 @@ export class GetAeTypeBySeverityHandler implements IQueryHandler ''"); diff --git a/src/care-treatment/adverse-events/queries/handlers/get-children-adverse-events.handler.ts b/src/care-treatment/adverse-events/queries/handlers/get-children-adverse-events.handler.ts index 27c760cd..d079e478 100644 --- a/src/care-treatment/adverse-events/queries/handlers/get-children-adverse-events.handler.ts +++ b/src/care-treatment/adverse-events/queries/handlers/get-children-adverse-events.handler.ts @@ -17,7 +17,7 @@ export class GetChildrenAdverseEventsHandler implements IQueryHandler { const noOfReportedAeinAdults = this.repository .createQueryBuilder('f') - .select('SUM([AdverseEventCount]) total') + .select('SUM([AdverseEventsCount]) total') .where( "[DATIMAgeGroup] NOT IN (' Under 1', '01 to 04', '05 to 09', '10 to 14')", ); diff --git a/src/care-treatment/adverse-events/queries/handlers/get-number-ae-reported-in-children-over-15.handler.ts b/src/care-treatment/adverse-events/queries/handlers/get-number-ae-reported-in-children-over-15.handler.ts index 42f9a222..52b6e797 100644 --- a/src/care-treatment/adverse-events/queries/handlers/get-number-ae-reported-in-children-over-15.handler.ts +++ b/src/care-treatment/adverse-events/queries/handlers/get-number-ae-reported-in-children-over-15.handler.ts @@ -16,7 +16,7 @@ export class GetNumberAeReportedInChildrenOver15Handler implements IQueryHandler async execute(query: GetNumberAeReportedInChildrenOver15Query): Promise { const noOfReportedAeinChildren = this.repository .createQueryBuilder('f') - .select('SUM([AdverseEventCount]) total') + .select('SUM([AdverseEventsCount]) total') .where("[DATIMAgeGroup] IN (' Under 1', '01 to 04', '05 to 09', '10 to 14')"); if (query.county) { diff --git a/src/care-treatment/adverse-events/queries/handlers/get-proportion-of-plhiv-on-art-with-ae-by-type-of-suspected-causative-drugs.handler.ts b/src/care-treatment/adverse-events/queries/handlers/get-proportion-of-plhiv-on-art-with-ae-by-type-of-suspected-causative-drugs.handler.ts index 5007e838..aa919615 100644 --- a/src/care-treatment/adverse-events/queries/handlers/get-proportion-of-plhiv-on-art-with-ae-by-type-of-suspected-causative-drugs.handler.ts +++ b/src/care-treatment/adverse-events/queries/handlers/get-proportion-of-plhiv-on-art-with-ae-by-type-of-suspected-causative-drugs.handler.ts @@ -16,7 +16,7 @@ export class GetProportionOfPlHIVOnArtWithAeByTypeOfSuspectedCausativeDrugsHandl const proportionOfPlHIVByCausativeDrugs = this.repository .createQueryBuilder('f') .select([ - 'AdverseEventCause adverseEventCause, SUM(AdverseEventCount) count_cat', + 'AdverseEventCause adverseEventCause, SUM(AdverseEventsCount) count_cat', ]) .andWhere('f.MFLCode IS NOT NULL'); @@ -51,7 +51,7 @@ export class GetProportionOfPlHIVOnArtWithAeByTypeOfSuspectedCausativeDrugsHandl return await proportionOfPlHIVByCausativeDrugs .groupBy('f.AdverseEventCause') - .orderBy('SUM(AdverseEventCount)', 'DESC') + .orderBy('SUM(AdverseEventsCount)', 'DESC') .getRawMany(); } } diff --git a/src/care-treatment/adverse-events/queries/handlers/get-proportion-of-plhiv-with-ae-related-to-art.handler.ts b/src/care-treatment/adverse-events/queries/handlers/get-proportion-of-plhiv-with-ae-related-to-art.handler.ts index f5b75562..77f5bdbb 100644 --- a/src/care-treatment/adverse-events/queries/handlers/get-proportion-of-plhiv-with-ae-related-to-art.handler.ts +++ b/src/care-treatment/adverse-events/queries/handlers/get-proportion-of-plhiv-with-ae-related-to-art.handler.ts @@ -17,7 +17,7 @@ export class GetProportionOfPLHIVWithAeRelatedToArtHandler implements IQueryHand const proportionOfPlHIVWithAeRelatedToArt = this.repository .createQueryBuilder('f') .select([ - 'AdverseEventCause adverseEventCause, SUM(AdverseEventCount) count_cat', + 'AdverseEventCause adverseEventCause, SUM(AdverseEventsCount) count_cat', ]) .andWhere( "AdverseEventCause IN ('Dolutegravir','Atazanavir','TLE','Efavirenz','Tenofavir','Didanosin','Lamivudine','Lamivudine','Lopinavir','Abacavir','TLD','Nevirapine','Zidovudine','Stavudine')", @@ -56,7 +56,7 @@ export class GetProportionOfPLHIVWithAeRelatedToArtHandler implements IQueryHand return await proportionOfPlHIVWithAeRelatedToArt .groupBy('f.AdverseEventCause') - .orderBy('SUM(AdverseEventCount)', 'DESC') + .orderBy('SUM(AdverseEventsCount)', 'DESC') .getRawMany(); } } diff --git a/src/care-treatment/adverse-events/queries/handlers/get-proportion-of-plhiv-with-ae-whose-regimen-changed.handler.ts b/src/care-treatment/adverse-events/queries/handlers/get-proportion-of-plhiv-with-ae-whose-regimen-changed.handler.ts index 124ddb98..09b116de 100644 --- a/src/care-treatment/adverse-events/queries/handlers/get-proportion-of-plhiv-with-ae-whose-regimen-changed.handler.ts +++ b/src/care-treatment/adverse-events/queries/handlers/get-proportion-of-plhiv-with-ae-whose-regimen-changed.handler.ts @@ -16,7 +16,7 @@ export class GetProportionOfPLHIVWithAeWhoseRegimenChangedHandler implements IQu const proportionOfPLHIVWithAeWhoseRegimenChanged = this.repository .createQueryBuilder('f') .select( - 'AdverseEventActionTaken adverseEventActionTaken, SUM(AdverseEventCount) numberOfPatientsAe', + 'AdverseEventActionTaken adverseEventActionTaken, SUM(AdverseEventsCount) numberOfPatientsAe', ) .andWhere( `f.AdverseEventActionTaken in ('Medicine causing AE substituted/withdrawn', 'SUBSTITUTED DRUG|SUBSTITUTED DRUG', 'Drug Substituted', 'Drug Withdrawn')`, diff --git a/src/care-treatment/adverse-events/queries/handlers/get-proportion-of-plhiv-with-ae-whose-regimen-was-not-altered.handler.ts b/src/care-treatment/adverse-events/queries/handlers/get-proportion-of-plhiv-with-ae-whose-regimen-was-not-altered.handler.ts index 1a8689ca..fd2c7fce 100644 --- a/src/care-treatment/adverse-events/queries/handlers/get-proportion-of-plhiv-with-ae-whose-regimen-was-not-altered.handler.ts +++ b/src/care-treatment/adverse-events/queries/handlers/get-proportion-of-plhiv-with-ae-whose-regimen-was-not-altered.handler.ts @@ -17,7 +17,7 @@ export class GetProportionOfPLHIVWithAeWhoseRegimenWasNotAlteredHandler implemen const proportionOfPLHIVWithAeWhoseRegimenNotAltered = this.repository .createQueryBuilder('f') .select( - 'AdverseEventActionTaken adverseEventActionTaken, SUM(AdverseEventCount) numberOfPatientsAe', + 'AdverseEventActionTaken adverseEventActionTaken, SUM(AdverseEventsCount) numberOfPatientsAe', ) .andWhere('f.AdverseEventActionTaken in (:...AdverseEventActionTaken)', { AdverseEventActionTaken: ['Medicine not changed', 'Drug not Changed'], diff --git a/src/care-treatment/adverse-events/queries/handlers/get-proportion-of-plhiv-with-ae-whose-regimen-was-stopped.handler.ts b/src/care-treatment/adverse-events/queries/handlers/get-proportion-of-plhiv-with-ae-whose-regimen-was-stopped.handler.ts index c9b14c48..50e8f401 100644 --- a/src/care-treatment/adverse-events/queries/handlers/get-proportion-of-plhiv-with-ae-whose-regimen-was-stopped.handler.ts +++ b/src/care-treatment/adverse-events/queries/handlers/get-proportion-of-plhiv-with-ae-whose-regimen-was-stopped.handler.ts @@ -17,7 +17,7 @@ export class GetProportionOfPLHIVWithAeWhoseRegimenWasStoppedHandler implements const proportionOfPLHIVWithAeWhoseRegimenWasStopped = this.repository .createQueryBuilder('f') .select( - 'AdverseEventActionTaken adverseEventActionTaken, SUM(AdverseEventCount) numberOfPatientsAe', + 'AdverseEventActionTaken adverseEventActionTaken, SUM(AdverseEventsCount) numberOfPatientsAe', ) .andWhere('f.AdverseEventActionTaken = (:...AdverseEventActionTaken)', { AdverseEventActionTaken: ['All drugs stopped'], diff --git a/src/care-treatment/adverse-events/queries/handlers/get-reported-aes-with-severity-levels.handler.ts b/src/care-treatment/adverse-events/queries/handlers/get-reported-aes-with-severity-levels.handler.ts index 3f20b395..4cb4549d 100644 --- a/src/care-treatment/adverse-events/queries/handlers/get-reported-aes-with-severity-levels.handler.ts +++ b/src/care-treatment/adverse-events/queries/handlers/get-reported-aes-with-severity-levels.handler.ts @@ -17,7 +17,7 @@ export class GetReportedAesWithSeverityLevelsHandler implements IQueryHandler { const reportedCausesOfAes = this.repository .createQueryBuilder('f') - .select('[AdverseEventCause], SUM([AdverseEventCount]) total') + .select('[AdverseEventCause], SUM([AdverseEventsCountt]) total') .where('[AdverseEventCause] IS NOT NULL'); if (query.county) {