From 238be238ad3cf1cff6028a3cdf8dac2fe67a6b80 Mon Sep 17 00:00:00 2001 From: derrick rono Date: Wed, 5 Jul 2023 13:10:48 +0300 Subject: [PATCH 1/2] POC-399 --- programs/patient-program-config.json | 4 ++-- programs/scope-builder.service.js | 10 ++++++++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/programs/patient-program-config.json b/programs/patient-program-config.json index 0df0839c1..bb186c5a9 100755 --- a/programs/patient-program-config.json +++ b/programs/patient-program-config.json @@ -5372,7 +5372,7 @@ { "uuid": "02e3ce61-fa24-445e-a1f0-6e3299142966", "name": "ANC Return Visit", - "allowedIf": "programLocation === intendedVisitLocationUuid && !isFirstANCVisit && gender==='F'", + "allowedIf": "programLocation === intendedVisitLocationUuid && (!isFirstAMPATHHIVVisit || !isFirstANCVisit) && gender==='F'", "encounterTypes": [ { "uuid": "26bfc6b7-28d0-41ab-90c5-e101af46d06d", @@ -5446,7 +5446,7 @@ { "uuid": "0b1b6194-d2d5-4e4b-9f7c-c3b778ccc354", "name": "PMTCT Postnatal Return Visit", - "allowedIf": "programLocation === intendedVisitLocationUuid && !isFirstPNCVisit && gender==='F'", + "allowedIf": "programLocation === intendedVisitLocationUuid && (!isFirstAMPATHHIVVisit || !isFirstPNCVisit) && gender==='F'", "encounterTypes": [ { "uuid": "ded4ecf7-8129-4a9e-8aa3-a21a7adb7759", diff --git a/programs/scope-builder.service.js b/programs/scope-builder.service.js index 35053914a..2df317170 100755 --- a/programs/scope-builder.service.js +++ b/programs/scope-builder.service.js @@ -278,6 +278,7 @@ function isInitialVisit( let initialEncounters = _.filter(patientEncounters, (encounter) => { return encounterUuid === encounter.encounterType.uuid; }); + const activeEnrollments = _.filter(patientEnrollment, { dateCompleted: null }); @@ -291,10 +292,12 @@ function isInitialVisit( }); // get latest initial encounter and compare with dateenrolled to check whether it's a new enrollment let latestEnc = initialEncounters[initialEncounters.length - 1]; + console.log('has initial', initialEncounters, dateEnrolled); if ( initialEncounters.length > 0 && dateEnrolled > latestEnc.encounterDatetime ) { + console.log('wapo'); return true; } else if (initialEncounters.length === 0) { return true; @@ -397,14 +400,17 @@ function buildMNCHScopeMembers(scope, patientEncounters, programEnrollment) { patientEncounters, programEnrollment, '52aeb285-fb18-455b-893e-3e53ccc77ceb', - 'f5702679-6a16-43bd-8629-4b44c7a78ff1' + 'f5702679-6a16-43bd-8629-4b44c7a78ff1', + '8d5b27bc-c2cc-11de-8d13-0010c6dffd0f' ); scope.isFirstPNCVisit = isInitialVisit( patientEncounters, programEnrollment, 'd2552058-d7bd-47c6-aed1-480a4308027a', - 'ded4ecf7-8129-4a9e-8aa3-a21a7adb7759' + 'ded4ecf7-8129-4a9e-8aa3-a21a7adb7759', + '8d5b27bc-c2cc-11de-8d13-0010c6dffd0f' ); + console.log(scope); } function isInitialHivVisit(patientEncounters) { const adultInitial = '8d5b27bc-c2cc-11de-8d13-0010c6dffd0f'; From 2d775afeaf8c7b294000d1a5f7dacf7020f72521 Mon Sep 17 00:00:00 2001 From: derrick rono Date: Wed, 5 Jul 2023 15:00:38 +0300 Subject: [PATCH 2/2] POC-367 --- docker-compose.yml | 8 ++++---- programs/patient-program-config.json | 2 +- programs/scope-builder.service.js | 3 --- 3 files changed, 5 insertions(+), 8 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index f278259d5..a22f216be 100755 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -2,7 +2,7 @@ version: '2' services: etl-prod: container_name: etl-rest-server-prod - image: ampathke/etl-services:v2.16.5.2 + image: ampathke/etl-services: environment: - NODE_TLS_REJECT_UNAUTHORIZED=0 - TZ=Africa/Nairobi @@ -11,8 +11,8 @@ services: - 8.8.8.8 volumes: - - /media/data/etl/conf:/opt/etl/conf - - /media/data/etl/uploads:/opt/etl/uploads + - :/opt/etl/conf + - :/opt/etl/uploads # deploy: # mode: replicated # replicas: 1 @@ -20,4 +20,4 @@ services: # constraints: # - node.hostname == upgrade1 ports: - - 9141:8002 + - :8002 diff --git a/programs/patient-program-config.json b/programs/patient-program-config.json index bb186c5a9..e7b6d7f35 100755 --- a/programs/patient-program-config.json +++ b/programs/patient-program-config.json @@ -5449,7 +5449,7 @@ "allowedIf": "programLocation === intendedVisitLocationUuid && (!isFirstAMPATHHIVVisit || !isFirstPNCVisit) && gender==='F'", "encounterTypes": [ { - "uuid": "ded4ecf7-8129-4a9e-8aa3-a21a7adb7759", + "uuid": "db215741-de99-424a-a109-1f23eb3b680b", "display": "PNC ADULTRETURN" }, { diff --git a/programs/scope-builder.service.js b/programs/scope-builder.service.js index 2df317170..a4b7607a6 100755 --- a/programs/scope-builder.service.js +++ b/programs/scope-builder.service.js @@ -292,12 +292,10 @@ function isInitialVisit( }); // get latest initial encounter and compare with dateenrolled to check whether it's a new enrollment let latestEnc = initialEncounters[initialEncounters.length - 1]; - console.log('has initial', initialEncounters, dateEnrolled); if ( initialEncounters.length > 0 && dateEnrolled > latestEnc.encounterDatetime ) { - console.log('wapo'); return true; } else if (initialEncounters.length === 0) { return true; @@ -410,7 +408,6 @@ function buildMNCHScopeMembers(scope, patientEncounters, programEnrollment) { 'ded4ecf7-8129-4a9e-8aa3-a21a7adb7759', '8d5b27bc-c2cc-11de-8d13-0010c6dffd0f' ); - console.log(scope); } function isInitialHivVisit(patientEncounters) { const adultInitial = '8d5b27bc-c2cc-11de-8d13-0010c6dffd0f';