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

MEPTS-1625 | RM DAH CHANGES DECEMBER #1305

Open
wants to merge 2 commits into
base: 2.x_develop
Choose a base branch
from
+97 −38
Open

MEPTS-1625 | RM DAH CHANGES DECEMBER #1305

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6868865
FEAT: Updating periods and mappings
helderjosue Nov 25, 2024
276f9df
FEAT: updating template
helderjosue Nov 25, 2024
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
123 changes: 89 additions & 34 deletions ...ptsreports/reporting/library/cohorts/advancedhivillness/ResumoMensalDAHCohortQueries.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -239,7 +239,7 @@
"B12",
map(
resumoMensalCohortQueries.getPatientsWhoWereActiveByEndOfPreviousMonthB12(),
"startDate=${startDate},endDate=${endDate},location=${location}"));
"startDate=${startDate-4m},endDate=${startDate-3m-1d},location=${location}"));

cd.addSearch(
"I1",
Expand Down Expand Up @@ -324,10 +324,17 @@
cd.setName("Relatório – Indicador 10 Resultado de CD4 baixo");
cd.addParameters(getCohortParameters());

cd.addSearch("haveCd4Results", mapStraightThrough(getPatientsWhoHaveCd4Results()));
cd.addSearch(

Check warning on line 327 in api/src/main/java/org/openmrs/module/eptsreports/reporting/library/cohorts/advancedhivillness/ResumoMensalDAHCohortQueries.java

View check run for this annotation

Codecov / codecov/patch

api/src/main/java/org/openmrs/module/eptsreports/reporting/library/cohorts/advancedhivillness/ResumoMensalDAHCohortQueries.java#L327 

Added line #L327 was not covered by tests
"haveCd4Results",
map(
getPatientsWhoHaveCd4ResultsComposition(),

Check warning on line 330 in api/src/main/java/org/openmrs/module/eptsreports/reporting/library/cohorts/advancedhivillness/ResumoMensalDAHCohortQueries.java

View check run for this annotation

Codecov / codecov/patch

api/src/main/java/org/openmrs/module/eptsreports/reporting/library/cohorts/advancedhivillness/ResumoMensalDAHCohortQueries.java#L329-L330 

Added lines #L329 - L330 were not covered by tests
"startDate=${startDate-4m+1d},endDate=${endDate},location=${location}"));

cd.addSearch(
"cd4ByAgeAndResult", mapStraightThrough(getPatientsWithCD4BasedOnAgeAndCd4Results()));
"cd4ByAgeAndResult",
map(
getPatientsWithCD4BasedOnAgeAndCd4Results(),

Check warning on line 336 in api/src/main/java/org/openmrs/module/eptsreports/reporting/library/cohorts/advancedhivillness/ResumoMensalDAHCohortQueries.java

View check run for this annotation

Codecov / codecov/patch

api/src/main/java/org/openmrs/module/eptsreports/reporting/library/cohorts/advancedhivillness/ResumoMensalDAHCohortQueries.java#L335-L336 

Added lines #L335 - L336 were not covered by tests
"startDate=${startDate-4m+1d},endDate=${endDate},location=${location}"));

cd.addSearch(
"onDAH",
Expand All @@ -353,7 +360,7 @@
* Clínica” com “Data de Consulta” ocorrida durante o período (>= “Data Início” e <= “Data
* Fim) e resultado igual a “Positivo” ou “Negativo”.
*
* @see #getPatientsWhoHaveCd4Results
* @see #getPatientsWhoHaveCd4ResultsComposition
* @return {@link CohortDefinition}
*/
public CohortDefinition getPatientsWithTBLAMResults() {
Expand All @@ -365,21 +372,22 @@
cd.addSearch(
"haveCd4Results",
map(
getPatientsWhoHaveCd4Results(),
"startDate=${startDate-1m},endDate=${endDate},location=${location}"));
getPatientsWhoHaveCd4ResultsComposition(),

Check warning on line 375 in api/src/main/java/org/openmrs/module/eptsreports/reporting/library/cohorts/advancedhivillness/ResumoMensalDAHCohortQueries.java

View check run for this annotation

Codecov / codecov/patch

api/src/main/java/org/openmrs/module/eptsreports/reporting/library/cohorts/advancedhivillness/ResumoMensalDAHCohortQueries.java#L375 

Added line #L375 was not covered by tests
"startDate=${startDate-4m+1d},endDate=${endDate},location=${location}"));

