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

🔨 resolved issues in showing clients enrolled into Malaria Mod… #478

Open
wants to merge 1 commit into
base: tanzania-ministry-of-health-nacp
Choose a base branch
from
Open

🔨 resolved issues in showing clients enrolled into Malaria Mod… #478

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 3 additions & 3 deletions opensrp-chw/src/main/java/org/smartregister/chw/util/ChwQueryConstant.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" +
Expand Down Expand Up @@ -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" +
Expand Down Expand Up @@ -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" +
Expand Down
14 changes: 7 additions & 7 deletions opensrp-chw/src/nacp/assets/ec_client_fields.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1033,7 +1033,7 @@
"type": "Event",
"json_mapping": {
"field": "obs.fieldCode",
"concept": "162869AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"
"concept": "date_chw_malaria_test"
}
},
{
Expand All @@ -1057,7 +1057,7 @@
"type": "Event",
"json_mapping": {
"field": "obs.fieldCode",
"concept": "1731AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"
"concept": "fever_duration"
}
},
{
Expand All @@ -1073,7 +1073,7 @@
"type": "Event",
"json_mapping": {
"field": "obs.fieldCode",
"concept": "1643AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"
"concept": "malaria_results"
}
},
{
Expand All @@ -1089,15 +1089,15 @@
"type": "Event",
"json_mapping": {
"field": "obs.fieldCode",
"concept": "163724AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"
"concept": "malaria_test_date"
}
},
{
"column_name": "malaria",
"type": "Event",
"json_mapping": {
"field": "obs.fieldCode",
"concept": "163725AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"
"concept": "malaria"
}
},
{
Expand Down Expand Up @@ -1774,15 +1774,15 @@
"type": "Event",
"json_mapping": {
"field": "obs.fieldCode",
"concept": "165273AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"
"concept": "service_before_malaria"
}
},
{
"column_name": "service_before_malaria_other",
"type": "Event",
"json_mapping": {
"field": "obs.fieldCode",
"concept": "160632AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"
"concept": "service_before_malaria_other"
}
}
]
Expand Down
44 changes: 22 additions & 22 deletions opensrp-chw/src/nacp/assets/json.form-sw/malaria_confirmation.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand Down Expand Up @@ -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": [
Expand Down Expand Up @@ -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": [
Expand Down Expand Up @@ -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": {
Expand All @@ -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": {
Expand All @@ -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",
Expand Down Expand Up @@ -304,8 +304,8 @@
"Hapana"
],
"openmrs_choice_ids": {
"Yes": "1065AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
"No": "1066AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"
"Yes": "Yes",
"No": "No"
},
"v_required": {
"value": "true",
Expand All @@ -324,8 +324,8 @@
"Hapana"
],
"openmrs_choice_ids": {
"Yes": "1065AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
"No": "1066AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"
"Yes": "Yes",
"No": "No"
},
"v_required": {
"value": "true",
Expand All @@ -351,8 +351,8 @@
"Mbaya"
],
"openmrs_choice_ids": {
"Okay": "1065AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA",
"Bad": "1066AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"
"Okay": "Okay",
"Bad": "Bad"
},
"v_required": {
"value": "true",
Expand Down Expand Up @@ -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",
Expand Down
Loading