Skip to content

Commit

Permalink
Merge pull request AMPATH#676 from corneliouzbett/HIV-244
Browse files Browse the repository at this point in the history 
HIV-244: Added current regimen column to patient-list
  • Loading branch information
@theebruv
theebruv authored Jan 23, 2019
2 parents 23e8fe6 + eea29c9 commit b41fbda
Show file tree
Hide file tree
Showing 11 changed files with 3,627 additions and 3,876 deletions.
5 changes: 5 additions & 0 deletions app/reporting-framework/json-reports/main-dataset-base-age15.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,11 @@
"alias": "location_id",
"column": "hmsd.location_id"
},
{
"type": "simple_column",
"alias": "cur_arv_meds",
"column": "hmsd.cur_arv_meds"
},
{
"type": "derived_column",
"alias": "enrollment_date",
Expand Down
5 changes: 5 additions & 0 deletions app/reporting-framework/json-reports/main-dataset-base-age18.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,11 @@
"alias": "location_id",
"column": "hmsd.location_id"
},
{
"type": "simple_column",
"alias": "cur_arv_meds",
"column": "hmsd.cur_arv_meds"
},
{
"type": "derived_column",
"alias": "enrollment_date",
Expand Down
5 changes: 5 additions & 0 deletions app/reporting-framework/json-reports/main-dataset-base-blue-card.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,11 @@
"alias": "location",
"column": "l.name"
},
{
"type": "simple_column",
"alias": "cur_arv_meds",
"column": "hmsd.cur_arv_meds"
},
{
"type": "simple_column",
"alias": "location_id",
Expand Down
5 changes: 5 additions & 0 deletions app/reporting-framework/json-reports/main-dataset-base.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,11 @@
"alias": "location_id",
"column": "hmsd.location_id"
},
{
"type": "simple_column",
"alias": "cur_arv_meds",
"column": "hmsd.cur_arv_meds"
},
{
"type": "derived_column",
"alias": "enrollment_date",
Expand Down
5 changes: 5 additions & 0 deletions app/reporting-framework/json-reports/regimen-dataset-base.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,11 @@
"alias": "location",
"column": "l.name"
},
{
"type": "simple_column",
"alias": "cur_arv_meds",
"column": "hmsd.cur_arv_meds"
},
{
"type": "simple_column",
"alias": "arv_first_regimen_location_id",
Expand Down
5 changes: 5 additions & 0 deletions app/reporting-framework/json-reports/retention-dataset-base.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,11 @@
"alias": "age",
"column": "hmsd.age"
},
{
"type": "simple_column",
"alias": "cur_arv_meds",
"column": "hmsd.cur_arv_meds"
},
{
"type": "derived_column",
"alias": "enrollment_date",
Expand Down
5 changes: 5 additions & 0 deletions app/reporting-framework/json-reports/starting-art-base-age-green.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,11 @@
"alias": "location",
"column": "l.name"
},
{
"type": "simple_column",
"alias": "cur_arv_meds",
"column": "hmsd.cur_arv_meds"
},
{
"type": "derived_column",
"alias": "enrollment_date",
Expand Down
5 changes: 5 additions & 0 deletions app/reporting-framework/json-reports/starting-art-base-age15.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,11 @@
"alias": "location",
"column": "l.name"
},
{
"type": "simple_column",
"alias": "cur_arv_meds",
"column": "hmsd.cur_arv_meds"
},
{
"type": "derived_column",
"alias": "enrollment_date",
Expand Down
118 changes: 114 additions & 4 deletions app/reporting-framework/multi-dataset-patientlist.report.js
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,60 @@
import { Promise } from 'bluebird';
import { MultiDatasetReport } from './multi-dataset.report';
import { PatientlistMysqlReport } from './patientlist-mysql.report';
import { interfaces } from 'mocha';
var helpers = require('../../etl-helpers');

let mockPatientList = [
{
gender: 'F',
birthdate: '1959-12-31T21:00:00.000Z',
age: 58,
person_id: 761391,
location_uuid: '0900abdc-1352-11df-a1f1-0026b9348838',
location: 'Moi University',
location_id: 72,
cur_arv_meds: '628 ## 633 ## 797',
enrollment_date: '22-12-2008',
arv_first_regimen_start_date: '01-01-1900',
cur_regimen_arv_start_date: '17-10-2017',
cur_arv_line: 1,
vl_1: 6730,
vl_1_date: '19-02-2018',
age_range: 'older_than_24',
enrolled_this_month: 0,
art_revisit_this_month: 1,
current_in_care: 1,
pre_art: 0,
started_art_pregnant: 0,
started_art_and_has_tb: 0,
active_on_art: 1,
on_ctx_prophylaxis: 1,
current_on_art: 1,
screened_for_tb: 1,
tb_screened_this_visit_this_month: 1,
tb_screened_positive: 0,
screened_for_cervical_ca: 0,
started_ipt: 0,
completed_ipt_past_12_months: 0,
condoms_provided: 0,
started_modern_contraception: 0,
on_modern_contraception: 0,
scheduled_visits: 0,
unscheduled_visits: 1,
total_visits: 1,
f_gte_18_visits: 1,
patient_uuid: '8d9f8be2-e772-49ef-94c1-2f3560739162',
uuid: '8d9f8be2-e772-49ef-94c1-2f3560739162',
person_name: 'LILY CHEBET MITEI',
identifiers: '256MU-8, 15205-00086'
}
]

export class MultiDatasetPatientlistReport extends MultiDatasetReport {
constructor(reportName, params) {
super(reportName, params);
}

// interprate
generatePatientListReport(indicators) {
let additionalParams = {
type: 'patient-list',
Expand All @@ -17,14 +65,18 @@ export class MultiDatasetPatientlistReport extends MultiDatasetReport {
return new Promise((resolve, reject) => {
this.generateReport(additionalParams).
then((results) => {

for (let i = 0; i < results.length; i++) {
if (results[i].results && results[i].results.results && results[i].results.results.results) {

let datta = this.interprateCurrentArvMeds(results[i].results.results.results);

resolve({
result: results[i].results.results.results,
result: datta,
queriesAndSchemas: results[i],
indicators: indicators,
size: that.params.limit,
startIndex : that.params.startIndex,
startIndex: that.params.startIndex,
allResults: results
});
break;
Expand All @@ -38,6 +90,64 @@ export class MultiDatasetPatientlistReport extends MultiDatasetReport {
});
}

transformedPatientlistResults(results){
return _.reduce(results, helpers.getARVNames(results.cur_arv_meds) );

}

interprateCurrentArvMeds(result) {
let transformedResults = [];

result.forEach((element) => {
let dataObject = {};
dataObject['gender'] = element.gender,
dataObject['birthdate'] = element.birthdate,
dataObject['age'] = element.age,
dataObject['person_id'] = element.person_id,
dataObject['location_uuid'] = element.location_uuid,
dataObject['location'] = element.location,
dataObject['location_id'] = element.location_id,
dataObject['cur_arv_meds'] = helpers.getARVNames(element.cur_arv_meds),
dataObject['enrollment_date'] = element.enrollment_date,
dataObject['arv_first_regimen_start_date'] = element.arv_first_regimen_start_date,
dataObject['cur_regimen_arv_start_date'] = element.cur_regimen_arv_start_date,
dataObject['cur_arv_line'] = element.cur_arv_line,
dataObject['vl_1'] = element.vl_1,
dataObject['vl_1_date'] = element.vl_1_date,
dataObject['age_range'] = element.age_range,
dataObject['enrolled_this_month'] = element.enrolled_this_month,
dataObject['art_revisit_this_month'] = element.art_revisit_this_month,
dataObject['current_in_care'] = element.current_in_care,
dataObject['pre_art'] = element.pre_art,
dataObject['started_art_pregnant'] = element.started_art_pregnant,
dataObject['started_art_and_has_tb'] = element.started_art_and_has_tb,
dataObject['active_on_art'] = element.active_on_art,
dataObject['on_ctx_prophylaxis'] = element.on_ctx_prophylaxis,
dataObject['current_on_art'] = element.current_on_art,
dataObject['screened_for_tb'] = element.screened_for_tb,
dataObject['screened_for_tb_blue'] = element.screened_for_tb_blue,
dataObject['tb_screened_positive'] = element.tb_screened_positive,
dataObject['screened_for_cervical_ca'] = element.screened_for_cervical_ca,
dataObject['started_ipt'] = element.started_ipt,
dataObject['completed_ipt_past_12_months'] = element.completed_ipt_past_12_months,
dataObject['condoms_provided'] = element.condoms_provided,
dataObject['age_rstarted_modern_contraceptionange'] = element.started_modern_contraception,
dataObject['on_modern_contraception'] = element.on_modern_contraception,
dataObject['scheduled_visits'] = element.scheduled_visits,
dataObject['unscheduled_visits'] = element.unscheduled_visits,
dataObject['total_visits'] = element.total_visits,
dataObject['f_gte_18_visits'] = element.f_gte_18_visits,
dataObject['patient_uuid'] = element.patient_uuid,
dataObject['uuid'] = element.uuid,
dataObject['person_name'] = element.person_name,
dataObject['identifiers'] = element.identifiers

transformedResults.push(dataObject);
})
return transformedResults;

}

getReportHandler(reportName, params) {
return new PatientlistMysqlReport(reportName, params);
}
Expand All @@ -48,4 +158,4 @@ export class MultiDatasetPatientlistReport extends MultiDatasetReport {
}
return reportObject.generateReport();
}
}
}
22 changes: 11 additions & 11 deletions app/reporting-framework/multi-dataset.report.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,15 +67,15 @@ export class MultiDatasetReport extends BaseMysqlReport {
let results = [];

Promise.reduce(reportHandlers, (previous, currentReport) => {
return new Promise((res, rej) => {
that.runSingleReport(currentReport, additionalParams)
.then((result) => {
let toAdd = results.push({
report: currentReport,
results: result
});
res(toAdd);
}).
return new Promise((res, rej) => {
that.runSingleReport(currentReport, additionalParams)
.then((result) => {
let toAdd = results.push({
report: currentReport,
results: result
});
res(toAdd);
}).
catch((err) => {
console.error('Error occured while fetching report', err);
let toAdd = results.push({
Expand All @@ -84,8 +84,8 @@ export class MultiDatasetReport extends BaseMysqlReport {
});
res(toAdd);
});
})
}, 0)
})
}, 0)
.then((res) => {
resolve(results);
})
Expand Down
Loading

0 comments on commit b41fbda

Please sign in to comment.