From a46bab60231d094c4f7ec1ba643cd1843d5992ad Mon Sep 17 00:00:00 2001
From: b-ngongonda <brightngongonda@gmail.com>
Date: Thu, 20 Feb 2025 09:37:19 +0200
Subject: [PATCH] MLW-1657: Add sickle cell encounter types to ncd diagnoses
 and visits tables

---
 .../malawi/schema/table/mw_ncd_visits.sql     |   2 +
 .../import-into-mw-ncd-diagnoses.ktr          |   2 +-
 .../transforms/import-into-mw-ncd-visits.ktr  | 182 ++++++++++++++++--
 3 files changed, 167 insertions(+), 19 deletions(-)

diff --git a/jobs/pentaho/malawi/schema/table/mw_ncd_visits.sql b/jobs/pentaho/malawi/schema/table/mw_ncd_visits.sql
index 19174ee..34a0d2f 100755
--- a/jobs/pentaho/malawi/schema/table/mw_ncd_visits.sql
+++ b/jobs/pentaho/malawi/schema/table/mw_ncd_visits.sql
@@ -21,6 +21,8 @@ create table mw_ncd_visits (
   chf_followup			     BOOLEAN,
   ncd_other_initial                 BOOLEAN,
   ncd_other_followup                BOOLEAN,
+  sickle_cell_initial               BOOLEAN,
+  sickle_cell_followup              BOOLEAN,
   next_appointment_date             DATE,
   systolic_bp                       DECIMAL(10,2),
   diastolic_bp                      DECIMAL(10,2),
diff --git a/jobs/pentaho/malawi/transforms/import-into-mw-ncd-diagnoses.ktr b/jobs/pentaho/malawi/transforms/import-into-mw-ncd-diagnoses.ktr
index 9a39fa3..6322ab3 100755
--- a/jobs/pentaho/malawi/transforms/import-into-mw-ncd-diagnoses.ktr
+++ b/jobs/pentaho/malawi/transforms/import-into-mw-ncd-diagnoses.ktr
@@ -726,7 +726,7 @@ from        omrs_obs o
 where 		o.concept = "Chronic care diagnosis"
 and encounter_type IN ("DIABETES HYPERTENSION INITIAL VISIT","CHRONIC_CARE_INITIAL",
 "MENTAL_HEALTH_INITIAL","EPILEPSY_INITIAL","CKD_INITIAL","CHF_INITIAL",
-"NCD_OTHER_INITIAL","ASTHMA_INITIAL")
+"NCD_OTHER_INITIAL","ASTHMA_INITIAL","SICKLE_CELL_DISEASE_INITIAL")
 order by 	patient_id, obs_group_id, encounter_type, location</sql>
     <limit>0</limit>
     <lookup/>
diff --git a/jobs/pentaho/malawi/transforms/import-into-mw-ncd-visits.ktr b/jobs/pentaho/malawi/transforms/import-into-mw-ncd-visits.ktr
index 656a7a6..a0fa6be 100755
--- a/jobs/pentaho/malawi/transforms/import-into-mw-ncd-visits.ktr
+++ b/jobs/pentaho/malawi/transforms/import-into-mw-ncd-visits.ktr
@@ -458,6 +458,8 @@
   chf_followup			     BOOLEAN,
   ncd_other_initial                 BOOLEAN,
   ncd_other_followup                BOOLEAN,
+  sickle_cell_initial               BOOLEAN,
+  sickle_cell_followup              BOOLEAN,
   next_appointment_date  DATE,
   systolic_bp            DOUBLE,
   diastolic_bp           DOUBLE,
@@ -468,7 +470,7 @@
       <xloc>976</xloc>
       <yloc>80</yloc>
       <width>452</width>
-      <heigth>503</heigth>
+      <heigth>537</heigth>
       <fontname>Ubuntu</fontname>
       <fontsize>11</fontsize>
       <fontbold>N</fontbold>
@@ -943,6 +945,12 @@ var chf_initial = visit_types.indexOf('CHF_INITIAL') != -1;
 var chf_followup = visit_types.indexOf('CHF_FOLLOWUP') != -1;
 var ncd_other_initial = visit_types.indexOf('NCD_OTHER_INITIAL') != -1;
 var ncd_other_followup = visit_types.indexOf('NCD_OTHER_FOLLOWUP') != -1;
+var sickle_cell_initial = visit_types.indexOf('SICKLE_CELL_DISEASE_INITIAL') != -1;
+var sickle_cell_followup = visit_types.indexOf('SICKLE_CELL_DISEASE_FOLLOWUP') != -1;
+
+
+
+
 </jsScript_script>
       </jsScript>
     </jsScripts>
@@ -1155,6 +1163,150 @@ var ncd_other_followup = visit_types.indexOf('NCD_OTHER_FOLLOWUP') != -1;
         <precision>-1</precision>
         <replace>N</replace>
       </field>