cd.addSearch(
"cd4ByAgeAndResult",
map(
getPatientsWithCD4BasedOnAgeAndCd4Results(),
"startDate=${startDate-1m},endDate=${endDate},location=${location}"));
"startDate=${startDate-4m+1d},endDate=${endDate},location=${location}"));

cd.addSearch(
"tbLamResults",
mapStraightThrough(
map(

Check warning on line 386 in api/src/main/java/org/openmrs/module/eptsreports/reporting/library/cohorts/advancedhivillness/ResumoMensalDAHCohortQueries.java

View check run for this annotation

Codecov / codecov/patch

api/src/main/java/org/openmrs/module/eptsreports/reporting/library/cohorts/advancedhivillness/ResumoMensalDAHCohortQueries.java#L386 

Added line #L386 was not covered by tests
getPatientsWithPositiveOrNegativeTestResults(
Collections.singletonList(tbMetadata.getTestTBLAM()),
Arrays.asList(hivMetadata.getPositive(), hivMetadata.getNegative()))));
Arrays.asList(hivMetadata.getPositive(), hivMetadata.getNegative())),

Check warning on line 389 in api/src/main/java/org/openmrs/module/eptsreports/reporting/library/cohorts/advancedhivillness/ResumoMensalDAHCohortQueries.java

View check run for this annotation

Codecov / codecov/patch

api/src/main/java/org/openmrs/module/eptsreports/reporting/library/cohorts/advancedhivillness/ResumoMensalDAHCohortQueries.java#L389 

Added line #L389 was not covered by tests
"startDate=${startDate-4m+1d},endDate=${endDate},location=${location}"));

cd.addSearch(
"onDAH",
Expand Down Expand Up @@ -411,14 +419,19 @@
cd.setName("Relatório – Indicador 12 Resultado de TB LAM Positivo");
cd.addParameters(getCohortParameters());

cd.addSearch("tbLamResults", mapStraightThrough(getPatientsWithTBLAMResults()));
cd.addSearch(

Check warning on line 422 in api/src/main/java/org/openmrs/module/eptsreports/reporting/library/cohorts/advancedhivillness/ResumoMensalDAHCohortQueries.java

View check run for this annotation

Codecov / codecov/patch

api/src/main/java/org/openmrs/module/eptsreports/reporting/library/cohorts/advancedhivillness/ResumoMensalDAHCohortQueries.java#L422 

Added line #L422 was not covered by tests
"tbLamResults",
map(
getPatientsWithTBLAMResults(),

Check warning on line 425 in api/src/main/java/org/openmrs/module/eptsreports/reporting/library/cohorts/advancedhivillness/ResumoMensalDAHCohortQueries.java

View check run for this annotation

Codecov / codecov/patch

api/src/main/java/org/openmrs/module/eptsreports/reporting/library/cohorts/advancedhivillness/ResumoMensalDAHCohortQueries.java#L424-L425 

Added lines #L424 - L425 were not covered by tests
"startDate=${startDate-4m+1d},endDate=${endDate},location=${location}"));

cd.addSearch(
"tbLamPositive",
mapStraightThrough(
map(

Check warning on line 430 in api/src/main/java/org/openmrs/module/eptsreports/reporting/library/cohorts/advancedhivillness/ResumoMensalDAHCohortQueries.java

View check run for this annotation

Codecov / codecov/patch

api/src/main/java/org/openmrs/module/eptsreports/reporting/library/cohorts/advancedhivillness/ResumoMensalDAHCohortQueries.java#L430 

Added line #L430 was not covered by tests
getPatientsWithPositiveOrNegativeTestResults(
Collections.singletonList(tbMetadata.getTestTBLAM()),
Collections.singletonList(hivMetadata.getPositive()))));
Collections.singletonList(hivMetadata.getPositive())),

Check warning on line 433 in api/src/main/java/org/openmrs/module/eptsreports/reporting/library/cohorts/advancedhivillness/ResumoMensalDAHCohortQueries.java

View check run for this annotation

Codecov / codecov/patch

api/src/main/java/org/openmrs/module/eptsreports/reporting/library/cohorts/advancedhivillness/ResumoMensalDAHCohortQueries.java#L433 

Added line #L433 was not covered by tests
"startDate=${startDate-4m+1d},endDate=${endDate},location=${location}"));

