From eb917b2eb4901874502a598bc46d751010304524 Mon Sep 17 00:00:00 2001 From: SnehaRH Date: Thu, 2 Apr 2026 15:21:35 +0530 Subject: [PATCH 1/3] fix: property values are not fetching after deploying in linux server --- .../common/utils/config/ConfigProperties.java | 40 ++++++++++++------- 1 file changed, 25 insertions(+), 15 deletions(-) diff --git a/src/main/java/com/iemr/common/utils/config/ConfigProperties.java b/src/main/java/com/iemr/common/utils/config/ConfigProperties.java index 59b69b82..1dd21fff 100644 --- a/src/main/java/com/iemr/common/utils/config/ConfigProperties.java +++ b/src/main/java/com/iemr/common/utils/config/ConfigProperties.java @@ -140,21 +140,31 @@ public static int getSessionExpiryTime() } public static String getPropertyByName(String propertyName) - { - String result = null; - try - { - if (properties == null) - { - initalizeProperties(); - } - result = properties.getProperty(propertyName).trim(); - } catch (Exception e) - { - logger.error(propertyName + " retrival failed.", e); - } - return result; - } + { + String result = null; + try + { + if (environment != null) + { + result = environment.getProperty(propertyName); + } + if (result == null) + { + if (properties == null) + { + initalizeProperties(); + } + result = properties.getProperty(propertyName).trim(); + } else + { + result = result.trim(); + } + } catch (Exception e) + { + logger.error(propertyName + " retrival failed.", e); + } + return result; + } public static Boolean getBoolean(String propertyName) { From 56e33f86d65629d5933cdb51e02c095eb6bb50ee Mon Sep 17 00:00:00 2001 From: snehar-nd Date: Wed, 13 May 2026 19:55:27 +0530 Subject: [PATCH 2/3] fix: occupationID and educationID not saved during beneficiary update setDemographicDetails() was overwriting occupationName (already set correctly by the mapper from occupationID) with null when no occupation name string was present in the payload. Added null guards so the mapper's resolved name is preserved, and explicitly set occupationId/educationId from i_bendemographics to ensure the IDs always reach Identity-API. Co-Authored-By: Claude Sonnet 4.6 --- .../RegisterBenificiaryServiceImpl.java | 25 +++++++++++-------- 1 file changed, 15 insertions(+), 10 deletions(-) diff --git a/src/main/java/com/iemr/common/service/beneficiary/RegisterBenificiaryServiceImpl.java b/src/main/java/com/iemr/common/service/beneficiary/RegisterBenificiaryServiceImpl.java index 82acb58f..d96d49a0 100644 --- a/src/main/java/com/iemr/common/service/beneficiary/RegisterBenificiaryServiceImpl.java +++ b/src/main/java/com/iemr/common/service/beneficiary/RegisterBenificiaryServiceImpl.java @@ -155,20 +155,25 @@ else if(null != benificiaryDetails.getI_bendemographics().getReligion()) identityEditDTO.setReligion(benificiaryDetails.getI_bendemographics().getReligionName()); if (null != benificiaryDetails.getOccupation()) { - identityEditDTO.setOccupationName(benificiaryDetails.getOccupation()); - } else if (null != benificiaryDetails.getI_bendemographics() && - null != benificiaryDetails.getI_bendemographics().getOccupation()) { - identityEditDTO.setOccupationName(benificiaryDetails.getI_bendemographics().getOccupation()); - } else { - identityEditDTO.setOccupationName(benificiaryDetails.getOccupationName()); + identityEditDTO.setOccupationName(benificiaryDetails.getOccupation()); + } else if (null != benificiaryDetails.getI_bendemographics().getOccupation()) { + identityEditDTO.setOccupationName(benificiaryDetails.getI_bendemographics().getOccupation()); + } else if (null != benificiaryDetails.getOccupationName()) { + identityEditDTO.setOccupationName(benificiaryDetails.getOccupationName()); + } + if (null != benificiaryDetails.getI_bendemographics().getOccupationID()) { + identityEditDTO.setOccupationId(benificiaryDetails.getI_bendemographics().getOccupationID()); } if (null != benificiaryDetails.getEducation()) { - identityEditDTO.setEducation(benificiaryDetails.getEducation()); + identityEditDTO.setEducation(benificiaryDetails.getEducation()); } else if (null != benificiaryDetails.getI_bendemographics() && - null != benificiaryDetails.getI_bendemographics().getEducationName()) { - identityEditDTO.setEducation(benificiaryDetails.getI_bendemographics().getEducationName()); - } + null != benificiaryDetails.getI_bendemographics().getEducationName()) { + identityEditDTO.setEducation(benificiaryDetails.getI_bendemographics().getEducationName()); + } + if (null != benificiaryDetails.getI_bendemographics().getEducationID()) { + identityEditDTO.setEducationId(benificiaryDetails.getI_bendemographics().getEducationID()); + } if(null != benificiaryDetails.getIncomeStatus()) identityEditDTO.setIncomeStatus(benificiaryDetails.getIncomeStatus()); else From c57450654eda6f6cf074f9cd1f69e2a26d4fed9a Mon Sep 17 00:00:00 2001 From: snehar-nd Date: Wed, 13 May 2026 20:28:58 +0530 Subject: [PATCH 3/3] Revert "fix: property values are not fetching after deploying in linux server" This reverts commit eb917b2eb4901874502a598bc46d751010304524. --- .../common/utils/config/ConfigProperties.java | 40 +++++++------------ 1 file changed, 15 insertions(+), 25 deletions(-) diff --git a/src/main/java/com/iemr/common/utils/config/ConfigProperties.java b/src/main/java/com/iemr/common/utils/config/ConfigProperties.java index 1dd21fff..59b69b82 100644 --- a/src/main/java/com/iemr/common/utils/config/ConfigProperties.java +++ b/src/main/java/com/iemr/common/utils/config/ConfigProperties.java @@ -140,31 +140,21 @@ public static int getSessionExpiryTime() } public static String getPropertyByName(String propertyName) - { - String result = null; - try - { - if (environment != null) - { - result = environment.getProperty(propertyName); - } - if (result == null) - { - if (properties == null) - { - initalizeProperties(); - } - result = properties.getProperty(propertyName).trim(); - } else - { - result = result.trim(); - } - } catch (Exception e) - { - logger.error(propertyName + " retrival failed.", e); - } - return result; - } + { + String result = null; + try + { + if (properties == null) + { + initalizeProperties(); + } + result = properties.getProperty(propertyName).trim(); + } catch (Exception e) + { + logger.error(propertyName + " retrival failed.", e); + } + return result; + } public static Boolean getBoolean(String propertyName) {