@@ -46,7 +46,7 @@ public class LabResultDataSetEvaluator implements DataSetEvaluator {
4646 private final String COLUMN_DATE_ORDERED = "Date Ordered" ;
4747
4848 private final String COLUMN_TEST_ORDERED = "Test Ordered" ;
49-
49+
5050 private final String COLUMN_TEST_ORDERED_TYPE = "Test Ordered Type" ;
5151
5252 private final String COLUMN_DATE_RESULTED = "Date Resulted" ;
@@ -80,8 +80,8 @@ public DataSet evaluate(DataSetDefinition dataSetDefinition, EvaluationContext e
8080 new DataSetColumn (COLUMN_DATE_ORDERED , MessageUtil .translate ("labintegration.results.date.ordered" ), Date .class ),
8181 new DataSetColumn (COLUMN_TEST_ORDERED , MessageUtil .translate ("labintegration.results.test.ordered" ),
8282 Concept .class ),
83- new DataSetColumn (COLUMN_TEST_ORDERED_TYPE , MessageUtil .translate ("labintegration.results.test.ordered_type " ),
84- Concept .class ),
83+ new DataSetColumn (COLUMN_TEST_ORDERED_TYPE , MessageUtil .translate ("labintegration.results.test.ordered.type " ),
84+ Concept .class ),
8585 new DataSetColumn (COLUMN_DATE_RESULTED , MessageUtil .translate ("labintegration.results.date.resulted" ),
8686 Date .class ),
8787 new DataSetColumn (COLUMN_RESULT , MessageUtil .translate ("labintegration.results.result" ), String .class ));
@@ -116,8 +116,8 @@ public DataSet evaluate(DataSetDefinition dataSetDefinition, EvaluationContext e
116116 value = ObjectUtil .format (obs .getConcept ());
117117 break ;
118118 case COLUMN_TEST_ORDERED_TYPE :
119- value = ObjectUtil .format (obs .getConcept ().getAnswers ());
120- break ;
119+ value = ObjectUtil .format (obs .getConcept ().getAnswers ());
120+ break ;
121121 case COLUMN_DATE_RESULTED :
122122 value = obs .getObsDatetime ();
123123 break ;
0 commit comments