cd.addSearch(
"onDAH",
Expand Down Expand Up @@ -452,11 +465,7 @@
cd.setName("Relatório – Indicador 13 CD4 Baixo e Resultado de CrAg Sérico");
cd.addParameters(getCohortParameters());

cd.addSearch(
"haveLowCd4Results",
map(
getPatientsWithLowCd4Results(),
"startDate=${startDate-1m},endDate=${endDate},location=${location}"));
cd.addSearch("haveLowCd4Results", mapStraightThrough(getPatientsWithLowCd4Results()));

Check warning on line 468 in api/src/main/java/org/openmrs/module/eptsreports/reporting/library/cohorts/advancedhivillness/ResumoMensalDAHCohortQueries.java

View check run for this annotation

Codecov / codecov/patch

api/src/main/java/org/openmrs/module/eptsreports/reporting/library/cohorts/advancedhivillness/ResumoMensalDAHCohortQueries.java#L468 

Added line #L468 was not covered by tests

cd.addSearch(
"cragResults",
Expand Down Expand Up @@ -500,11 +509,12 @@

cd.addSearch(
"cragPositive",
mapStraightThrough(
map(

Check warning on line 512 in api/src/main/java/org/openmrs/module/eptsreports/reporting/library/cohorts/advancedhivillness/ResumoMensalDAHCohortQueries.java

View check run for this annotation

Codecov / codecov/patch

api/src/main/java/org/openmrs/module/eptsreports/reporting/library/cohorts/advancedhivillness/ResumoMensalDAHCohortQueries.java#L512 

Added line #L512 was not covered by tests
getPatientsWithPositiveOrNegativeTestResults(
Arrays.asList(
hivMetadata.getCragSoroLabsetConcept(), hivMetadata.getCragSoroConcept()),
Collections.singletonList(hivMetadata.getPositive()))));
Collections.singletonList(hivMetadata.getPositive())),

Check warning on line 516 in api/src/main/java/org/openmrs/module/eptsreports/reporting/library/cohorts/advancedhivillness/ResumoMensalDAHCohortQueries.java

View check run for this annotation

Codecov / codecov/patch

api/src/main/java/org/openmrs/module/eptsreports/reporting/library/cohorts/advancedhivillness/ResumoMensalDAHCohortQueries.java#L516 

Added line #L516 was not covered by tests
"startDate=${startDate-4m+1d},endDate=${endDate},location=${location}"));

cd.addSearch(
"onDAH",
Expand Down Expand Up @@ -537,9 +547,10 @@

cd.addSearch(
"cragResults",
mapStraightThrough(
map(

Check warning on line 550 in api/src/main/java/org/openmrs/module/eptsreports/reporting/library/cohorts/advancedhivillness/ResumoMensalDAHCohortQueries.java

View check run for this annotation

Codecov / codecov/patch

api/src/main/java/org/openmrs/module/eptsreports/reporting/library/cohorts/advancedhivillness/ResumoMensalDAHCohortQueries.java#L550 

Added line #L550 was not covered by tests
getPatientsWithPositiveOrNegativeCragLCRResults(
Arrays.asList(hivMetadata.getPositive(), hivMetadata.getNegative()))));
Arrays.asList(hivMetadata.getPositive(), hivMetadata.getNegative())),

Check warning on line 552 in api/src/main/java/org/openmrs/module/eptsreports/reporting/library/cohorts/advancedhivillness/ResumoMensalDAHCohortQueries.java

View check run for this annotation

Codecov / codecov/patch

api/src/main/java/org/openmrs/module/eptsreports/reporting/library/cohorts/advancedhivillness/ResumoMensalDAHCohortQueries.java#L552 

Added line #L552 was not covered by tests
"startDate=${startDate-4m+1d},endDate=${endDate},location=${location}"));

