public RadiologyOrderVoCollection listRadOrderInvestigation(ServiceRefVo serviceRefVo, LocationRefVo voLocationRef, Category category, Boolean bCompleted, Date fromDate, Date toDate) { OrderInvStatus[] statuses = null; if (bCompleted != null && bCompleted) statuses = new OrderInvStatus[]{OrderInvStatus.COMPLETE}; else statuses = new OrderInvStatus[]{OrderInvStatus.SENT, OrderInvStatus.ACCEPTED, OrderInvStatus.ORDERED, OrderInvStatus.CHANGED, OrderInvStatus.PROVIDER_CHANGE_REJECTED}; //WDEV-12054 // WDEV-11643 List results = listOrderInvestigation(serviceRefVo, voLocationRef, statuses, category, fromDate, toDate); //WDEV-12054 HashMap map = new HashMap(); ClinicalImagingResults impl = (ClinicalImagingResults) getDomainImpl(ClinicalImagingResultsImpl.class); map = impl.getListXoHistory(map, results); RadiologyOrderVoCollection voCollResults = RadiologyOrderVoAssembler.createRadiologyOrderVoCollectionFromOrderInvestigation(results).sort(SortOrder.DESCENDING); if(voCollResults != null) { for(RadiologyOrderVo voResult : voCollResults) { if(map.containsKey(voResult.getID_OrderInvestigation())) { voResult.setOrdInvXOStatusHistory((OrdInvXOStatusHistoryLiteVoCollection) map.get(voResult.getID_OrderInvestigation())); } } } return voCollResults; }