Merge pull request #566 from mozzy11/2.8

fix NPE on pathology when no test results exits
I-TECH-UW · Sep 26, 2023 · 30ab7ed · 30ab7ed
2 parents 33cf5fa + 9370430
commit 30ab7ed
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/frontend/src/components/resultPage/SearchResultForm.js b/frontend/src/components/resultPage/SearchResultForm.js
@@ -973,7 +973,7 @@ export function SearchResults(props) {
                 page={page}
                 pageSize={pageSize}
                 pageSizes={[100]}
-                totalItems={props.results.testResult.length}
+                totalItems={props.results.testResult?.length}
               ></Pagination>
 
               <Button type="button" id="submit" onClick={handleSave}>

diff --git a/src/main/java/org/openelisglobal/program/service/PathologySampleServiceImpl.java b/src/main/java/org/openelisglobal/program/service/PathologySampleServiceImpl.java
@@ -265,8 +265,11 @@ private void referToImmunoHistoChemistry(PathologySample pathologySample, Pathol
         if (immunoHistologyTest == null) {
             return;
         }
-
-        Analysis currentAnalysis = analysisService.getAnalysesBySampleId(pathologySample.getSample().getId()).get(0);
+        List<Analysis> analyses = analysisService.getAnalysesBySampleId(pathologySample.getSample().getId());
+        if(analyses == null || analyses.isEmpty()){
+          return;
+        }
+        Analysis currentAnalysis = analyses.get(0);
         Analysis analysis = new Analysis();
         analysis.setTest(immunoHistologyTest);
         analysis.setIsReportable(currentAnalysis.getIsReportable());