cd.addSearch(
"onDAH",
Expand Down Expand Up @@ -568,7 +579,11 @@

cd.addSearch("cragPositive", mapStraightThrough(getPatientsWithLowCd4AndPositiveCragResults()));

cd.addSearch("mccPreventivo", mapStraightThrough(getPatientsWhoStartedMccPreventivo()));
cd.addSearch(

Check warning on line 582 in api/src/main/java/org/openmrs/module/eptsreports/reporting/library/cohorts/advancedhivillness/ResumoMensalDAHCohortQueries.java

View check run for this annotation

Codecov / codecov/patch

api/src/main/java/org/openmrs/module/eptsreports/reporting/library/cohorts/advancedhivillness/ResumoMensalDAHCohortQueries.java#L582 

Added line #L582 was not covered by tests
"mccPreventivo",
map(
getPatientsWhoStartedMccPreventivo(),

Check warning on line 585 in api/src/main/java/org/openmrs/module/eptsreports/reporting/library/cohorts/advancedhivillness/ResumoMensalDAHCohortQueries.java

View check run for this annotation

Codecov / codecov/patch

api/src/main/java/org/openmrs/module/eptsreports/reporting/library/cohorts/advancedhivillness/ResumoMensalDAHCohortQueries.java#L584-L585 

Added lines #L584 - L585 were not covered by tests
"startDate=${startDate-4m+1d},endDate=${endDate},location=${location}"));

cd.addSearch(
"onDAH",
Expand Down Expand Up @@ -602,11 +617,16 @@

cd.addSearch(
"cragLCRPositive",
mapStraightThrough(
map(

Check warning on line 620 in api/src/main/java/org/openmrs/module/eptsreports/reporting/library/cohorts/advancedhivillness/ResumoMensalDAHCohortQueries.java

View check run for this annotation

Codecov / codecov/patch

api/src/main/java/org/openmrs/module/eptsreports/reporting/library/cohorts/advancedhivillness/ResumoMensalDAHCohortQueries.java#L620 

Added line #L620 was not covered by tests
getPatientsWithPositiveOrNegativeCragLCRResults(
Collections.singletonList(hivMetadata.getPositive()))));
Collections.singletonList(hivMetadata.getPositive())),

Check warning on line 622 in api/src/main/java/org/openmrs/module/eptsreports/reporting/library/cohorts/advancedhivillness/ResumoMensalDAHCohortQueries.java

View check run for this annotation

Codecov / codecov/patch

api/src/main/java/org/openmrs/module/eptsreports/reporting/library/cohorts/advancedhivillness/ResumoMensalDAHCohortQueries.java#L622 

Added line #L622 was not covered by tests
"startDate=${startDate-4m+1d},endDate=${endDate},location=${location}"));

cd.addSearch("mmcTreatment", mapStraightThrough(getPatientsInMccTretament()));
cd.addSearch(

Check warning on line 625 in api/src/main/java/org/openmrs/module/eptsreports/reporting/library/cohorts/advancedhivillness/ResumoMensalDAHCohortQueries.java

View check run for this annotation

Codecov / codecov/patch

api/src/main/java/org/openmrs/module/eptsreports/reporting/library/cohorts/advancedhivillness/ResumoMensalDAHCohortQueries.java#L625 

Added line #L625 was not covered by tests
"mmcTreatment",
map(
getPatientsInMccTretament(),

Check warning on line 628 in api/src/main/java/org/openmrs/module/eptsreports/reporting/library/cohorts/advancedhivillness/ResumoMensalDAHCohortQueries.java

View check run for this annotation

Codecov / codecov/patch

api/src/main/java/org/openmrs/module/eptsreports/reporting/library/cohorts/advancedhivillness/ResumoMensalDAHCohortQueries.java#L627-L628 

Added lines #L627 - L628 were not covered by tests
"startDate=${startDate-4m+1d},endDate=${endDate},location=${location}"));

cd.addSearch(
"onDAH",
Expand Down Expand Up @@ -947,6 +967,30 @@
return sqlCohortDefinition;
}

