diff --git a/api/src/main/java/org/openmrs/module/labintegration/api/reports/LabResultDataSetEvaluator.java b/api/src/main/java/org/openmrs/module/labintegration/api/reports/LabResultDataSetEvaluator.java index 460d9e6..b2f8208 100644 --- a/api/src/main/java/org/openmrs/module/labintegration/api/reports/LabResultDataSetEvaluator.java +++ b/api/src/main/java/org/openmrs/module/labintegration/api/reports/LabResultDataSetEvaluator.java @@ -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"; @@ -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)); @@ -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()); + break; case COLUMN_DATE_RESULTED: value = obs.getObsDatetime(); break; diff --git a/api/src/main/resources/messages.properties b/api/src/main/resources/messages.properties index f267df1..9c5e122 100644 --- a/api/src/main/resources/messages.properties +++ b/api/src/main/resources/messages.properties @@ -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 diff --git a/api/src/main/resources/messages_es.properties b/api/src/main/resources/messages_es.properties index 9515fd1..493f6e1 100644 --- a/api/src/main/resources/messages_es.properties +++ b/api/src/main/resources/messages_es.properties @@ -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 diff --git a/api/src/main/resources/messages_fr.properties b/api/src/main/resources/messages_fr.properties index 68c165d..d54e5bc 100644 --- a/api/src/main/resources/messages_fr.properties +++ b/api/src/main/resources/messages_fr.properties @@ -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