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.

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

MEPTS-1607 | TB7 DIFF CCS #1298

Open
wants to merge 26 commits into
base: 2.x_develop
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
73dc407
FIX: adding semi-quantitavive criteria
helderjosue Oct 14, 2024
8b98be4
REFACTOR: removing comments
helderjosue Oct 21, 2024
33621d5
MEPTS - 1595 | MDS Report Diff in FGH DB (#1292)
TinoMuianga Oct 15, 2024
ed25753
Change on TB Active the verify on a 7 month period
TinoMuianga Oct 18, 2024
cc42dfd
Updated template
TinoMuianga Oct 18, 2024
7db0ca6
Fix on Abandono Notificado implementation
TinoMuianga Oct 18, 2024
a937bab
Fix on date notified abandono implementation
TinoMuianga Oct 18, 2024
fe8ba5d
Fix on Col AN Data do Último Levantamento Recepção Levantou ARV, chan…
TinoMuianga Oct 28, 2024
48b5438
Fix on Col AP implementation
TinoMuianga Oct 29, 2024
4155b24
Fix on Tipo De Dispensa Implementation
TinoMuianga Oct 30, 2024
3648fc4
Fix on Pregnant implementation to verify CD4 after first pregnancy oc…
TinoMuianga Nov 5, 2024
162dd67
Fix on ImmunoSevere Supression within 33 days implementation
TinoMuianga Nov 6, 2024
01ad301
Fix on Immunusupressive CD4 result within 33 days of eligiblity imple…
TinoMuianga Nov 7, 2024
7fe1dbc
Refactored Enumerations
TinoMuianga Nov 7, 2024
37ee2cf
Fix on Cascade 2 Clinets with CD4 count during Inclusion period
TinoMuianga Nov 8, 2024
f658661
fix(FR15): correct criteria to include clients with CD4 count results…
EdmilsonJembi Dec 2, 2024
6c43bfd
fix(FR20):corret the criteria to always prioritize the positive resul…
EdmilsonJembi Dec 2, 2024
9ffdbec
FIX: adding elab as source for tblam
helderjosue Dec 4, 2024
5aa1eb5
FIX: adding elab as source for tblam disagg
helderjosue Dec 5, 2024
571d517
FEAT: implementing dimension hierarchy
helderjosue Dec 5, 2024
f62c555
fix the FR19 on the cd4Under750 age gap issue
EdmilsonJembi Dec 6, 2024
8960cb9
Fixed consecutive VL Result get get the last lab consultation before …
TinoMuianga Dec 13, 2024
95027f0
Fix 2 consecutive VLs and added the dimension for 2 2VL having CD4 in…
TinoMuianga Dec 17, 2024
6c15bdf
Fix on Cascade 2 filters to verify up to report generation date
TinoMuianga Dec 17, 2024
42dac2a
fix on dimensation name
TinoMuianga Dec 17, 2024
db57d5d
Fix on CD4 in 33 days composition
TinoMuianga Dec 18, 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
Original file line number Diff line number Diff line change
Expand Up @@ -6115,4 +6115,20 @@
.getGlobalProperty("eptsreports.cd4CountGreaterThan200ConceptUuid");
return getConcept(uuid);
}

