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

Cherry pick to dev branch #285

Open
wants to merge 15 commits into
base: dev
Choose a base branch
from
Open

Cherry pick to dev branch #285

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
b7b14c3
Added syphillis tests to lab extract etl
njorocs Aug 24, 2022
a79e7eb
Bug fix in lab_extract datatools
njorocs Aug 24, 2022
1adb172
KHP3-1725:Added missing translation for 1066 answer in enrolled on CPIMS
njorocs Aug 25, 2022
1ab9cef
Fixed Date last modified in OVC enrollment etl
njorocs Aug 25, 2022
f96e507
Adding reasons for poor adherence and specific reason in etl_prep_fol…
patryllus Aug 25, 2022
30c88e3
Fixed date mofified in allergies and CI and edverse_events
njorocs Aug 25, 2022
79e5281
Fixed bug in adverse events etl
njorocs Aug 25, 2022
d7c99f4
Added form colunm in etl_prep_followup to differentiate prepInitial a…
patryllus Aug 31, 2022
9e0e205
Added in etl_contact: kp patient type, transfer facility, date and en…
patryllus Sep 1, 2022
dc386c0
Added in etl_contact: priority population
patryllus Sep 2, 2022
f168404
Conflict resolution
njorocs Sep 2, 2022
85bb7d3
Conflict resolution 2
patryllus Sep 6, 2022
42888fd
Added implementing county, sub county and ward in etl_contact
patryllus Sep 7, 2022
09f7352
Conflict resolution date modified
patryllus Sep 14, 2022
1cc7db7
Removed conflict resolution messages on scheduled tasks
patryllus Sep 26, 2022
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
21 changes: 19 additions & 2 deletions omod/src/main/resources/sql/DDL.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1658,6 +1658,7 @@ SELECT "Successfully created etl_ART_preparation table";

CREATE TABLE kenyaemr_etl.etl_prep_followup (
uuid char(38),
form VARCHAR(50),
provider INT(11),
patient_id INT(11) NOT NULL,
visit_id INT(11),
Expand Down Expand Up @@ -1701,6 +1702,8 @@ SELECT "Successfully created etl_ART_preparation table";
hiv_signs VARCHAR(10),
adherence_counselled VARCHAR(10),
adherence_outcome VARCHAR(50),
poor_adherence_reasons varchar(255),
other_poor_adherence_reasons varchar(255),
prep_contraindications VARCHAR(255),
treatment_plan VARCHAR(255),
prescribed_PrEP VARCHAR(10),
Expand All @@ -1716,7 +1719,8 @@ SELECT "Successfully created etl_ART_preparation table";
CONSTRAINT FOREIGN KEY (patient_id) REFERENCES kenyaemr_etl.etl_patient_demographics(patient_id),
CONSTRAINT unique_uuid UNIQUE(uuid),
INDEX(visit_date),
INDEX(encounter_id)
INDEX(encounter_id),
INDEX(form)
);
SELECT "Successfully created etl_prep_followup table";

Expand Down Expand Up @@ -2115,7 +2119,15 @@ CREATE TABLE kenyaemr_etl.etl_patient_program (
encounter_provider INT(11),
date_created DATETIME NOT NULL,
date_last_modified DATETIME,
patient_type VARCHAR(50),
transfer_in_date DATE,
date_first_enrolled_in_kp DATE,
facility_transferred_from VARCHAR(255),
key_population_type VARCHAR(255),
priority_population_type VARCHAR(255),
implementation_county VARCHAR(200),
implementation_subcounty VARCHAR(200),
implementation_ward VARCHAR(200),
contacted_by_peducator VARCHAR(10),
program_name VARCHAR(255),
frequent_hotspot_name VARCHAR(255),
Expand All @@ -2135,7 +2147,12 @@ CREATE TABLE kenyaemr_etl.etl_patient_program (
CONSTRAINT unique_uuid UNIQUE(uuid),
index(client_id),
index(unique_identifier),
index(key_population_type)
index(key_population_type),
index(priority_population_type),
index(patient_type),
index(transfer_in_date),
index(date_first_enrolled_in_kp),
index(implementation_subcounty)
);

SELECT "Successfully created etl_contact table";
Expand Down
Loading