sort orders

Author: mozzy11

api/src/main/java/org/openmrs/module/labintegration/api/impl/LabIntegrationReportServiceImpl.java

@@ -15,6 +15,7 @@
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
+import java.util.Comparator;
 import java.util.Date;
 import java.util.LinkedHashSet;
 import java.util.List;
@@ -99,7 +100,7 @@ public List<Obs> getLabResults(Date startDate, Date endDate) {
 				        .map(o -> translateToDisplayResultTest(o)).collect(Collectors.toList());
 				testResults.addAll(displayOrders);
 			}
-			return testResults;
+			return testResults.stream().sorted(Comparator.comparing(Obs::getId)).collect(Collectors.toList());
 		}
 
 		return Collections.emptyList();
@@ -112,7 +113,7 @@ private Obs translateToDisplayResultTest(Obs obs) {
 		displayResult.setPerson(obs.getPerson());
 		displayResult.setEncounter(obs.getEncounter());
 		displayResult.setConcept(conceptService.getConcept(obs.getValueCoded().getId()));
-		displayResult.setObsDatetime(obs.getObsDatetime());
+		displayResult.setObsDatetime(null);
 		displayResult.setValueText("");
 		return displayResult;
 	}