Skip to content

Commit

Permalink
Merge pull request #726 from cbrianbet/feat/new-reporting-layer
Browse files Browse the repository at this point in the history 
Fixed broken art psurvey charts
  • Loading branch information
@cbrianbet
cbrianbet authored Apr 16, 2024
2 parents d5aeaac + 9835ca5 commit e206066
Show file tree
Hide file tree
Showing 3 changed files with 57 additions and 57 deletions.
50 changes: 25 additions & 25 deletions ...t-verification/queries/handlers/get-art-verification-pending-surveys-by-county.handler.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,41 +21,41 @@ export class GetArtVerificationPendingSurveysByCountyHandler
with EnrichedFullfacilitylist As (
-- get the full facilities list with enriched columns
Select
distinct cast(Allsites.MFLCode collate Latin1_General_CI_AS as nvarchar) as MFLCode,
Allsites.FacilityName,
distinct cast(Allsites.MFL_Code collate Latin1_General_CI_AS as nvarchar) as MFLCode,
Allsites.Facility_Name,
Allsites.County,
Allsites.FacilityType,
EMRs.EMR,
coalesce(EMRs.SDP, Allsites.SDIP) As SDIP,
coalesce(EMRs.[SDP Agency], Allsites.Agency) as Agency
coalesce(EMRs.SDP, Allsites.SDP) As SDIP,
coalesce(EMRs.[SDP_Agency], Allsites.SDP_Agency) as Agency
from HIS_Implementation.dbo.EMRandNonEMRSites as Allsites
left join ODS.dbo.All_EMRSites EMRs on EMRs.MFL_Code=Allsites.MFLCode
left join ODS.dbo.All_EMRSites EMRs on EMRs.MFL_Code=Allsites.MFL_Code
),
--Pick Only the EMR Sites
EMRSites as (
select
distinct
[Facility Name] AS FacilityName,
[Facility_Name] AS FacilityName,
cast (MFL_Code as nvarchar) As MFLCode,
County,
SDP,
EMR,
[SDP Agency]
[SDP_Agency]
from HIS_Implementation.dbo.All_EMRSites
where [EMR Status] = 'Active'
where [EMR_Status] = 'Active'
),
--Obtain the latest reporting month in KHIS and pick the latest TXCurr--
latest_reporting_month as (
select distinct
cast (SiteCode as nvarchar) SiteCode,
max(ReportMonth_Year) as reporting_month
from NDWH.dbo.FACT_CT_DHIS2 as khis
from ODS.dbo.CT_DHIS2 as khis
where CurrentOnART_Total is not null
and datediff(
mm,
cast(concat(ReportMonth_Year, '01') as date),
(select max(cast(concat(ReportMonth_Year, '01') as date)
) from NDWH.dbo.FACT_CT_DHIS2)
) from ODS.dbo.CT_DHIS2)
) <= 6
group by SiteCode
),
Expand All @@ -65,7 +65,7 @@ export class GetArtVerificationPendingSurveysByCountyHandler
cast (khis.SiteCode as nvarchar) As SiteCode,
latest_reporting_month.reporting_month,
sum(CurrentOnART_Total) as TXCurr_khis
from NDWH.dbo.FACT_CT_DHIS2 as khis
from ODS.dbo.CT_DHIS2 as khis
inner join latest_reporting_month on latest_reporting_month.SiteCode = khis.SiteCode
and khis.ReportMonth_Year = latest_reporting_month.reporting_month
where CurrentOnART_Total is not null
Expand Down Expand Up @@ -161,19 +161,19 @@ export class GetArtVerificationPendingSurveysByCountyHandler
FROM [pSurvey].[dbo].[stg_questionnaire_responses]
Group by mfl_code
),
verified_but_with_survey as (
select
origin_facility_kmfl_code as mfl_code,
count(distinct concat(nupi.ccc_no, '-', nupi.origin_facility_kmfl_code)) as count_of_patients
from tmp_and_adhoc.dbo.nupi_dataset as nupi
inner join [pSurvey].[dbo].[stg_questionnaire_responses] as surveys on surveys.ccc_no = nupi.ccc_no
and cast(surveys.mfl_code as varchar) = nupi.origin_facility_kmfl_code
group by origin_facility_kmfl_code
),
verified_but_with_survey as (
select
origin_facility_kmfl_code as mfl_code,
count(distinct concat(nupi.ccc_no, '-', nupi.origin_facility_kmfl_code)) as count_of_patients
from tmp_and_adhoc.dbo.nupi_dataset as nupi
inner join [pSurvey].[dbo].[stg_questionnaire_responses] as surveys on surveys.ccc_no = nupi.ccc_no
and cast(surveys.mfl_code as varchar) = nupi.origin_facility_kmfl_code
group by origin_facility_kmfl_code
),
FacilitySummary AS (
select
EnrichedFullfacilitylist.MFLCode as MFLCode,
EnrichedFullfacilitylist.FacilityName as Facility,
EnrichedFullfacilitylist.Facility_Name as Facility,
EnrichedFullfacilitylist.SDIP,
EnrichedFullfacilitylist.EMR as EMR,
EnrichedFullfacilitylist.FacilityType,
Expand All @@ -195,7 +195,7 @@ export class GetArtVerificationPendingSurveysByCountyHandler
coalesce(PaedsTXCurr_DWH,0) As PaedsTXCurr_DWH,
coalesce (count_AdultsTXCurDWH,0) As AdultsTxCurr_DWH,
coalesce (SurveysReceived,0) As SurveysReceived,
coalesce(verified_but_with_survey.count_of_patients,0) as patients_verified_but_with_survey
coalesce(verified_but_with_survey.count_of_patients,0) as patients_verified_but_with_survey
from EnrichedFullfacilitylist
left join khis on cast (khis.SiteCode as nvarchar) = cast (EnrichedFullfacilitylist.MFLCode as nvarchar)
full outer join dwh_nupi_by_facility on dwh_nupi_by_facility.MFLCode = EnrichedFullfacilitylist.MFLCode collate Latin1_General_CI_AS
Expand All @@ -207,10 +207,10 @@ export class GetArtVerificationPendingSurveysByCountyHandler
left join nupi_overall on nupi_overall.facility_code=EnrichedFullfacilitylist.MFLCode collate Latin1_General_CI_AS
left join nupi_non_art_clients on nupi_non_art_clients.facility_code=EnrichedFullfacilitylist.MFLCode collate Latin1_General_CI_AS
left join PSurveys on PSurveys.MFLCode=EnrichedFullfacilitylist.MFLCode collate Latin1_General_CI_AS
left join verified_but_with_survey on verified_but_with_survey.mfl_code = EnrichedFullfacilitylist.MFLCode
left join verified_but_with_survey on verified_but_with_survey.mfl_code = EnrichedFullfacilitylist.MFLCode
group by
EnrichedFullfacilitylist.MFLCode,
EnrichedFullfacilitylist.FacilityName,
EnrichedFullfacilitylist.Facility_Name,
EnrichedFullfacilitylist.SDIP,
EnrichedFullfacilitylist.EMR,
EnrichedFullfacilitylist.FacilityType,
Expand All @@ -226,7 +226,7 @@ export class GetArtVerificationPendingSurveysByCountyHandler
coalesce (PaedsTXCurr_DWH,0),
coalesce(count_AdultsTXCurDWH,0),
coalesce (SurveysReceived,0),
coalesce(verified_but_with_survey.count_of_patients,0)
coalesce(verified_but_with_survey.count_of_patients,0)
)
select
sum (count_patients_nupi_sent_to_dwh) As NupiVerified,
Expand Down
50 changes: 25 additions & 25 deletions ...-verification/queries/handlers/get-art-verification-pending-surveys-by-partner.handler.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,41 +21,41 @@ export class GetArtVerificationPendingSurveysByPartnerHandler
with EnrichedFullfacilitylist As (
-- get the full facilities list with enriched columns
Select
distinct cast(Allsites.MFLCode collate Latin1_General_CI_AS as nvarchar) as MFLCode,
Allsites.FacilityName,
distinct cast(Allsites.MFL_Code collate Latin1_General_CI_AS as nvarchar) as MFLCode,
Allsites.Facility_Name,
Allsites.County,
Allsites.FacilityType,
EMRs.EMR,
coalesce(EMRs.SDP, Allsites.SDIP) As SDIP,
coalesce(EMRs.[SDP Agency], Allsites.Agency) as Agency
coalesce(EMRs.SDP, Allsites.SDP) As SDIP,
coalesce(EMRs.[SDP_Agency], Allsites.SDP_Agency) as Agency
from HIS_Implementation.dbo.EMRandNonEMRSites as Allsites
left join HIS_Implementation.dbo.All_EMRSites EMRs on EMRs.MFL_Code=Allsites.MFLCode
left join ODS.dbo.All_EMRSites EMRs on EMRs.MFL_Code=Allsites.MFL_Code
),
--Pick Only the EMR Sites
EMRSites as (
select
distinct
[Facility Name] AS FacilityName,
[Facility_Name] AS FacilityName,
cast (MFL_Code as nvarchar) As MFLCode,
County,
SDP,
EMR,
[SDP Agency]
[SDP_Agency]
from HIS_Implementation.dbo.All_EMRSites
where [EMR Status] = 'Active'
where [EMR_Status] = 'Active'
),
--Obtain the latest reporting month in KHIS and pick the latest TXCurr--
latest_reporting_month as (
select distinct
cast (SiteCode as nvarchar) SiteCode,
max(ReportMonth_Year) as reporting_month
from NDWH.dbo.FACT_CT_DHIS2 as khis
from ODS.dbo.CT_DHIS2 as khis
where CurrentOnART_Total is not null
and datediff(
mm,
cast(concat(ReportMonth_Year, '01') as date),
(select max(cast(concat(ReportMonth_Year, '01') as date)
) from NDWH.dbo.FACT_CT_DHIS2)
) from ODS.dbo.CT_DHIS2)
) <= 6
group by SiteCode
),
Expand All @@ -65,7 +65,7 @@ export class GetArtVerificationPendingSurveysByPartnerHandler
cast (khis.SiteCode as nvarchar) As SiteCode,
latest_reporting_month.reporting_month,
sum(CurrentOnART_Total) as TXCurr_khis
from NDWH.dbo.FACT_CT_DHIS2 as khis
from ODS.dbo.CT_DHIS2 as khis
inner join latest_reporting_month on latest_reporting_month.SiteCode = khis.SiteCode
and khis.ReportMonth_Year = latest_reporting_month.reporting_month
where CurrentOnART_Total is not null
Expand Down Expand Up @@ -161,19 +161,19 @@ export class GetArtVerificationPendingSurveysByPartnerHandler
FROM [pSurvey].[dbo].[stg_questionnaire_responses]
Group by mfl_code
),
verified_but_with_survey as (
select
origin_facility_kmfl_code as mfl_code,
count(distinct concat(nupi.ccc_no, '-', nupi.origin_facility_kmfl_code)) as count_of_patients
from tmp_and_adhoc.dbo.nupi_dataset as nupi
inner join [pSurvey].[dbo].[stg_questionnaire_responses] as surveys on surveys.ccc_no = nupi.ccc_no
and cast(surveys.mfl_code as varchar) = nupi.origin_facility_kmfl_code
group by origin_facility_kmfl_code
),
verified_but_with_survey as (
select
origin_facility_kmfl_code as mfl_code,
count(distinct concat(nupi.ccc_no, '-', nupi.origin_facility_kmfl_code)) as count_of_patients
from tmp_and_adhoc.dbo.nupi_dataset as nupi
inner join [pSurvey].[dbo].[stg_questionnaire_responses] as surveys on surveys.ccc_no = nupi.ccc_no
and cast(surveys.mfl_code as varchar) = nupi.origin_facility_kmfl_code
group by origin_facility_kmfl_code
),
FacilitySummary AS (
select
EnrichedFullfacilitylist.MFLCode as MFLCode,
EnrichedFullfacilitylist.FacilityName as Facility,
EnrichedFullfacilitylist.Facility_Name as Facility,
EnrichedFullfacilitylist.SDIP,
EnrichedFullfacilitylist.EMR as EMR,
EnrichedFullfacilitylist.FacilityType,
Expand All @@ -195,7 +195,7 @@ export class GetArtVerificationPendingSurveysByPartnerHandler
coalesce(PaedsTXCurr_DWH,0) As PaedsTXCurr_DWH,
coalesce (count_AdultsTXCurDWH,0) As AdultsTxCurr_DWH,
coalesce (SurveysReceived,0) As SurveysReceived,
coalesce(verified_but_with_survey.count_of_patients,0) as patients_verified_but_with_survey
coalesce(verified_but_with_survey.count_of_patients,0) as patients_verified_but_with_survey
from EnrichedFullfacilitylist
left join khis on cast (khis.SiteCode as nvarchar) = cast (EnrichedFullfacilitylist.MFLCode as nvarchar)
full outer join dwh_nupi_by_facility on dwh_nupi_by_facility.MFLCode = EnrichedFullfacilitylist.MFLCode collate Latin1_General_CI_AS
Expand All @@ -207,10 +207,10 @@ export class GetArtVerificationPendingSurveysByPartnerHandler
left join nupi_overall on nupi_overall.facility_code=EnrichedFullfacilitylist.MFLCode collate Latin1_General_CI_AS
left join nupi_non_art_clients on nupi_non_art_clients.facility_code=EnrichedFullfacilitylist.MFLCode collate Latin1_General_CI_AS
left join PSurveys on PSurveys.MFLCode=EnrichedFullfacilitylist.MFLCode collate Latin1_General_CI_AS
left join verified_but_with_survey on verified_but_with_survey.mfl_code = EnrichedFullfacilitylist.MFLCode
left join verified_but_with_survey on verified_but_with_survey.mfl_code = EnrichedFullfacilitylist.MFLCode
group by
EnrichedFullfacilitylist.MFLCode,
EnrichedFullfacilitylist.FacilityName,
EnrichedFullfacilitylist.Facility_Name,
EnrichedFullfacilitylist.SDIP,
EnrichedFullfacilitylist.EMR,
EnrichedFullfacilitylist.FacilityType,
Expand All @@ -226,7 +226,7 @@ export class GetArtVerificationPendingSurveysByPartnerHandler
coalesce (PaedsTXCurr_DWH,0),
coalesce(count_AdultsTXCurDWH,0),
coalesce (SurveysReceived,0),
coalesce(verified_but_with_survey.count_of_patients,0)
coalesce(verified_but_with_survey.count_of_patients,0)
)
select
sum (count_patients_nupi_sent_to_dwh) As NupiVerified,
Expand Down
14 changes: 7 additions & 7 deletions src/care-treatment/art-verification/queries/handlers/get-art-verification-reasons.handler.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,24 +17,24 @@ export class GetArtVerificationReasonsHandler
let nonReasons = `
with EnrichedFullfacilitylist As (
Select
distinct cast(Allsites.MFLCode collate Latin1_General_CI_AS as nvarchar) as MFLCode,
Allsites.FacilityName,
distinct cast(Allsites.MFL_Code collate Latin1_General_CI_AS as nvarchar) as MFLCode,
Allsites.Facility_Name,
Allsites.County,
Allsites.FacilityType,
EMRs.SubCounty,
EMRs.EMR,
coalesce(EMRs.SDP, Allsites.SDIP) As SDIP,
coalesce(EMRs.[SDP Agency], Allsites.Agency) as Agency
coalesce(EMRs.SDP, Allsites.SDP) As SDIP,
coalesce(EMRs.[SDP_Agency], Allsites.SDP_Agency) as Agency
from HIS_Implementation.dbo.EMRandNonEMRSites as Allsites
left join HIS_Implementation.dbo.All_EMRSites EMRs on EMRs.MFL_Code=Allsites.MFLCode
left join ODS.dbo.All_EMRSites EMRs on EMRs.MFL_Code=Allsites.MFL_Code
),PSurveys as (
Select
*
FROM [pSurvey].[dbo].[stg_questionnaire_responses]
), FacilitySummary AS (
select
EnrichedFullfacilitylist.MFLCode as MFLCode,
EnrichedFullfacilitylist.FacilityName as Facility,
EnrichedFullfacilitylist.Facility_Name as Facility,
EnrichedFullfacilitylist.SDIP,
EnrichedFullfacilitylist.EMR as EMR,
EnrichedFullfacilitylist.SubCounty,
Expand All @@ -46,7 +46,7 @@ export class GetArtVerificationReasonsHandler
left join PSurveys on PSurveys.mfl_code=EnrichedFullfacilitylist.MFLCode collate Latin1_General_CI_AS
group by
EnrichedFullfacilitylist.MFLCode,
EnrichedFullfacilitylist.FacilityName,
EnrichedFullfacilitylist.Facility_Name,
EnrichedFullfacilitylist.SDIP,
EnrichedFullfacilitylist.EMR,
EnrichedFullfacilitylist.SubCounty,
Expand Down

0 comments on commit e206066

Please sign in to comment.