From bb6e0bebc641cb136e52cdd0271f01622280c45f Mon Sep 17 00:00:00 2001
From: jacinta254 <jecihjoy@gmail.com>
Date: Fri, 21 Jan 2022 11:06:22 +0300
Subject: [PATCH] HIV-913: Added age validation to Cervical Cancer Screening
 Reminders

---
 service/cervical-cancer-screening-service.js | 9 +++++----
 service/patient-reminder.service.js          | 6 +++---
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/service/cervical-cancer-screening-service.js b/service/cervical-cancer-screening-service.js
index 27d6cd2da..0632eb322 100644
--- a/service/cervical-cancer-screening-service.js
+++ b/service/cervical-cancer-screening-service.js
@@ -1,11 +1,11 @@
 const db = require('../etl-db');
 
 const defs = {
-  getPatientLatestCericalScreeningResult,
+  getPatientLatestCervicalScreeningResult,
   getPatientCervicalCancerScreeningSummary
 };
 
-function getPatientLatestCericalScreeningResult(personId) {
+function getPatientLatestCervicalScreeningResult(personId) {
   return new Promise((resolve, reject) => {
     const sql = `SELECT 
          person_id, 
@@ -16,10 +16,11 @@ function getPatientLatestCericalScreeningResult(personId) {
            WHEN TIMESTAMPDIFF(YEAR,test_datetime,now()) >= 1 THEN 1
            ELSE NULL
          END AS 'qualifies_for_via_or_via_vili_retest'
-         FROM 
-         etl.flat_labs_and_imaging 
+         FROM etl.flat_labs_and_imaging 
+         inner join amrs.person using(person_id)
          WHERE 
          via_or_via_vili IS NOT NULL AND person_id = ${personId} 
+         AND extract(year from (from_days(datediff(now(),birthdate)))) <= 50
          ORDER BY test_datetime DESC LIMIT 1;`;
 
     const queryParts = {
diff --git a/service/patient-reminder.service.js b/service/patient-reminder.service.js
index 2030ce543..7754abfd7 100755
--- a/service/patient-reminder.service.js
+++ b/service/patient-reminder.service.js
@@ -724,7 +724,7 @@ async function generateReminders(etlResults, eidResults) {
   let unenrol_ovc_reminder = await ovcUnenrollmentReminder(data);
   let contact_tracing_reminder = await getFamilyTestingReminder(etlResults);
 
-  let cervical_screening_reminder = await getCerivalScreeningReminder(
+  let cervical_screening_reminder = await getCervicalScreeningReminder(
     person_id
   );
   let due_for_contraception_refill = generateContraceptionRefillReminder(data);
@@ -800,10 +800,10 @@ function getPatientPrograms(uuid, params) {
   });
 }
 
-function getCerivalScreeningReminder(personId) {
+function getCervicalScreeningReminder(personId) {
   return new Promise((resolve, reject) => {
     cervicalCancerScreeningService
-      .getPatientLatestCericalScreeningResult(personId)
+      .getPatientLatestCervicalScreeningResult(personId)
       .then((result) => {
         console.log(result);
         let reminder = [];