+      <field>
+        <name>cc_initial</name>
+        <rename>cc_initial</rename>
+        <type>Boolean</type>
+        <length>-1</length>
+        <precision>-1</precision>
+        <replace>N</replace>
+      </field>
+      <field>
+        <name>cc_followup</name>
+        <rename>cc_followup</rename>
+        <type>Boolean</type>
+        <length>-1</length>
+        <precision>-1</precision>
+        <replace>N</replace>
+      </field>
+      <field>
+        <name>diabetes_htn_initial</name>
+        <rename>diabetes_htn_initial</rename>
+        <type>Boolean</type>
+        <length>-1</length>
+        <precision>-1</precision>
+        <replace>N</replace>
+      </field>
+      <field>
+        <name>diabetes_htn_followup</name>
+        <rename>diabetes_htn_followup</rename>
+        <type>Boolean</type>
+        <length>-1</length>
+        <precision>-1</precision>
+        <replace>N</replace>
+      </field>
+      <field>
+        <name>asthma_initial</name>
+        <rename>asthma_initial</rename>
+        <type>Boolean</type>
+        <length>-1</length>
+        <precision>-1</precision>
+        <replace>N</replace>
+      </field>
+      <field>
+        <name>asthma_followup</name>
+        <rename>asthma_followup</rename>
+        <type>Boolean</type>
+        <length>-1</length>
+        <precision>-1</precision>
+        <replace>N</replace>
+      </field>
+      <field>
+        <name>epilepsy_initial</name>
+        <rename>epilepsy_initial</rename>
+        <type>Boolean</type>
+        <length>-1</length>
+        <precision>-1</precision>
+        <replace>N</replace>
+      </field>
+      <field>
+        <name>epilepsy_followup</name>
+        <rename>epilepsy_followup</rename>
+        <type>Boolean</type>
+        <length>-1</length>
+        <precision>-1</precision>
+        <replace>N</replace>
+      </field>
+      <field>
+        <name>mental_health_initial</name>
+        <rename>mental_health_initial</rename>
+        <type>Boolean</type>
+        <length>-1</length>
+        <precision>-1</precision>
+        <replace>N</replace>
+      </field>
+      <field>
+        <name>mental_health_followup</name>
+        <rename>mental_health_followup</rename>
+        <type>Boolean</type>
+        <length>-1</length>
+        <precision>-1</precision>
+        <replace>N</replace>
+      </field>
+      <field>
+        <name>ckd_initial</name>
+        <rename>ckd_initial</rename>
+        <type>Boolean</type>
+        <length>-1</length>
+        <precision>-1</precision>
+        <replace>N</replace>
+      </field>
+      <field>
+        <name>ckd_followup</name>
+        <rename>ckd_followup</rename>
+        <type>Boolean</type>
+        <length>-1</length>
+        <precision>-1</precision>
+        <replace>N</replace>
+      </field>
+      <field>
+        <name>chf_initial</name>
+        <rename>chf_initial</rename>
+        <type>Boolean</type>
+        <length>-1</length>
+        <precision>-1</precision>
+        <replace>N</replace>
+      </field>
+      <field>
+        <name>chf_followup</name>
+        <rename>chf_followup</rename>
+        <type>Boolean</type>
+        <length>-1</length>
+        <precision>-1</precision>
+        <replace>N</replace>
+      </field>
+      <field>
+        <name>ncd_other_initial</name>
+        <rename>ncd_other_initial</rename>
+        <type>Boolean</type>
+        <length>-1</length>
+        <precision>-1</precision>
+        <replace>N</replace>
+      </field>
+      <field>
+        <name>ncd_other_followup</name>
+        <rename>ncd_other_followup</rename>
+        <type>Boolean</type>
+        <length>-1</length>
+        <precision>-1</precision>
+        <replace>N</replace>
+      </field>
+      <field>
+        <name>sickle_cell_initial</name>
+        <rename>sickle_cell_initial</rename>
+        <type>Boolean</type>
+        <length>-1</length>
+        <precision>-1</precision>
+        <replace>N</replace>
+      </field>
+      <field>
+        <name>sickle_cell_followup</name>
+        <rename>sickle_cell_followup</rename>
+        <type>Boolean</type>
+        <length>-1</length>
+        <precision>-1</precision>
+        <replace>N</replace>
+      </field>
     </fields>
     <attributes/>
     <cluster_schema/>
@@ -1718,7 +1870,9 @@ where 		e.encounter_type in (
   'CHF_INITIAL',
   'CHF_FOLLOWUP',
   'NCD_OTHER_INITIAL',
-  'NCD_OTHER_FOLLOWUP'
+  'NCD_OTHER_FOLLOWUP',
+  'SICKLE_CELL_DISEASE_INITIAL',
+  'SICKLE_CELL_DISEASE_FOLLOWUP'
   
 )
 group by 	e.patient_id, e.encounter_date, e.location
@@ -2920,6 +3074,14 @@ order by 	patient_id, visit_date, location</sql>
         <column_name>ncd_other_followup</column_name>
         <stream_name>ncd_other_followup</stream_name>
       </field>
+      <field>
+        <column_name>sickle_cell_initial</column_name>
+        <stream_name>sickle_cell_initial</stream_name>
+      </field>
+      <field>
+        <column_name>sickle_cell_followup</column_name>
+        <stream_name>sickle_cell_followup</stream_name>
+      </field>
       <field>
         <column_name>next_appointment_date</column_name>
         <stream_name>next_appointment_date</stream_name>
@@ -2992,22 +3154,6 @@ order by 	patient_id, visit_date, location</sql>
         <column_name>num_seizures</column_name>
         <stream_name>num_seizures</stream_name>
       </field>
-      <field>
-        <column_name>seizure_activity</column_name>
-        <stream_name>seizure_activity_since_last_visit</stream_name>
-      </field>
-      <field>
-        <column_name>hospitalized_since_last_visit</column_name>
-        <stream_name>hospitalized</stream_name>
-      </field>
-      <field>
-        <column_name>hiv_result</column_name>
-        <stream_name>hiv_test_result</stream_name>
-      </field>
-      <field>
-        <column_name>foot_check</column_name>
-        <stream_name>foot_exam</stream_name>
-      </field>
     </fields>
     <attributes/>
     <cluster_schema/>