Merged in bugfix/billing-reprocess-hin-ver-npe (pull request #497)

Fix NullPointerException in BillingReprocessBillAction(s) Approved-by: Dennis Warren
open-osp · Oct 9, 2024 · c31c92a · c31c92a
2 parents 4d5930a + 50b6c70
commit c31c92a
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/src/main/java/oscar/oscarBilling/ca/bc/pageUtil/BillingReProcessBillAction.java b/src/main/java/oscar/oscarBilling/ca/bc/pageUtil/BillingReProcessBillAction.java
@@ -29,6 +29,7 @@
 import java.math.RoundingMode;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Objects;
 import java.util.Properties;
 
 import javax.servlet.ServletException;
@@ -127,7 +128,10 @@ public ActionForward execute(ActionMapping mapping,
     String billingGroupNo = billform.getGroupNo(providerNo);
     String practitionerNo = billform.getPracNo(providerNo); //p
 
-    String hcNo = demo.getHin().trim()+demo.getVer().trim(); //d
+    //d
+    String hcNo = Objects.nonNull(demo.getHin()) ?
+            demo.getHin().trim() + (Objects.nonNull(demo.getVer()) ? demo.getVer().trim() : "")
+            : "";
     String dependentNo = frm.getDependentNo(); //f
 
     String visitLocation = frm.getLocationVisit(); //f

diff --git a/src/main/java/oscar/oscarBilling/pageUtil/BillingReProcessBillAction.java b/src/main/java/oscar/oscarBilling/pageUtil/BillingReProcessBillAction.java
@@ -26,6 +26,7 @@
 import java.io.IOException;
 import java.util.Calendar;
 import java.util.GregorianCalendar;
+import java.util.Objects;
 
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletRequest;
@@ -87,7 +88,12 @@ public ActionForward execute(ActionMapping mapping,
         String name_verify  = demographicFirstName.substring(0,1) + " " + demographicLastName.substring(0,2);  //d
         String billingGroupNo=billform.getGroupNo(providerNo);
         String practitionerNo=billform.getPracNo(providerNo);//p
-        String hcNo = demo.getHin().trim()+demo.getVer().trim();//d
+
+        // d
+        String hcNo = Objects.nonNull(demo.getHin()) ?
+                demo.getHin().trim() + (Objects.nonNull(demo.getVer()) ? demo.getVer().trim() : "")
+                : "";
+
         String dependentNo = frm.getDependentNo();//f
 
         String visitLocation = frm.getLocationVisit();//f