Skip to content

Add Test Ordered Type #67

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

Draft
HerbertYiga wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

Add Test Ordered Type #67

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 7 additions & 0 deletions ...rc/main/java/org/openmrs/module/labintegration/api/reports/LabResultDataSetEvaluator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,8 @@ public class LabResultDataSetEvaluator implements DataSetEvaluator {

private final String COLUMN_TEST_ORDERED = "Test Ordered";

private final String COLUMN_TEST_ORDERED_TYPE = "Test Ordered Type";

private final String COLUMN_DATE_RESULTED = "Date Resulted";

private final String COLUMN_RESULT = "Result";
Expand Down Expand Up @@ -78,6 +80,8 @@ public DataSet evaluate(DataSetDefinition dataSetDefinition, EvaluationContext e
new DataSetColumn(COLUMN_DATE_ORDERED, MessageUtil.translate("labintegration.results.date.ordered"), Date.class),
new DataSetColumn(COLUMN_TEST_ORDERED, MessageUtil.translate("labintegration.results.test.ordered"),
Concept.class),
new DataSetColumn(COLUMN_TEST_ORDERED_TYPE, MessageUtil.translate("labintegration.results.test.ordered.type"),
Concept.class),
new DataSetColumn(COLUMN_DATE_RESULTED, MessageUtil.translate("labintegration.results.date.resulted"),
Date.class),
new DataSetColumn(COLUMN_RESULT, MessageUtil.translate("labintegration.results.result"), String.class));
Expand Down Expand Up @@ -111,6 +115,9 @@ public DataSet evaluate(DataSetDefinition dataSetDefinition, EvaluationContext e
case COLUMN_TEST_ORDERED:
value = ObjectUtil.format(obs.getConcept());
break;
case COLUMN_TEST_ORDERED_TYPE:
value = ObjectUtil.format(obs.getConcept().getAnswers());

@ibacher ibacher Aug 26, 2025

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Are you sure this is the right data to put in this column? This will be all the concept answers for the concept.

@HerbertYiga HerbertYiga Aug 26, 2025

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

have to change this

break;
case COLUMN_DATE_RESULTED:
value = obs.getObsDatetime();
break;
Expand Down
1 change: 1 addition & 0 deletions api/src/main/resources/messages.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,5 +32,6 @@ labintegration.results.isanteplus.id=ISantePlus ID
labintegration.results.patient.name=Patient Name
labintegration.results.date.ordered=Date Ordered
labintegration.results.test.ordered=Test Ordered
labintegration.results.test.ordered.type=Test Ordered Type
labintegration.results.date.resulted=Date Resulted
labintegration.results.result=Result
1 change: 1 addition & 0 deletions api/src/main/resources/messages_es.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,5 +32,6 @@ labintegration.results.isanteplus.id=ID de ISantePlus
labintegration.results.patient.name=Nombre del paciente
labintegration.results.date.ordered=Fecha de solicitud
labintegration.results.test.ordered=Prueba solicitada
labintegration.results.test.ordered.type=Tipo de examen ordenado
labintegration.results.date.resulted=Fecha del resultado
labintegration.results.result=Resultado
1 change: 1 addition & 0 deletions api/src/main/resources/messages_fr.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,5 +32,6 @@ labintegration.results.isanteplus.id=ID ISantePlus
labintegration.results.patient.name=Nom du patient
labintegration.results.date.ordered=Date de la commande
labintegration.results.test.ordered=Test demandé
labintegration.results.test.ordered.type=Type de commande de test
labintegration.results.date.resulted=Date du résultat
labintegration.results.result=Résultat