/**
* Filtrando os utentes com o respectivo “Resultado de CD4” (identificado nos critérios acima
* definidos) de acordo com a seguinte definição:
* <li>< 750 para os utentes com idade < 1 ano
* <li>< 500 para os utentes com idade entre 1 a 4anos
* <li>< 200 (absoluto) ou “<=200” (semi-quantitativo) para os utentes com idade >= 5 anos
*
* @return {@link CohortDefinition}
*/
public CohortDefinition getPatientsWhoHaveCd4ResultsComposition() {
CompositionCohortDefinition cd = new CompositionCohortDefinition();
cd.setName("Número de utentes com resultado de CD4 de rastreio disponível");
cd.addParameters(getCohortParameters());

Check warning on line 982 in api/src/main/java/org/openmrs/module/eptsreports/reporting/library/cohorts/advancedhivillness/ResumoMensalDAHCohortQueries.java

View check run for this annotation

Codecov / codecov/patch

api/src/main/java/org/openmrs/module/eptsreports/reporting/library/cohorts/advancedhivillness/ResumoMensalDAHCohortQueries.java#L980-L982 

Added lines #L980 - L982 were not covered by tests

CohortDefinition cd4Results = getPatientsWhoHaveCd4Results();
CohortDefinition cd4Request = getPatientsWhoHaveCd4Request();

Check warning on line 985 in api/src/main/java/org/openmrs/module/eptsreports/reporting/library/cohorts/advancedhivillness/ResumoMensalDAHCohortQueries.java

View check run for this annotation

Codecov / codecov/patch

api/src/main/java/org/openmrs/module/eptsreports/reporting/library/cohorts/advancedhivillness/ResumoMensalDAHCohortQueries.java#L984-L985 

Added lines #L984 - L985 were not covered by tests

cd.addSearch("cd4Results", mapStraightThrough(cd4Results));
cd.addSearch("cd4Request", mapStraightThrough(cd4Request));

Check warning on line 988 in api/src/main/java/org/openmrs/module/eptsreports/reporting/library/cohorts/advancedhivillness/ResumoMensalDAHCohortQueries.java

View check run for this annotation

Codecov / codecov/patch

api/src/main/java/org/openmrs/module/eptsreports/reporting/library/cohorts/advancedhivillness/ResumoMensalDAHCohortQueries.java#L987-L988 

Added lines #L987 - L988 were not covered by tests

cd.setCompositionString("cd4Results AND cd4Request");
return cd;

Check warning on line 991 in api/src/main/java/org/openmrs/module/eptsreports/reporting/library/cohorts/advancedhivillness/ResumoMensalDAHCohortQueries.java

View check run for this annotation

Codecov / codecov/patch

api/src/main/java/org/openmrs/module/eptsreports/reporting/library/cohorts/advancedhivillness/ResumoMensalDAHCohortQueries.java#L990-L991 

Added lines #L990 - L991 were not covered by tests
}

