Skip to content

Family members list is not displaying properly #160

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
snehar-nd merged 2 commits into from
May 18, 2026
Merged

Family members list is not displaying properly #160

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4340aed
fix: preserve existing occupation and education when incoming values …
snehar-nd May 13, 2026
6f23596
aam-2126 Memeberlist is not displying properly
snehar-nd May 18, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions src/main/java/com/iemr/common/identity/service/IdentityService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1038,6 +1038,18 @@ public void editIdentity(IdentityEditDTO identity) throws MissingMandatoryFields
if (benDetails.getOther() != null) {
mbDetl.setOther(benDetails.getOther());
}
if (mbDetl.getOccupationId() == null && benDetails.getOccupationId() != null) {
mbDetl.setOccupationId(benDetails.getOccupationId());
}
if (mbDetl.getOccupation() == null && benDetails.getOccupation() != null) {
mbDetl.setOccupation(benDetails.getOccupation());
}
if (mbDetl.getEducationId() == null && benDetails.getEducationId() != null) {
mbDetl.setEducationId(benDetails.getEducationId());
}
if (mbDetl.getEducation() == null && benDetails.getEducation() != null) {
mbDetl.setEducation(benDetails.getEducation());
}

// Extract and set extra fields
// String identityJson = new Gson().toJson(json);
Expand Down
3 changes: 1 addition & 2 deletions src/main/java/com/iemr/common/identity/service/familyTagging/FamilyTagServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -306,9 +306,8 @@ public String getFamilyDetailsByBeneficiaryId(String request) throws IEMRExcepti
}

private void addFamilyMembersToList(List<MBeneficiarydetail> list, List<FamilyMembers> responseList) {
StringBuilder name = new StringBuilder("");
for (MBeneficiarydetail obj : list) {

StringBuilder name = new StringBuilder("");
FamilyMembers famObj = new FamilyMembers();
BigInteger benRegId = benMappingRepo.getBenRegId(obj.getBeneficiaryDetailsId(), obj.getVanID());
if (benRegId != null)
Expand Down
Loading