diff --git a/opensrp-chw/src/main/java/org/smartregister/chw/util/ChwQueryConstant.java b/opensrp-chw/src/main/java/org/smartregister/chw/util/ChwQueryConstant.java index 2c730e1c65..965772d2d6 100644 --- a/opensrp-chw/src/main/java/org/smartregister/chw/util/ChwQueryConstant.java +++ b/opensrp-chw/src/main/java/org/smartregister/chw/util/ChwQueryConstant.java @@ -41,7 +41,7 @@ public interface ChwQueryConstant { " SELECT ec_malaria_confirmation.base_entity_id AS base_entity_id\n" + " FROM ec_malaria_confirmation\n" + " WHERE datetime('NOW') <= datetime(ec_malaria_confirmation.last_interacted_with/1000, 'unixepoch', 'localtime','+15 days')\n" + - " AND ec_malaria_confirmation.is_closed = 0 AND ec_malaria_confirmation.malaria = 1 \n" + + " AND ec_malaria_confirmation.is_closed = 0 \n" + " UNION ALL\n" + " SELECT ec_family_planning.base_entity_id AS base_entity_id\n" + " FROM ec_family_planning\n" + @@ -138,7 +138,7 @@ public interface ChwQueryConstant { " SELECT ec_malaria_confirmation.base_entity_id AS base_entity_id\n" + " FROM ec_malaria_confirmation\n" + " WHERE datetime('NOW') <= datetime(ec_malaria_confirmation.last_interacted_with/1000, 'unixepoch', 'localtime','+15 days')\n" + - " AND ec_malaria_confirmation.is_closed = 0 AND ec_malaria_confirmation.malaria = 1 \n" + + " AND ec_malaria_confirmation.is_closed = 0 \n" + " UNION ALL\n" + " SELECT ec_family_planning.base_entity_id AS base_entity_id\n" + " FROM ec_family_planning\n" + @@ -296,7 +296,7 @@ public interface ChwQueryConstant { " on ec_family_member.base_entity_id = ec_malaria_confirmation.base_entity_id\n" + "where ec_family_member.date_removed is null\n" + " AND datetime('NOW') <= datetime(ec_malaria_confirmation.last_interacted_with/1000, 'unixepoch', 'localtime','+15 days')\n" + - " AND ec_malaria_confirmation.is_closed = 0 AND ec_malaria_confirmation.malaria = 1 \n" + + " AND ec_malaria_confirmation.is_closed = 0 \n" + " AND ec_family_member.base_entity_id IN (%s)\n" + " AND ec_family_member.base_entity_id NOT IN (\n" + " SELECT ec_agyw_register.base_entity_id AS base_entity_id\n" + diff --git a/opensrp-chw/src/nacp/assets/ec_client_fields.json b/opensrp-chw/src/nacp/assets/ec_client_fields.json index 01ad2e59d2..90e5feaad1 100644 --- a/opensrp-chw/src/nacp/assets/ec_client_fields.json +++ b/opensrp-chw/src/nacp/assets/ec_client_fields.json @@ -1033,7 +1033,7 @@ "type": "Event", "json_mapping": { "field": "obs.fieldCode", - "concept": "162869AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA" + "concept": "date_chw_malaria_test" } }, { @@ -1057,7 +1057,7 @@ "type": "Event", "json_mapping": { "field": "obs.fieldCode", - "concept": "1731AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA" + "concept": "fever_duration" } }, { @@ -1073,7 +1073,7 @@ "type": "Event", "json_mapping": { "field": "obs.fieldCode", - "concept": "1643AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA" + "concept": "malaria_results" } }, { @@ -1089,7 +1089,7 @@ "type": "Event", "json_mapping": { "field": "obs.fieldCode", - "concept": "163724AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA" + "concept": "malaria_test_date" } }, { @@ -1097,7 +1097,7 @@ "type": "Event", "json_mapping": { "field": "obs.fieldCode", - "concept": "163725AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA" + "concept": "malaria" } }, { @@ -1774,7 +1774,7 @@ "type": "Event", "json_mapping": { "field": "obs.fieldCode", - "concept": "165273AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA" + "concept": "service_before_malaria" } }, { @@ -1782,7 +1782,7 @@ "type": "Event", "json_mapping": { "field": "obs.fieldCode", - "concept": "160632AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA" + "concept": "service_before_malaria_other" } } ] diff --git a/opensrp-chw/src/nacp/assets/json.form-sw/malaria_confirmation.json b/opensrp-chw/src/nacp/assets/json.form-sw/malaria_confirmation.json index 490dda4dee..bc7b75a7e3 100644 --- a/opensrp-chw/src/nacp/assets/json.form-sw/malaria_confirmation.json +++ b/opensrp-chw/src/nacp/assets/json.form-sw/malaria_confirmation.json @@ -58,7 +58,7 @@ "key": "date_chw_malaria_test", "openmrs_entity_parent": "", "openmrs_entity": "concept", - "openmrs_entity_id": "162869AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", + "openmrs_entity_id": "date_chw_malaria_test", "hidden": "true", "type": "edit_text", "calculation": { @@ -111,7 +111,7 @@ "key": "fever_duration", "openmrs_entity_parent": "", "openmrs_entity": "concept", - "openmrs_entity_id": "1731AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", + "openmrs_entity_id": "fever_duration", "type": "spinner", "hint": "Umekuwa na Homa kwa muda gani?", "values": [ @@ -161,7 +161,7 @@ "key": "malaria_results", "openmrs_entity_parent": "", "openmrs_entity": "concept", - "openmrs_entity_id": "1643AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", + "openmrs_entity_id": "malaria_results", "type": "spinner", "hint": "Majibu ya mRDT", "values": [ @@ -209,7 +209,7 @@ "key": "malaria_test_date", "openmrs_entity_parent": "", "openmrs_entity": "concept", - "openmrs_entity_id": "163724AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", + "openmrs_entity_id": "malaria_test_date", "hidden": "true", "type": "edit_text", "calculation": { @@ -224,7 +224,7 @@ "key": "malaria", "openmrs_entity_parent": "", "openmrs_entity": "concept", - "openmrs_entity_id": "163725AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", + "openmrs_entity_id": "malaria", "hidden": "true", "type": "edit_text", "calculation": { @@ -251,12 +251,12 @@ "Matibabu mengine" ], "openmrs_choice_ids": { - "ALU 6": "1072AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", - "ALU 12": "1072AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", - "ALU 18": "1072AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", - "ALU 24": "1072AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", - "Not given": "164369AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", - "Other treatment": "5622AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA" + "ALU 6": "ALU 6", + "ALU 12": "ALU 12", + "ALU 18": "ALU 18", + "ALU 24": "ALU 24", + "Not given": "Not given", + "Other treatment": "Other treatment" }, "v_required": { "value": "true", @@ -304,8 +304,8 @@ "Hapana" ], "openmrs_choice_ids": { - "Yes": "1065AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", - "No": "1066AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA" + "Yes": "Yes", + "No": "No" }, "v_required": { "value": "true", @@ -324,8 +324,8 @@ "Hapana" ], "openmrs_choice_ids": { - "Yes": "1065AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", - "No": "1066AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA" + "Yes": "Yes", + "No": "No" }, "v_required": { "value": "true", @@ -351,8 +351,8 @@ "Mbaya" ], "openmrs_choice_ids": { - "Okay": "1065AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", - "Bad": "1066AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA" + "Okay": "Okay", + "Bad": "Bad" }, "v_required": { "value": "true", @@ -384,31 +384,31 @@ "key": "overview_on_malaria", "text": "Mukhutasari juu ya Malaria", "openmrs_entity": "concept", - "openmrs_entity_id": "1379AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA" + "openmrs_entity_id": "overview_on_malaria" }, { "key": "malaria_prevention", "text": "Jinsi ya Kujikinga na Malaria", "openmrs_entity": "concept", - "openmrs_entity_id": "164884AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA" + "openmrs_entity_id": "malaria_prevention" }, { "key": "uncomplicated_malaria", "text": "Malaria ya kawaida", "openmrs_entity": "concept", - "openmrs_entity_id": "159950AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA" + "openmrs_entity_id": "uncomplicated_malaria" }, { "key": "Severe_malaria", "text": "Malaria kali", "openmrs_entity": "concept", - "openmrs_entity_id": "160155AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA" + "openmrs_entity_id": "Severe_malaria" }, { "key": "malaria_in_pregnancy", "text": "Malaria katika Ujauzito", "openmrs_entity": "concept", - "openmrs_entity_id": "135361AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA" + "openmrs_entity_id": "malaria_in_pregnancy" }, { "key": "chk_none", diff --git a/opensrp-chw/src/nacp/assets/json.form-sw/referrals/malaria_referral_form.json b/opensrp-chw/src/nacp/assets/json.form-sw/referrals/malaria_referral_form.json index 73d69c02ae..26ac83d1a2 100644 --- a/opensrp-chw/src/nacp/assets/json.form-sw/referrals/malaria_referral_form.json +++ b/opensrp-chw/src/nacp/assets/json.form-sw/referrals/malaria_referral_form.json @@ -73,7 +73,7 @@ "text": "Homa", "meta_data": { "openmrs_entity": "", - "openmrs_entity_id": "140238AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", + "openmrs_entity_id": "Fever", "openmrs_entity_parent": "" } }, @@ -82,7 +82,7 @@ "text": "Kuharisha", "meta_data": { "openmrs_entity": "", - "openmrs_entity_id": "142412AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", + "openmrs_entity_id": "Diarrhea", "openmrs_entity_parent": "" } }, @@ -91,7 +91,7 @@ "text": "Kutapika", "meta_data": { "openmrs_entity": "", - "openmrs_entity_id": "122983AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", + "openmrs_entity_id": "Vomiting", "openmrs_entity_parent": "" } }, @@ -100,7 +100,7 @@ "text": "Kichefuchefu", "meta_data": { "openmrs_entity": "", - "openmrs_entity_id": "5978AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", + "openmrs_entity_id": "Nausea", "openmrs_entity_parent": "" } }, @@ -109,7 +109,7 @@ "text": "Kutetemeka", "meta_data": { "openmrs_entity": "", - "openmrs_entity_id": "158359AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", + "openmrs_entity_id": "Trembling", "openmrs_entity_parent": "" } }, @@ -118,7 +118,7 @@ "text": "Maumivu makali ya kichwa / kizunguzungu", "meta_data": { "openmrs_entity": "", - "openmrs_entity_id": "139081AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", + "openmrs_entity_id": "A_severe_headache_dizziness", "openmrs_entity_parent": "" } }, @@ -127,7 +127,7 @@ "text": "Kutoka jasho", "meta_data": { "openmrs_entity": "", - "openmrs_entity_id": "140941AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", + "openmrs_entity_id": "Sweating", "openmrs_entity_parent": "" } }, @@ -136,7 +136,7 @@ "text": "Maumivu makali ya tumbo", "meta_data": { "openmrs_entity": "", - "openmrs_entity_id": "165271AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", + "openmrs_entity_id": "Severe_abdominal_pain", "openmrs_entity_parent": "" } }, @@ -145,7 +145,7 @@ "text": "Maumivu ya misuli", "meta_data": { "openmrs_entity": "", - "openmrs_entity_id": "133632AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", + "openmrs_entity_id": "Muscle_pain", "openmrs_entity_parent": "" } }, @@ -154,7 +154,7 @@ "text": "Kuvimba uso na / au mikono", "meta_data": { "openmrs_entity": "", - "openmrs_entity_id": "163894AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", + "openmrs_entity_id": "Sweling_of_the_face_and_or_hands", "openmrs_entity_parent": "" } }, @@ -163,7 +163,7 @@ "text": "Kushindwa kupumua", "meta_data": { "openmrs_entity": "", - "openmrs_entity_id": "142373AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", + "openmrs_entity_id": "Difficult_in_breathing_fast_and_laboured_breathing", "openmrs_entity_parent": "" } }, @@ -172,7 +172,7 @@ "text": "Degedege/ Mtukutiko wa mwili", "meta_data": { "openmrs_entity": "", - "openmrs_entity_id": "113054AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", + "openmrs_entity_id": "Convulsions", "openmrs_entity_parent": "" } }, @@ -181,7 +181,7 @@ "text": "Kulegea", "meta_data": { "openmrs_entity": "", - "openmrs_entity_id": "5226AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", + "openmrs_entity_id": "Very_weak", "openmrs_entity_parent": "" } }, @@ -190,7 +190,7 @@ "text": "Kukereka kirahisi", "meta_data": { "openmrs_entity": "", - "openmrs_entity_id": "118296AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", + "openmrs_entity_id": "Irritable_easily_disturbed", "openmrs_entity_parent": "" } }, @@ -199,7 +199,7 @@ "text": "Kukosa fahamu", "meta_data": { "openmrs_entity": "", - "openmrs_entity_id": "123818AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", + "openmrs_entity_id": "Unconcious", "openmrs_entity_parent": "" } }, @@ -208,7 +208,7 @@ "text": "Kulala kusiko kwa kawaida", "meta_data": { "openmrs_entity": "", - "openmrs_entity_id": "117417AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", + "openmrs_entity_id": "Unusually_sleepy", "openmrs_entity_parent": "" } }, @@ -217,7 +217,7 @@ "text": "Shingo kukakamaa", "meta_data": { "openmrs_entity": "", - "openmrs_entity_id": "112721AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", + "openmrs_entity_id": "Neck_stiffness", "openmrs_entity_parent": "" } }, @@ -226,7 +226,7 @@ "text": "Kushindwa kukaa bila msaada", "meta_data": { "openmrs_entity": "", - "openmrs_entity_id": "123833AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", + "openmrs_entity_id": "Unable_to_sit_without_support", "openmrs_entity_parent": "" } }, @@ -235,7 +235,7 @@ "text": "Kutokwa na damu au mkojo wenye damu", "meta_data": { "openmrs_entity": "", - "openmrs_entity_id": "147241AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", + "openmrs_entity_id": "Abnormal_bleeding_or_passing_of_urine_with_blood", "openmrs_entity_parent": "" } }, @@ -244,7 +244,7 @@ "text": "Upungufu mkubwa wa damu", "meta_data": { "openmrs_entity": "", - "openmrs_entity_id": "162044AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", + "openmrs_entity_id": "Severe_anaemia_pale_palms_and_inner_eyelids", "openmrs_entity_parent": "" } }, @@ -253,7 +253,7 @@ "text": "Macho kuwa ya njano", "meta_data": { "openmrs_entity": "", - "openmrs_entity_id": "136443AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", + "openmrs_entity_id": "Yellowing_of_the_eyes_jaundice", "openmrs_entity_parent": "" } }, @@ -262,7 +262,7 @@ "text": "Utapiamlo mkali", "meta_data": { "openmrs_entity": "", - "openmrs_entity_id": "163302AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", + "openmrs_entity_id": "Severe_malnutrition", "openmrs_entity_parent": "" } }, @@ -271,7 +271,7 @@ "text": "Tumbo kujaa", "meta_data": { "openmrs_entity": "", - "openmrs_entity_id": "147132AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", + "openmrs_entity_id": "Bloating", "openmrs_entity_parent": "" } } @@ -301,7 +301,7 @@ "text": "Rectal artesunate", "meta_data": { "openmrs_entity": "", - "openmrs_entity_id": "71561AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", + "openmrs_entity_id": "Rectal_artesunate", "openmrs_entity_parent": "" } }, @@ -310,7 +310,7 @@ "text": "Panadol", "meta_data": { "openmrs_entity": "", - "openmrs_entity_id": "70116AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", + "openmrs_entity_id": "Panadol", "openmrs_entity_parent": "" } }, @@ -319,7 +319,7 @@ "text": "ORS", "meta_data": { "openmrs_entity": "", - "openmrs_entity_id": "351AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", + "openmrs_entity_id": "ORS", "openmrs_entity_parent": "" } }, @@ -328,7 +328,7 @@ "text": "Matibabu mengine", "meta_data": { "openmrs_entity": "", - "openmrs_entity_id": "5622AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", + "openmrs_entity_id": "Other_treatment", "openmrs_entity_parent": "" } }, diff --git a/opensrp-chw/src/nacp/assets/json.form/malaria_confirmation.json b/opensrp-chw/src/nacp/assets/json.form/malaria_confirmation.json index 77c8ddedc0..444c72d12a 100644 --- a/opensrp-chw/src/nacp/assets/json.form/malaria_confirmation.json +++ b/opensrp-chw/src/nacp/assets/json.form/malaria_confirmation.json @@ -58,7 +58,7 @@ "key": "date_chw_malaria_test", "openmrs_entity_parent": "", "openmrs_entity": "concept", - "openmrs_entity_id": "162869AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", + "openmrs_entity_id": "date_chw_malaria_test", "hidden": "true", "type": "edit_text", "calculation": { @@ -111,7 +111,7 @@ "key": "fever_duration", "openmrs_entity_parent": "", "openmrs_entity": "concept", - "openmrs_entity_id": "1731AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", + "openmrs_entity_id": "fever_duration", "type": "spinner", "hint": "Duration of fever?", "values": [ @@ -119,8 +119,8 @@ "More than 24 hrs" ], "openmrs_choice_ids": { - "Less than 24 hrs": "164449AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", - "More than 24 hrs": "164449AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA" + "Less than 24 hrs": "Less than 24 hrs", + "More than 24 hrs": "More than 24 hrs" }, "v_required": { "value": "true", @@ -161,7 +161,7 @@ "key": "malaria_results", "openmrs_entity_parent": "", "openmrs_entity": "concept", - "openmrs_entity_id": "1643AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", + "openmrs_entity_id": "malaria_results", "type": "spinner", "hint": "mRDT results", "values": [ @@ -169,8 +169,8 @@ "Negative" ], "openmrs_choice_ids": { - "Positive": "703AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", - "Negative": "664AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA" + "Positive": "Positive", + "Negative": "Negative" }, "v_required": { "value": "true", @@ -209,7 +209,7 @@ "key": "malaria_test_date", "openmrs_entity_parent": "", "openmrs_entity": "concept", - "openmrs_entity_id": "163724AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", + "openmrs_entity_id": "malaria_test_date", "hidden": "true", "type": "edit_text", "calculation": { @@ -224,7 +224,7 @@ "key": "malaria", "openmrs_entity_parent": "", "openmrs_entity": "concept", - "openmrs_entity_id": "163725AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", + "openmrs_entity_id": "malaria", "hidden": "true", "type": "edit_text", "calculation": { @@ -251,12 +251,12 @@ "Other treatment" ], "openmrs_choice_ids": { - "ALU 6": "1072AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", - "ALU 12": "1072AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", - "ALU 18": "1072AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", - "ALU 24": "1072AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", - "Not given": "164369AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", - "Other treatment": "5622AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA" + "ALU 6": "ALU 6", + "ALU 12": "ALU 12", + "ALU 18": "ALU 18", + "ALU 24": "ALU 24", + "Not given": "Not given", + "Other treatment": "Other treatment" }, "v_required": { "value": "true", @@ -304,8 +304,8 @@ "No" ], "openmrs_choice_ids": { - "Yes": "1065AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", - "No": "1066AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA" + "Yes": "Yes", + "No": "No" }, "v_required": { "value": "true", @@ -324,8 +324,8 @@ "No" ], "openmrs_choice_ids": { - "Yes": "1065AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", - "No": "1066AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA" + "Yes": "Yes", + "No": "No" }, "v_required": { "value": "true", @@ -351,8 +351,8 @@ "Bad" ], "openmrs_choice_ids": { - "Okay": "1065AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", - "Bad": "1066AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA" + "Okay": "Okay", + "Bad": "Bad" }, "v_required": { "value": "true", @@ -384,31 +384,31 @@ "key": "overview_on_malaria", "text": "Overview on malaria", "openmrs_entity": "concept", - "openmrs_entity_id": "1379AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA" + "openmrs_entity_id": "overview_on_malaria" }, { "key": "malaria_prevention", "text": "Malaria prevention", "openmrs_entity": "concept", - "openmrs_entity_id": "164884AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA" + "openmrs_entity_id": "malaria_prevention" }, { "key": "uncomplicated_malaria", "text": "Uncomplicated malaria", "openmrs_entity": "concept", - "openmrs_entity_id": "159950AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA" + "openmrs_entity_id": "uncomplicated_malaria" }, { "key": "Severe_malaria", "text": "Severe malaria", "openmrs_entity": "concept", - "openmrs_entity_id": "160155AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA" + "openmrs_entity_id": "Severe_malaria" }, { "key": "malaria_in_pregnancy", "text": "Malaria in pregnancy", "openmrs_entity": "concept", - "openmrs_entity_id": "135361AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA" + "openmrs_entity_id": "malaria_in_pregnancy" }, { "key": "chk_none", diff --git a/opensrp-chw/src/nacp/assets/json.form/referrals/malaria_referral_form.json b/opensrp-chw/src/nacp/assets/json.form/referrals/malaria_referral_form.json index c2d9dada9a..0407e8cf20 100644 --- a/opensrp-chw/src/nacp/assets/json.form/referrals/malaria_referral_form.json +++ b/opensrp-chw/src/nacp/assets/json.form/referrals/malaria_referral_form.json @@ -73,7 +73,7 @@ "text": "Fever", "meta_data": { "openmrs_entity": "", - "openmrs_entity_id": "140238AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", + "openmrs_entity_id": "Fever", "openmrs_entity_parent": "" } }, @@ -82,7 +82,7 @@ "text": "Diarrhea", "meta_data": { "openmrs_entity": "", - "openmrs_entity_id": "142412AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", + "openmrs_entity_id": "Diarrhea", "openmrs_entity_parent": "" } }, @@ -91,7 +91,7 @@ "text": "Vomiting", "meta_data": { "openmrs_entity": "", - "openmrs_entity_id": "122983AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", + "openmrs_entity_id": "Vomiting", "openmrs_entity_parent": "" } }, @@ -100,7 +100,7 @@ "text": "Nausea", "meta_data": { "openmrs_entity": "", - "openmrs_entity_id": "5978AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", + "openmrs_entity_id": "Nausea", "openmrs_entity_parent": "" } }, @@ -109,7 +109,7 @@ "text": "Trembling, shivering", "meta_data": { "openmrs_entity": "", - "openmrs_entity_id": "158359AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", + "openmrs_entity_id": "Trembling", "openmrs_entity_parent": "" } }, @@ -118,7 +118,7 @@ "text": "A severe headache / dizziness", "meta_data": { "openmrs_entity": "", - "openmrs_entity_id": "139081AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", + "openmrs_entity_id": "A_severe_headache_dizziness", "openmrs_entity_parent": "" } }, @@ -127,7 +127,7 @@ "text": "Sweating", "meta_data": { "openmrs_entity": "", - "openmrs_entity_id": "140941AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", + "openmrs_entity_id": "Sweating", "openmrs_entity_parent": "" } }, @@ -136,7 +136,7 @@ "text": "Severe abdominal pain", "meta_data": { "openmrs_entity": "", - "openmrs_entity_id": "165271AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", + "openmrs_entity_id": "Severe_abdominal_pain", "openmrs_entity_parent": "" } }, @@ -145,7 +145,7 @@ "text": "Muscle pain", "meta_data": { "openmrs_entity": "", - "openmrs_entity_id": "133632AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", + "openmrs_entity_id": "Muscle_pain", "openmrs_entity_parent": "" } }, @@ -154,7 +154,7 @@ "text": "Sweling of the face and/or hands", "meta_data": { "openmrs_entity": "", - "openmrs_entity_id": "163894AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", + "openmrs_entity_id": "Sweling_of_the_face_and_or_hands", "openmrs_entity_parent": "" } }, @@ -163,7 +163,7 @@ "text": "Difficult in breathing (fast and laboured breathing)", "meta_data": { "openmrs_entity": "", - "openmrs_entity_id": "142373AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", + "openmrs_entity_id": "Difficult_in_breathing_fast_and_laboured_breathing", "openmrs_entity_parent": "" } }, @@ -172,7 +172,7 @@ "text": "Convulsions", "meta_data": { "openmrs_entity": "", - "openmrs_entity_id": "113054AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", + "openmrs_entity_id": "Convulsions", "openmrs_entity_parent": "" } }, @@ -181,7 +181,7 @@ "text": "Very weak", "meta_data": { "openmrs_entity": "", - "openmrs_entity_id": "5226AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", + "openmrs_entity_id": "Very_weak", "openmrs_entity_parent": "" } }, @@ -190,7 +190,7 @@ "text": "Irritable (easily disturbed)", "meta_data": { "openmrs_entity": "", - "openmrs_entity_id": "118296AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", + "openmrs_entity_id": "Irritable_easily_disturbed", "openmrs_entity_parent": "" } }, @@ -199,7 +199,7 @@ "text": "Unconcious", "meta_data": { "openmrs_entity": "", - "openmrs_entity_id": "123818AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", + "openmrs_entity_id": "Unconcious", "openmrs_entity_parent": "" } }, @@ -208,7 +208,7 @@ "text": "Unusually sleepy", "meta_data": { "openmrs_entity": "", - "openmrs_entity_id": "117417AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", + "openmrs_entity_id": "Unusually_sleepy", "openmrs_entity_parent": "" } }, @@ -217,7 +217,7 @@ "text": "Neck stiffness", "meta_data": { "openmrs_entity": "", - "openmrs_entity_id": "112721AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", + "openmrs_entity_id": "Neck_stiffness", "openmrs_entity_parent": "" } }, @@ -226,7 +226,7 @@ "text": "Unable to sit without support", "meta_data": { "openmrs_entity": "", - "openmrs_entity_id": "123833AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", + "openmrs_entity_id": "Unable_to_sit_without_support", "openmrs_entity_parent": "" } }, @@ -235,7 +235,7 @@ "text": "Abnormal bleeding or passing of urine with blood", "meta_data": { "openmrs_entity": "", - "openmrs_entity_id": "147241AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", + "openmrs_entity_id": "Abnormal_bleeding_or_passing_of_urine_with_blood", "openmrs_entity_parent": "" } }, @@ -244,7 +244,7 @@ "text": "Severe anaemia (pale palms and inner eyelids)", "meta_data": { "openmrs_entity": "", - "openmrs_entity_id": "162044AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", + "openmrs_entity_id": "Severe_anaemia_pale_palms_and_inner_eyelids", "openmrs_entity_parent": "" } }, @@ -253,7 +253,7 @@ "text": "Yellowing of the eyes (jaundice)", "meta_data": { "openmrs_entity": "", - "openmrs_entity_id": "136443AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", + "openmrs_entity_id": "Yellowing_of_the_eyes_jaundice", "openmrs_entity_parent": "" } }, @@ -262,7 +262,7 @@ "text": "Severe malnutrition", "meta_data": { "openmrs_entity": "", - "openmrs_entity_id": "163302AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", + "openmrs_entity_id": "Severe_malnutrition", "openmrs_entity_parent": "" } }, @@ -271,7 +271,7 @@ "text": "Bloating", "meta_data": { "openmrs_entity": "", - "openmrs_entity_id": "147132AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", + "openmrs_entity_id": "Bloating", "openmrs_entity_parent": "" } } @@ -301,7 +301,7 @@ "text": "Rectal artesunate", "meta_data": { "openmrs_entity": "", - "openmrs_entity_id": "71561AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", + "openmrs_entity_id": "Rectal_artesunate", "openmrs_entity_parent": "" } }, @@ -310,7 +310,7 @@ "text": "Panadol", "meta_data": { "openmrs_entity": "", - "openmrs_entity_id": "70116AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", + "openmrs_entity_id": "Panadol", "openmrs_entity_parent": "" } }, @@ -319,7 +319,7 @@ "text": "ORS", "meta_data": { "openmrs_entity": "", - "openmrs_entity_id": "351AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", + "openmrs_entity_id": "ORS", "openmrs_entity_parent": "" } }, @@ -328,7 +328,7 @@ "text": "Other treatment", "meta_data": { "openmrs_entity": "", - "openmrs_entity_id": "5622AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA", + "openmrs_entity_id": "Other_treatment", "openmrs_entity_parent": "" } }, diff --git a/opensrp-chw/src/nacp/assets/rule/malaria-followup-rules.yml b/opensrp-chw/src/nacp/assets/rule/malaria-followup-rules.yml index a2a830edb7..615c6c591b 100644 --- a/opensrp-chw/src/nacp/assets/rule/malaria-followup-rules.yml +++ b/opensrp-chw/src/nacp/assets/rule/malaria-followup-rules.yml @@ -15,6 +15,6 @@ actions: name: visit_due description: "visit due" priority: 3 -condition: "malariaFollowUpRule.getDatesDiff() > 7 " +condition: "malariaFollowUpRule.getDatesDiff() >= 7 " actions: - "malariaFollowUpRule.setButtonStatus('DUE')"