Merge pull request #1387 from OpenSRP/lmh_child_register

Fixes lmh child register query
opensrp · Oct 5, 2020 · 9850f23 · 9850f23
2 parents 3095987 + a324c0f
commit 9850f23
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 11 deletions.
diff --git a/opensrp-chw/src/lmh/java/org/smartregister/chw/custom_view/NavigationMenuFlv.java b/opensrp-chw/src/lmh/java/org/smartregister/chw/custom_view/NavigationMenuFlv.java
@@ -20,13 +20,11 @@ public String childNavigationMenuCountString() {
                 " and (SELECT is_closed FROM ec_family_member WHERE base_entity_id = ec_child.mother_entity_id ) = 1)) \n" +
                 " and CASE WHEN ec_child.gender = 'Male' \n" +
                 " THEN (\n" +
-                " ((( julianday('now') - julianday(ec_child.dob))/365.25) < +1.8) OR ( (((( julianday('now') - julianday(ec_child.dob))/365.25) >= +1.8) AND ((( julianday('now') - julianday(ec_child.dob))/365.25) <= +2)) AND\n" +
-                "  ((SELECT count(*) FROM alerts WHERE alerts.caseID = ec_child.base_entity_id and alerts.status in ('normal','urgent', 'upcoming')) > 0))\n" +
-                "  )\n" +
+                " (( julianday('now') - julianday(ec_child.dob))/365.25) < 2\n" +
+                " )\n" +
                 "  WHEN ec_child.gender = 'Female' \n" +
                 " THEN (\n" +
-                " ((( julianday('now') - julianday(ec_child.dob))/365.25) < +1.8) OR ( (((( julianday('now') - julianday(ec_child.dob))/365.25) >= +1.8) AND ((( julianday('now') - julianday(ec_child.dob))/365.25) <= +2)) AND\n" +
-                "  ((SELECT count(*) FROM alerts WHERE alerts.caseID = ec_child.base_entity_id and alerts.status in ('normal','urgent', 'upcoming')) > 0))  OR (((julianday('now') - julianday(ec_child.dob))/365.25) BETWEEN 9 AND 11)\n" +
+                " ((( julianday('now') - julianday(ec_child.dob))/365.25) < 2) OR (((julianday('now') - julianday(ec_child.dob))/365.25) BETWEEN 9 AND 11)\n" +
                 "  ) END";
     }
 

diff --git a/opensrp-chw/src/main/java/org/smartregister/chw/util/ChildDBConstants.java b/opensrp-chw/src/main/java/org/smartregister/chw/util/ChildDBConstants.java
@@ -25,13 +25,11 @@ private static String childDueVaccinesFilter(String dateColumn, int age, String
                 " and (SELECT is_closed FROM ec_family_member WHERE base_entity_id = ec_child.mother_entity_id ) = 1)) " +
                 " and CASE WHEN ec_child.gender = 'Male' \n" +
                 " THEN (\n" +
-                " ((( julianday('now') - julianday(ec_child.dob))/365.25) < +1.8) OR ( (((( julianday('now') - julianday(ec_child.dob))/365.25) >= +1.8) AND ((( julianday('now') - julianday(ec_child.dob))/365.25) <= +2)) AND\n" +
-                "  ((SELECT count(*) FROM alerts WHERE alerts.caseID = ec_child.base_entity_id and alerts.status in ('normal','urgent', 'upcoming')) > 0))\n" +
-                "  )\n" +
-                "  WHEN ec_child.gender = 'Female' \n" +
+                " (( julianday('now') - julianday(ec_child.dob))/365.25) < 2\n" +
+                " )\n" +
+                " WHEN ec_child.gender = 'Female' \n" +
                 " THEN (\n" +
-                " ((( julianday('now') - julianday(ec_child.dob))/365.25) < +1.8) OR ( (((( julianday('now') - julianday(ec_child.dob))/365.25) >= +1.8) AND ((( julianday('now') - julianday(ec_child.dob))/365.25) <= +2)) AND\n" +
-                "  ((SELECT count(*) FROM alerts WHERE alerts.caseID = ec_child.base_entity_id and alerts.status in ('normal','urgent', 'upcoming')) > 0))  OR (((julianday('now') - julianday(ec_child.dob))/365.25) BETWEEN 9 AND 11)\n" +
+                " ((( julianday('now') - julianday(ec_child.dob))/365.25) < 2) OR (((julianday('now') - julianday(ec_child.dob))/365.25) BETWEEN 9 AND 11)\n" +
                 "  ) END ";
     }