From 9370430f2f5e43cfda53dcafa58d5e48d0eaa45e Mon Sep 17 00:00:00 2001
From: Mutesasira Moses <mozzymutesa@gmail.com>
Date: Tue, 26 Sep 2023 22:13:43 +0300
Subject: [PATCH] fix NPE on pathology when no test results exits

---
 frontend/src/components/resultPage/SearchResultForm.js     | 2 +-
 .../program/service/PathologySampleServiceImpl.java        | 7 +++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/frontend/src/components/resultPage/SearchResultForm.js b/frontend/src/components/resultPage/SearchResultForm.js
index a5e01245a7..8c88904c26 100644
--- 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
index 7d27ba1446..d4c978bbca 100644
--- 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());