/**
* /** <b>concept_id = 165519</b>
*
* <p><b>Name:</b> CD4 SEMI-QUANTITATIVE AT ART STARTING
*
* <p><b>Description:</b>
*
* @return {@link Concept}
*/
public Concept getCD4SemiQuantitativeAtArtStartingConcept() {
String uuid =
Context.getAdministrationService()
.getGlobalProperty("eptsreports.cd4SemiQuantitativeAtArtStartingUuid");
return getConcept(uuid);

Check warning on line 6132 in api/src/main/java/org/openmrs/module/eptsreports/metadata/HivMetadata.java

View check run for this annotation

Codecov / codecov/patch

api/src/main/java/org/openmrs/module/eptsreports/metadata/HivMetadata.java#L6130-L6132

Added lines #L6130 - L6132 were not covered by tests
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
package org.openmrs.module.eptsreports.reporting.data.converter;

import java.util.Date;
import org.openmrs.module.eptsreports.reporting.utils.EptsReportUtils;
import org.openmrs.module.reporting.data.converter.DataConverter;

public class HashDateConverter implements DataConverter {

Check warning on line 7 in api/src/main/java/org/openmrs/module/eptsreports/reporting/data/converter/HashDateConverter.java

View check run for this annotation

Codecov / codecov/patch

api/src/main/java/org/openmrs/module/eptsreports/reporting/data/converter/HashDateConverter.java#L7

Added line #L7 was not covered by tests

@Override
public Object convert(Object obj) {
if (obj == null) {
return "";

Check warning on line 12 in api/src/main/java/org/openmrs/module/eptsreports/reporting/data/converter/HashDateConverter.java

View check run for this annotation

Codecov / codecov/patch

api/src/main/java/org/openmrs/module/eptsreports/reporting/data/converter/HashDateConverter.java#L12

Added line #L12 was not covered by tests
}
return EptsReportUtils.formatHashDate((Date) obj);

Check warning on line 14 in api/src/main/java/org/openmrs/module/eptsreports/reporting/data/converter/HashDateConverter.java

View check run for this annotation

Codecov / codecov/patch

api/src/main/java/org/openmrs/module/eptsreports/reporting/data/converter/HashDateConverter.java#L14

Added line #L14 was not covered by tests
}

@Override
public Class<?> getInputDataType() {
return Date.class;

Check warning on line 19 in api/src/main/java/org/openmrs/module/eptsreports/reporting/data/converter/HashDateConverter.java

View check run for this annotation

Codecov / codecov/patch

api/src/main/java/org/openmrs/module/eptsreports/reporting/data/converter/HashDateConverter.java#L19

Added line #L19 was not covered by tests
}

@Override
public Class<?> getDataType() {
return String.class;

Check warning on line 24 in api/src/main/java/org/openmrs/module/eptsreports/reporting/data/converter/HashDateConverter.java

View check run for this annotation

Codecov / codecov/patch

api/src/main/java/org/openmrs/module/eptsreports/reporting/data/converter/HashDateConverter.java#L24

Added line #L24 was not covered by tests
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,109 @@
package org.openmrs.module.eptsreports.reporting.data.converter;

import org.openmrs.module.reporting.data.converter.DataConverter;

public class MdcDispensationTypeConverter implements DataConverter {

Check warning on line 5 in api/src/main/java/org/openmrs/module/eptsreports/reporting/data/converter/MdcDispensationTypeConverter.java

View check run for this annotation

Codecov / codecov/patch

api/src/main/java/org/openmrs/module/eptsreports/reporting/data/converter/MdcDispensationTypeConverter.java#L5

Added line #L5 was not covered by tests

@Override
public Object convert(Object obj) {
if (obj == null) {
return "";

Check warning on line 10 in api/src/main/java/org/openmrs/module/eptsreports/reporting/data/converter/MdcDispensationTypeConverter.java

View check run for this annotation

Codecov / codecov/patch

api/src/main/java/org/openmrs/module/eptsreports/reporting/data/converter/MdcDispensationTypeConverter.java#L10

Added line #L10 was not covered by tests
}

switch (obj.toString()) {
case "23888":
return "DS";

Check warning on line 15 in api/src/main/java/org/openmrs/module/eptsreports/reporting/data/converter/MdcDispensationTypeConverter.java

View check run for this annotation

Codecov / codecov/patch

api/src/main/java/org/openmrs/module/eptsreports/reporting/data/converter/MdcDispensationTypeConverter.java#L15

Added line #L15 was not covered by tests

case "165175":
return "Horario Normal De Expedinte";

Check warning on line 18 in api/src/main/java/org/openmrs/module/eptsreports/reporting/data/converter/MdcDispensationTypeConverter.java

View check run for this annotation

Codecov / codecov/patch

api/src/main/java/org/openmrs/module/eptsreports/reporting/data/converter/MdcDispensationTypeConverter.java#L18

Added line #L18 was not covered by tests

case "165176":
return "Fora Do Horário";

Check warning on line 21 in api/src/main/java/org/openmrs/module/eptsreports/reporting/data/converter/MdcDispensationTypeConverter.java

View check run for this annotation

Codecov / codecov/patch

api/src/main/java/org/openmrs/module/eptsreports/reporting/data/converter/MdcDispensationTypeConverter.java#L21

Added line #L21 was not covered by tests

case "165177":
return "Farmac/Farmácia Privada";

Check warning on line 24 in api/src/main/java/org/openmrs/module/eptsreports/reporting/data/converter/MdcDispensationTypeConverter.java

View check run for this annotation

Codecov / codecov/patch

api/src/main/java/org/openmrs/module/eptsreports/reporting/data/converter/MdcDispensationTypeConverter.java#L24

Added line #L24 was not covered by tests

case "165178":
return "DCP";

Check warning on line 27 in api/src/main/java/org/openmrs/module/eptsreports/reporting/data/converter/MdcDispensationTypeConverter.java

View check run for this annotation

Codecov / codecov/patch

api/src/main/java/org/openmrs/module/eptsreports/reporting/data/converter/MdcDispensationTypeConverter.java#L27

Added line #L27 was not covered by tests

case "165179":
return "DCA";

Check warning on line 30 in api/src/main/java/org/openmrs/module/eptsreports/reporting/data/converter/MdcDispensationTypeConverter.java

View check run for this annotation

Codecov / codecov/patch

api/src/main/java/org/openmrs/module/eptsreports/reporting/data/converter/MdcDispensationTypeConverter.java#L30

Added line #L30 was not covered by tests

case "165180":
return "Brigadas Móveis Diurnas";

Check warning on line 33 in api/src/main/java/org/openmrs/module/eptsreports/reporting/data/converter/MdcDispensationTypeConverter.java

View check run for this annotation

Codecov / codecov/patch

api/src/main/java/org/openmrs/module/eptsreports/reporting/data/converter/MdcDispensationTypeConverter.java#L33

Added line #L33 was not covered by tests

case "165181":
return "Brigadas Moveis Noturnas(Hotspots)";

Check warning on line 36 in api/src/main/java/org/openmrs/module/eptsreports/reporting/data/converter/MdcDispensationTypeConverter.java

View check run for this annotation

Codecov / codecov/patch

api/src/main/java/org/openmrs/module/eptsreports/reporting/data/converter/MdcDispensationTypeConverter.java#L36

Added line #L36 was not covered by tests

case "165182":
return "Clinicas Moveis Diurnas ";

Check warning on line 39 in api/src/main/java/org/openmrs/module/eptsreports/reporting/data/converter/MdcDispensationTypeConverter.java

View check run for this annotation

Codecov / codecov/patch

api/src/main/java/org/openmrs/module/eptsreports/reporting/data/converter/MdcDispensationTypeConverter.java#L39

Added line #L39 was not covered by tests

case "165183":
return "Clinicas Moveis Noturnas(Hotspots)";

Check warning on line 42 in api/src/main/java/org/openmrs/module/eptsreports/reporting/data/converter/MdcDispensationTypeConverter.java

View check run for this annotation

Codecov / codecov/patch

api/src/main/java/org/openmrs/module/eptsreports/reporting/data/converter/MdcDispensationTypeConverter.java#L42

Added line #L42 was not covered by tests

case "23730":
return "DT";

Check warning on line 45 in api/src/main/java/org/openmrs/module/eptsreports/reporting/data/converter/MdcDispensationTypeConverter.java

View check run for this annotation

Codecov / codecov/patch

api/src/main/java/org/openmrs/module/eptsreports/reporting/data/converter/MdcDispensationTypeConverter.java#L45

Added line #L45 was not covered by tests

case "165264":
return "BM";

Check warning on line 48 in api/src/main/java/org/openmrs/module/eptsreports/reporting/data/converter/MdcDispensationTypeConverter.java

View check run for this annotation

Codecov / codecov/patch

api/src/main/java/org/openmrs/module/eptsreports/reporting/data/converter/MdcDispensationTypeConverter.java#L48

Added line #L48 was not covered by tests

case "165265":
return "CM";

Check warning on line 51 in api/src/main/java/org/openmrs/module/eptsreports/reporting/data/converter/MdcDispensationTypeConverter.java

View check run for this annotation

Codecov / codecov/patch

api/src/main/java/org/openmrs/module/eptsreports/reporting/data/converter/MdcDispensationTypeConverter.java#L51

Added line #L51 was not covered by tests

case "23725":
return "AF";

Check warning on line 54 in api/src/main/java/org/openmrs/module/eptsreports/reporting/data/converter/MdcDispensationTypeConverter.java

View check run for this annotation

Codecov / codecov/patch

api/src/main/java/org/openmrs/module/eptsreports/reporting/data/converter/MdcDispensationTypeConverter.java#L54

Added line #L54 was not covered by tests

case "23729":
return "FR";

Check warning on line 57 in api/src/main/java/org/openmrs/module/eptsreports/reporting/data/converter/MdcDispensationTypeConverter.java

View check run for this annotation

Codecov / codecov/patch

api/src/main/java/org/openmrs/module/eptsreports/reporting/data/converter/MdcDispensationTypeConverter.java#L57

Added line #L57 was not covered by tests

case "23724":
return "AG";

Check warning on line 60 in api/src/main/java/org/openmrs/module/eptsreports/reporting/data/converter/MdcDispensationTypeConverter.java

View check run for this annotation

Codecov / codecov/patch

api/src/main/java/org/openmrs/module/eptsreports/reporting/data/converter/MdcDispensationTypeConverter.java#L60

Added line #L60 was not covered by tests

case "165317":
return "TB";

Check warning on line 63 in api/src/main/java/org/openmrs/module/eptsreports/reporting/data/converter/MdcDispensationTypeConverter.java

View check run for this annotation

Codecov / codecov/patch

api/src/main/java/org/openmrs/module/eptsreports/reporting/data/converter/MdcDispensationTypeConverter.java#L63

Added line #L63 was not covered by tests

case "165318":
return "CT";

Check warning on line 66 in api/src/main/java/org/openmrs/module/eptsreports/reporting/data/converter/MdcDispensationTypeConverter.java

View check run for this annotation

Codecov / codecov/patch

api/src/main/java/org/openmrs/module/eptsreports/reporting/data/converter/MdcDispensationTypeConverter.java#L66

Added line #L66 was not covered by tests

case "165319":
return "SAAJ";

Check warning on line 69 in api/src/main/java/org/openmrs/module/eptsreports/reporting/data/converter/MdcDispensationTypeConverter.java

View check run for this annotation

Codecov / codecov/patch

api/src/main/java/org/openmrs/module/eptsreports/reporting/data/converter/MdcDispensationTypeConverter.java#L69

Added line #L69 was not covered by tests

case "165320":
return "SMI";

Check warning on line 72 in api/src/main/java/org/openmrs/module/eptsreports/reporting/data/converter/MdcDispensationTypeConverter.java

View check run for this annotation

Codecov / codecov/patch

api/src/main/java/org/openmrs/module/eptsreports/reporting/data/converter/MdcDispensationTypeConverter.java#L72

Added line #L72 was not covered by tests

case "165321":
return "DAH";

Check warning on line 75 in api/src/main/java/org/openmrs/module/eptsreports/reporting/data/converter/MdcDispensationTypeConverter.java

View check run for this annotation

Codecov / codecov/patch

api/src/main/java/org/openmrs/module/eptsreports/reporting/data/converter/MdcDispensationTypeConverter.java#L75

Added line #L75 was not covered by tests

case "165314":
return "DA";

Check warning on line 78 in api/src/main/java/org/openmrs/module/eptsreports/reporting/data/converter/MdcDispensationTypeConverter.java

View check run for this annotation

Codecov / codecov/patch

api/src/main/java/org/openmrs/module/eptsreports/reporting/data/converter/MdcDispensationTypeConverter.java#L78

Added line #L78 was not covered by tests

case "165315":
return "DD";

Check warning on line 81 in api/src/main/java/org/openmrs/module/eptsreports/reporting/data/converter/MdcDispensationTypeConverter.java

View check run for this annotation

Codecov / codecov/patch

api/src/main/java/org/openmrs/module/eptsreports/reporting/data/converter/MdcDispensationTypeConverter.java#L81

Added line #L81 was not covered by tests

case "23726":
return "CA";

Check warning on line 84 in api/src/main/java/org/openmrs/module/eptsreports/reporting/data/converter/MdcDispensationTypeConverter.java

View check run for this annotation

Codecov / codecov/patch

api/src/main/java/org/openmrs/module/eptsreports/reporting/data/converter/MdcDispensationTypeConverter.java#L84

Added line #L84 was not covered by tests

case "165316":
return "EH";

Check warning on line 87 in api/src/main/java/org/openmrs/module/eptsreports/reporting/data/converter/MdcDispensationTypeConverter.java

View check run for this annotation

Codecov / codecov/patch

api/src/main/java/org/openmrs/module/eptsreports/reporting/data/converter/MdcDispensationTypeConverter.java#L87

Added line #L87 was not covered by tests

case "23727":
return "PU";

Check warning on line 90 in api/src/main/java/org/openmrs/module/eptsreports/reporting/data/converter/MdcDispensationTypeConverter.java

View check run for this annotation

Codecov / codecov/patch

api/src/main/java/org/openmrs/module/eptsreports/reporting/data/converter/MdcDispensationTypeConverter.java#L90

Added line #L90 was not covered by tests

case "165340":
return "DB";

Check warning on line 93 in api/src/main/java/org/openmrs/module/eptsreports/reporting/data/converter/MdcDispensationTypeConverter.java

View check run for this annotation

Codecov / codecov/patch

api/src/main/java/org/openmrs/module/eptsreports/reporting/data/converter/MdcDispensationTypeConverter.java#L93

Added line #L93 was not covered by tests

default:
return "";

Check warning on line 96 in api/src/main/java/org/openmrs/module/eptsreports/reporting/data/converter/MdcDispensationTypeConverter.java

View check run for this annotation

Codecov / codecov/patch

api/src/main/java/org/openmrs/module/eptsreports/reporting/data/converter/MdcDispensationTypeConverter.java#L96

Added line #L96 was not covered by tests
}
}

@Override
public Class<?> getInputDataType() {
return String.class;

Check warning on line 102 in api/src/main/java/org/openmrs/module/eptsreports/reporting/data/converter/MdcDispensationTypeConverter.java

View check run for this annotation

Codecov / codecov/patch

api/src/main/java/org/openmrs/module/eptsreports/reporting/data/converter/MdcDispensationTypeConverter.java#L102

Added line #L102 was not covered by tests
}

@Override
public Class<?> getDataType() {
return String.class;

Check warning on line 107 in api/src/main/java/org/openmrs/module/eptsreports/reporting/data/converter/MdcDispensationTypeConverter.java

View check run for this annotation

Codecov / codecov/patch

api/src/main/java/org/openmrs/module/eptsreports/reporting/data/converter/MdcDispensationTypeConverter.java#L107

Added line #L107 was not covered by tests
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@

switch (obj.toString()) {
case "23814":
return "INDETECTÁVEL";
return "INDETECTAVEL";

Check warning on line 16 in api/src/main/java/org/openmrs/module/eptsreports/reporting/data/converter/ViralLoadQualitativeLabelConverter.java

View check run for this annotation

Codecov / codecov/patch

api/src/main/java/org/openmrs/module/eptsreports/reporting/data/converter/ViralLoadQualitativeLabelConverter.java#L16

Added line #L16 was not covered by tests
case "1306":
return "NIVEL BAIXO DE DETECÇÃO";
case "23905":
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@
@Override
public Object convert(Object o) {
if (o == null) {
return "Sim";
return "Não";

Check warning on line 10 in api/src/main/java/org/openmrs/module/eptsreports/reporting/data/converter/YesOrNoConverter.java

View check run for this annotation

Codecov / codecov/patch

api/src/main/java/org/openmrs/module/eptsreports/reporting/data/converter/YesOrNoConverter.java#L10

Added line #L10 was not covered by tests
}
return "Não";
return "Sim";

Check warning on line 12 in api/src/main/java/org/openmrs/module/eptsreports/reporting/data/converter/YesOrNoConverter.java

View check run for this annotation

Codecov / codecov/patch

api/src/main/java/org/openmrs/module/eptsreports/reporting/data/converter/YesOrNoConverter.java#L12

Added line #L12 was not covered by tests
}

@Override
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
package org.openmrs.module.eptsreports.reporting.data.converter;

import org.openmrs.module.reporting.data.converter.DataConverter;

public class ZeroResultConverter implements DataConverter {

Check warning on line 5 in api/src/main/java/org/openmrs/module/eptsreports/reporting/data/converter/ZeroResultConverter.java

View check run for this annotation

Codecov / codecov/patch

api/src/main/java/org/openmrs/module/eptsreports/reporting/data/converter/ZeroResultConverter.java#L5

Added line #L5 was not covered by tests

@Override
public Object convert(Object obj) {
if (obj == null) {
return "0";

Check warning on line 10 in api/src/main/java/org/openmrs/module/eptsreports/reporting/data/converter/ZeroResultConverter.java

View check run for this annotation

Codecov / codecov/patch

api/src/main/java/org/openmrs/module/eptsreports/reporting/data/converter/ZeroResultConverter.java#L10

Added line #L10 was not covered by tests
}
return obj.toString();

Check warning on line 12 in api/src/main/java/org/openmrs/module/eptsreports/reporting/data/converter/ZeroResultConverter.java

View check run for this annotation

Codecov / codecov/patch

api/src/main/java/org/openmrs/module/eptsreports/reporting/data/converter/ZeroResultConverter.java#L12

Added line #L12 was not covered by tests
}

@Override
public Class<?> getInputDataType() {
return String.class;

Check warning on line 17 in api/src/main/java/org/openmrs/module/eptsreports/reporting/data/converter/ZeroResultConverter.java

View check run for this annotation

Codecov / codecov/patch

api/src/main/java/org/openmrs/module/eptsreports/reporting/data/converter/ZeroResultConverter.java#L17

Added line #L17 was not covered by tests
}

@Override
public Class<?> getDataType() {
return String.class;

Check warning on line 22 in api/src/main/java/org/openmrs/module/eptsreports/reporting/data/converter/ZeroResultConverter.java

View check run for this annotation

Codecov / codecov/patch

api/src/main/java/org/openmrs/module/eptsreports/reporting/data/converter/ZeroResultConverter.java#L22

Added line #L22 was not covered by tests
}
}
Loading