Skip to content

Commit

Permalink
Merge pull request #1278 from mozzy11/develop
Browse files Browse the repository at this point in the history
only reports with results should only print validated results
  • Loading branch information
mozzy11 authored Oct 17, 2024
2 parents 4f13546 + 8997695 commit 8854f5c
Showing 1 changed file with 8 additions and 6 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -313,14 +313,16 @@ private List<Sample> findReportSamplesForSite(String referringSiteId, String ref

if (onlyResults) {
Set<Integer> analysisStatusIds = new HashSet<>();
analysisStatusIds.add(Integer.parseInt(
SpringContext.getBean(IStatusService.class).getStatusID(AnalysisStatus.BiologistRejected)));
analysisStatusIds.add(Integer
.parseInt(SpringContext.getBean(IStatusService.class).getStatusID(AnalysisStatus.Finalized)));
analysisStatusIds.add(Integer.parseInt(
SpringContext.getBean(IStatusService.class).getStatusID(AnalysisStatus.TechnicalAcceptance)));
analysisStatusIds.add(Integer.parseInt(
SpringContext.getBean(IStatusService.class).getStatusID(AnalysisStatus.TechnicalRejected)));
/**
* analysisStatusIds.add(Integer.parseInt(
* SpringContext.getBean(IStatusService.class).getStatusID(AnalysisStatus.BiologistRejected)));
* analysisStatusIds.add(Integer.parseInt(
* SpringContext.getBean(IStatusService.class).getStatusID(AnalysisStatus.TechnicalAcceptance)));
* analysisStatusIds.add(Integer.parseInt(
* SpringContext.getBean(IStatusService.class).getStatusID(AnalysisStatus.TechnicalRejected)));
**/
sampleList = sampleList.stream().filter(
e -> (analysisService.getAnalysesBySampleIdAndStatusId(e.getId(), analysisStatusIds).size() > 0))
.collect(Collectors.toList());
Expand Down

0 comments on commit 8854f5c

Please sign in to comment.