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

Jump to bottom

Poc 367 #1291

Merged
merged 3 commits into from
Jul 12, 2023
Merged

Poc 367 #1291

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
238be23
POC-399
drizzentic Jul 5, 2023
2d775af
POC-367
drizzentic Jul 5, 2023
47230de
Merge branch 'master' into POC-367
drizzentic Jul 12, 2023
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
8 changes: 4 additions & 4 deletions docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:<tag>
environment:
- NODE_TLS_REJECT_UNAUTHORIZED=0
- TZ=Africa/Nairobi
Expand All @@ -11,13 +11,13 @@ services:
- 8.8.8.8

volumes:
- /media/data/etl/conf:/opt/etl/conf
- /media/data/etl/uploads:/opt/etl/uploads
- <source_directory>:/opt/etl/conf
- <source_directory>:/opt/etl/uploads
# deploy:
# mode: replicated
# replicas: 1
# placement:
# constraints:
# - node.hostname == upgrade1
ports:
- 9141:8002
- <server_port>:8002
6 changes: 3 additions & 3 deletions programs/patient-program-config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -5446,10 +5446,10 @@
{
"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",
"uuid": "db215741-de99-424a-a109-1f23eb3b680b",
"display": "PNC ADULTRETURN"
},
{
Expand Down
7 changes: 5 additions & 2 deletions programs/scope-builder.service.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -278,6 +278,7 @@ function isInitialVisit(
let initialEncounters = _.filter(patientEncounters, (encounter) => {
return encounterUuid === encounter.encounterType.uuid;
});

const activeEnrollments = _.filter(patientEnrollment, {
dateCompleted: null
});
Expand Down Expand Up @@ -397,13 +398,15 @@ 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'
);
}
function isInitialHivVisit(patientEncounters) {
Expand Down