/**
* Filtrando os utentes com o respectivo “Resultado de CD4” (identificado nos critérios acima
* definidos) de acordo com a seguinte definição:
Expand Down Expand Up @@ -1234,7 +1278,10 @@
cd.addParameters(getCohortParameters());

cd.addSearch(
"onSKIndication", mapStraightThrough(getPatientsWithSarcomaSKAndQuimiotherapyIndication()));
"onSKIndication",
map(
getPatientsWithSarcomaSKAndQuimiotherapyIndication(),

Check warning on line 1283 in api/src/main/java/org/openmrs/module/eptsreports/reporting/library/cohorts/advancedhivillness/ResumoMensalDAHCohortQueries.java

View check run for this annotation

Codecov / codecov/patch

api/src/main/java/org/openmrs/module/eptsreports/reporting/library/cohorts/advancedhivillness/ResumoMensalDAHCohortQueries.java#L1282-L1283 

Added lines #L1282 - L1283 were not covered by tests
"startDate=${startDate-4m+1d},endDate=${endDate},location=${location}"));

cd.addSearch(
"onDAH",
Expand Down Expand Up @@ -1262,7 +1309,9 @@

cd.addSearch(
"onSKIndicationStartedQuimio",
mapStraightThrough(getPatientsWithSarcomaSKAndStartedQuimiotherapy()));
map(
getPatientsWithSarcomaSKAndStartedQuimiotherapy(),

Check warning on line 1313 in api/src/main/java/org/openmrs/module/eptsreports/reporting/library/cohorts/advancedhivillness/ResumoMensalDAHCohortQueries.java

View check run for this annotation

Codecov / codecov/patch

api/src/main/java/org/openmrs/module/eptsreports/reporting/library/cohorts/advancedhivillness/ResumoMensalDAHCohortQueries.java#L1312-L1313 

Added lines #L1312 - L1313 were not covered by tests
"startDate=${startDate-4m+1d},endDate=${endDate},location=${location}"));

cd.addSearch(
"onDAH",
Expand Down Expand Up @@ -1406,10 +1455,12 @@

if (eightToNine) {
cd.addSearch(
"B1", map(rmB1, "startDate=${startDate-2m},endDate=${endDate},location=${location}"));
"B1",
map(rmB1, "startDate=${startDate-6m},endDate=${startDate-3m-1d},location=${location}"));

Check warning on line 1459 in api/src/main/java/org/openmrs/module/eptsreports/reporting/library/cohorts/advancedhivillness/ResumoMensalDAHCohortQueries.java

View check run for this annotation

Codecov / codecov/patch

api/src/main/java/org/openmrs/module/eptsreports/reporting/library/cohorts/advancedhivillness/ResumoMensalDAHCohortQueries.java#L1459 

Added line #L1459 was not covered by tests

cd.addSearch(
"A2", map(rmA2, "startDate=${startDate-2m},endDate=${endDate},location=${location}"));
"A2",
map(rmA2, "startDate=${startDate-6m},endDate=${startDate-3m-1d},location=${location}"));

Check warning on line 1463 in api/src/main/java/org/openmrs/module/eptsreports/reporting/library/cohorts/advancedhivillness/ResumoMensalDAHCohortQueries.java

View check run for this annotation

Codecov / codecov/patch

api/src/main/java/org/openmrs/module/eptsreports/reporting/library/cohorts/advancedhivillness/ResumoMensalDAHCohortQueries.java#L1463 

Added line #L1463 was not covered by tests
} else {
cd.addSearch(
"B1",
Expand Down Expand Up @@ -1472,14 +1523,15 @@
if (eightToNine) {
cd.addSearch(
"B3P1",
map(rmB3, "startDate=${startDate-2m},endDate=${endDate-2m},location=${location}"));
map(rmB3, "startDate=${startDate-6m},endDate=${startDate-5m-1d},location=${location}"));

Check warning on line 1526 in api/src/main/java/org/openmrs/module/eptsreports/reporting/library/cohorts/advancedhivillness/ResumoMensalDAHCohortQueries.java

View check run for this annotation

Codecov / codecov/patch

api/src/main/java/org/openmrs/module/eptsreports/reporting/library/cohorts/advancedhivillness/ResumoMensalDAHCohortQueries.java#L1526 

Added line #L1526 was not covered by tests

cd.addSearch(
"B3P2",
map(rmB3, "startDate=${startDate-1m},endDate=${endDate-1m},location=${location}"));
map(rmB3, "startDate=${startDate-5m},endDate=${startDate-4m-1d},location=${location}"));

Check warning on line 1530 in api/src/main/java/org/openmrs/module/eptsreports/reporting/library/cohorts/advancedhivillness/ResumoMensalDAHCohortQueries.java

View check run for this annotation

Codecov / codecov/patch

api/src/main/java/org/openmrs/module/eptsreports/reporting/library/cohorts/advancedhivillness/ResumoMensalDAHCohortQueries.java#L1530 

Added line #L1530 was not covered by tests

cd.addSearch(
"B3P3", map(rmB3, "startDate=${startDate},endDate=${endDate},location=${location}"));
"B3P3",
map(rmB3, "startDate=${startDate-4m},endDate=${startDate-3m-1d},location=${location}"));

Check warning on line 1534 in api/src/main/java/org/openmrs/module/eptsreports/reporting/library/cohorts/advancedhivillness/ResumoMensalDAHCohortQueries.java

View check run for this annotation

Codecov / codecov/patch

api/src/main/java/org/openmrs/module/eptsreports/reporting/library/cohorts/advancedhivillness/ResumoMensalDAHCohortQueries.java#L1534 

Added line #L1534 was not covered by tests
} else {
cd.addSearch(
"B3P1",
Expand Down Expand Up @@ -1555,7 +1607,8 @@

if (eightToNine) {
cd.addSearch(
"B12", map(rmb12, "startDate=${startDate},endDate=${endDate},location=${location}"));
"B12",
map(rmb12, "startDate=${startDate-4m},endDate=${startDate-3m-1d},location=${location}"));

Check warning on line 1611 in api/src/main/java/org/openmrs/module/eptsreports/reporting/library/cohorts/advancedhivillness/ResumoMensalDAHCohortQueries.java

View check run for this annotation

Codecov / codecov/patch

api/src/main/java/org/openmrs/module/eptsreports/reporting/library/cohorts/advancedhivillness/ResumoMensalDAHCohortQueries.java#L1611 

Added line #L1611 was not covered by tests
} else {
cd.addSearch(
"B12",
Expand Down Expand Up @@ -1606,7 +1659,9 @@

cd.addSearch(
"RM",
map(rmDefinition, "startDate=${startDate-2m},endDate=${endDate},location=${location}"));
map(

Check warning on line 1662 in api/src/main/java/org/openmrs/module/eptsreports/reporting/library/cohorts/advancedhivillness/ResumoMensalDAHCohortQueries.java

View check run for this annotation

Codecov / codecov/patch

api/src/main/java/org/openmrs/module/eptsreports/reporting/library/cohorts/advancedhivillness/ResumoMensalDAHCohortQueries.java#L1662 

Added line #L1662 was not covered by tests
rmDefinition,
"startDate=${startDate-6m},endDate=${startDate-3m-1d},location=${location}"));

cd.addSearch(
"tarvSituation", mapStraightThrough(getPatientsWithAnyArtSituationOrWithoutFichaDAH()));
Expand Down
8 changes: 6 additions & 2 deletions ...odule/eptsreports/reporting/library/datasets/resumo/ResumoMensalDAHDatasetDefinition.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -413,14 +413,18 @@
return mapStraightThrough(
eptsGeneralIndicator.getIndicator(
"Relatório- Indicador 8 – Pedido de CD4",
mapStraightThrough(resumoMensalDAHCohortQueries.getPatientsWhoHaveCd4Request())));
map(
resumoMensalDAHCohortQueries.getPatientsWhoHaveCd4Request(),

Check warning on line 417 in api/src/main/java/org/openmrs/module/eptsreports/reporting/library/datasets/resumo/ResumoMensalDAHDatasetDefinition.java

View check run for this annotation

Codecov / codecov/patch

api/src/main/java/org/openmrs/module/eptsreports/reporting/library/datasets/resumo/ResumoMensalDAHDatasetDefinition.java#L416-L417 

Added lines #L416 - L417 were not covered by tests
"startDate=${startDate-4m+1d},endDate=${startDate-3m},location=${location}")));
}

private Mapped<CohortIndicator> getPatientsWhoHaveCd4Results() {
return mapStraightThrough(
eptsGeneralIndicator.getIndicator(
"Relatório- Indicador 9 – Resultado de CD4",
mapStraightThrough(resumoMensalDAHCohortQueries.getPatientsWhoHaveCd4Results())));
map(
resumoMensalDAHCohortQueries.getPatientsWhoHaveCd4ResultsComposition(),

Check warning on line 426 in api/src/main/java/org/openmrs/module/eptsreports/reporting/library/datasets/resumo/ResumoMensalDAHDatasetDefinition.java

View check run for this annotation

Codecov / codecov/patch

api/src/main/java/org/openmrs/module/eptsreports/reporting/library/datasets/resumo/ResumoMensalDAHDatasetDefinition.java#L425-L426 

Added lines #L425 - L426 were not covered by tests
"startDate=${startDate-4m+1d},endDate=${endDate},location=${location}")));
}

private Mapped<CohortIndicator> getPatientsWithLowCd4Results() {
Expand Down
2 changes: 1 addition & 1 deletion ...java/org/openmrs/module/eptsreports/reporting/library/dimensions/EptsCommonDimension.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -295,7 +295,7 @@ public CohortDefinitionDimension maternityDimension() {
"pregnant-dah",
EptsReportUtils.map(
intensiveMonitoringCohortQueries.getMI15C(),
"startDate=${startDate-3m},endDate=${endDate},location=${location}"));
"startDate=${startDate-7m},endDate=${startDate-3m-1d},location=${location}"));
return dim;
}

Expand Down
2 changes: 1 addition & 1 deletion ...ain/java/org/openmrs/module/eptsreports/reporting/reports/SetupResumoMensalDAHReport.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ public List<ReportDesign> constructReportDesigns(ReportDefinition reportDefiniti
reportDesign =
createXlsReportDesign(
reportDefinition,
"MISAU_SESP_MASC_Resumo_Mensal_DAH_v2.1.xls",
"MISAU_SESP_MASC_Resumo_Mensal_DAH_v2_2.xls",
"Resumo Mensal de DAH",
getExcelDesignUuid(),
null);
Expand Down
Binary file removed api/src/main/resources/MISAU_SESP_MASC_Resumo_Mensal_DAH_v2.1.xls
View file
Open in desktop
Binary file not shown.
Binary file added api/src/main/resources/MISAU_SESP_MASC_Resumo_Mensal_DAH_v2_2.xls
View file
Open in desktop
Binary file not shown.