From 50b6c70e3497ee62a14ba47ccb57b9792eb3ae0a Mon Sep 17 00:00:00 2001 From: Chitrank Date: Wed, 2 Oct 2024 20:45:59 +0530 Subject: [PATCH] Fix NullPointerException in BillingReprocessBillAction(s) --- .../ca/bc/pageUtil/BillingReProcessBillAction.java | 6 +++++- .../oscarBilling/pageUtil/BillingReProcessBillAction.java | 8 +++++++- 2 files changed, 12 insertions(+), 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 index 1bdb259374..aa1561dd4d 100644 --- 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 index faea7284da..14c0460237 100644 --- 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