diff --git a/src/main/java/com/iemr/common/controller/beneficiary/BeneficiaryRegistrationController.java b/src/main/java/com/iemr/common/controller/beneficiary/BeneficiaryRegistrationController.java index 67f57981..589069fd 100644 --- a/src/main/java/com/iemr/common/controller/beneficiary/BeneficiaryRegistrationController.java +++ b/src/main/java/com/iemr/common/controller/beneficiary/BeneficiaryRegistrationController.java @@ -664,9 +664,16 @@ public String getBeneficiaryIDs( } private void setBeneficiaryGender(List iBeneficiary) { + if (iBeneficiary == null || iBeneficiary.isEmpty()) { + return; + } for (BeneficiaryModel beneficiaryModel : iBeneficiary) { - if (null != beneficiaryModel.getM_gender() && beneficiaryModel.getM_gender().getGenderName() != null) + if (beneficiaryModel == null) { + continue; + } + if (beneficiaryModel.getM_gender() != null && beneficiaryModel.getM_gender().getGenderName() != null) { beneficiaryModel.setGenderName(beneficiaryModel.getM_gender().getGenderName()); + } } }