Skip to content

fix rmnch duplicate data issue #165

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
SauravBizbRolly merged 1 commit into from
Jun 4, 2026
Merged

fix rmnch duplicate data issue #165

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
30 changes: 18 additions & 12 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 @@ -853,7 +853,7 @@
return beneficiaryList;
}

private MBeneficiarymapping getBeneficiariesDTONew(Object[] benMapArr) {

Check failure on line 856 in src/main/java/com/iemr/common/identity/service/IdentityService.java

View check run for this annotation

SonarQubeCloud / SonarCloud Code Analysis

Refactor this method to reduce its Cognitive Complexity from 19 to the 15 allowed. 


See more on https://sonarcloud.io/project/issues?id=PSMRI_Identity-API&issues=AZ6ScVKAJDVwm76JkBoq&open=AZ6ScVKAJDVwm76JkBoq&pullRequest=165
MBeneficiarymapping mapping = new MBeneficiarymapping();
if (benMapArr != null && benMapArr.length == 12 && benMapArr[8] != null && benMapArr[9] != null) {
mapping.setBenMapId(getBigIntegerValueFromObject(benMapArr[0]));
Expand Down Expand Up @@ -884,21 +884,27 @@
//benMapOBJ = mappingRepo.getMapping(getBigIntegerValueFromObject(benMapArr[9]), (Integer) benMapArr[8]);

BigInteger benRegId = new BigInteger(benMapArr[5].toString());
RMNCHBeneficiaryDetailsRmnch obj = rMNCHBeneficiaryDetailsRmnchRepo
.getByRegID(benRegId).get(0);

if (obj != null) {
if (obj.getHouseoldId() != null) {
mapping.setHouseHoldID(obj.getHouseoldId());
}
if (obj.getGuidelineId() != null) {
mapping.setGuideLineID(obj.getGuidelineId());
}
if (obj.getRchid() != null) {
mapping.setRchID(obj.getRchid());
if(!rMNCHBeneficiaryDetailsRmnchRepo
.getByRegID(benRegId).isEmpty()){
RMNCHBeneficiaryDetailsRmnch obj = rMNCHBeneficiaryDetailsRmnchRepo
.getByRegID(benRegId).get(0);

if (obj != null) {
if (obj.getHouseoldId() != null) {
mapping.setHouseHoldID(obj.getHouseoldId());
}
if (obj.getGuidelineId() != null) {
mapping.setGuideLineID(obj.getGuidelineId());
}
if (obj.getRchid() != null) {
mapping.setRchID(obj.getRchid());
}
}
}




}
return mapping;
}
Expand Down
21 changes: 15 additions & 6 deletions src/main/java/com/iemr/common/identity/service/rmnch/RmnchDataSyncServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,12 +144,17 @@ public String syncDataToAmrit(String requestOBJ) throws Exception {
for (RMNCHBeneficiaryDetailsRmnch obj : benDetailsExtraList) {
benRegID = rMNCHMBenRegIdMapRepo.getRegID(obj.getBenficieryid());
obj.setBenRegId(benRegID);
RMNCHBeneficiaryDetailsRmnch temp = rMNCHBeneficiaryDetailsRmnchRepo
.getByRegID(benRegID).get(0);
if (temp != null) {
obj.setBeneficiaryDetails_RmnchId(temp.getBeneficiaryDetails_RmnchId());
if(!rMNCHBeneficiaryDetailsRmnchRepo
.getByRegID(benRegID).isEmpty()){
RMNCHBeneficiaryDetailsRmnch temp = rMNCHBeneficiaryDetailsRmnchRepo
.getByRegID(benRegID).get(0);
if (temp != null) {
obj.setBeneficiaryDetails_RmnchId(temp.getBeneficiaryDetails_RmnchId());
}
}



if (obj.getRelatedBeneficiaryIds() != null
&& obj.getRelatedBeneficiaryIds().length > 0) {
StringBuffer sb = new StringBuffer();
Expand Down Expand Up @@ -404,8 +409,12 @@ private String getMappingsForAddressIDs(List<RMNCHMBeneficiaryaddress> addressLi
benID = rMNCHMBenRegIdMapRepo.getBenIdFromRegID(m.getBenRegId().longValue());

if (m.getBenRegId() != null) {
benDetailsRMNCHOBJ = rMNCHBeneficiaryDetailsRmnchRepo
.getByRegID(m.getBenRegId()).get(0);
if(!rMNCHBeneficiaryDetailsRmnchRepo
.getByRegID(m.getBenRegId()).isEmpty()){
benDetailsRMNCHOBJ = rMNCHBeneficiaryDetailsRmnchRepo
.getByRegID(m.getBenRegId()).get(0);
}

benBotnBirthRMNCHROBJ = rMNCHBornBirthDetailsRepo.getByRegID(m.getBenRegId());

benCABCRMNCHROBJ = rMNCHCBACDetailsRepo.getByRegID(m.getBenRegId());
Expand Down
Loading