Add Test Ordered Type

Author: HerbertYiga

api/src/main/java/org/openmrs/module/labintegration/api/reports/LabResultDataSetEvaluator.java

@@ -46,6 +46,8 @@ public class LabResultDataSetEvaluator implements DataSetEvaluator {
 	private final String COLUMN_DATE_ORDERED = "Date Ordered";
 
 	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";
 
@@ -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;