From 25a04869f504b3f507419ed0b78c2837b9ae9183 Mon Sep 17 00:00:00 2001 From: Saurav Mishra Date: Thu, 4 Jun 2026 13:07:11 +0530 Subject: [PATCH 1/2] fix rmnch duplicate data issue --- .../repo/rmnch/RMNCHBeneficiaryDetailsRmnchRepo.java | 3 ++- .../common/identity/repo/rmnch/RMNCHMBenRegIdMapRepo.java | 1 + .../com/iemr/common/identity/service/IdentityService.java | 2 +- .../identity/service/rmnch/RmnchDataSyncServiceImpl.java | 7 ++----- 4 files changed, 6 insertions(+), 7 deletions(-) diff --git a/src/main/java/com/iemr/common/identity/repo/rmnch/RMNCHBeneficiaryDetailsRmnchRepo.java b/src/main/java/com/iemr/common/identity/repo/rmnch/RMNCHBeneficiaryDetailsRmnchRepo.java index 405e0bc5..52916f31 100644 --- a/src/main/java/com/iemr/common/identity/repo/rmnch/RMNCHBeneficiaryDetailsRmnchRepo.java +++ b/src/main/java/com/iemr/common/identity/repo/rmnch/RMNCHBeneficiaryDetailsRmnchRepo.java @@ -22,6 +22,7 @@ package com.iemr.common.identity.repo.rmnch; import java.math.BigInteger; +import java.util.List; import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.CrudRepository; @@ -37,5 +38,5 @@ public RMNCHBeneficiaryDetailsRmnch getByIdAndVanID(@Param("vanSerialNo") BigInt @Param("vanID") int vanID); @Query(" SELECT t FROM RMNCHBeneficiaryDetailsRmnch t WHERE t.BenRegId =:benRegID ") - public RMNCHBeneficiaryDetailsRmnch getByRegID(@Param("benRegID") BigInteger benRegId); + public List getByRegID(@Param("benRegID") BigInteger benRegId); } diff --git a/src/main/java/com/iemr/common/identity/repo/rmnch/RMNCHMBenRegIdMapRepo.java b/src/main/java/com/iemr/common/identity/repo/rmnch/RMNCHMBenRegIdMapRepo.java index 2bf2a607..ae17ef7f 100644 --- a/src/main/java/com/iemr/common/identity/repo/rmnch/RMNCHMBenRegIdMapRepo.java +++ b/src/main/java/com/iemr/common/identity/repo/rmnch/RMNCHMBenRegIdMapRepo.java @@ -22,6 +22,7 @@ package com.iemr.common.identity.repo.rmnch; import java.math.BigInteger; +import java.util.List; import org.springframework.data.jpa.repository.Modifying; import org.springframework.data.jpa.repository.Query; diff --git a/src/main/java/com/iemr/common/identity/service/IdentityService.java b/src/main/java/com/iemr/common/identity/service/IdentityService.java index afb193e3..95df5a0a 100644 --- a/src/main/java/com/iemr/common/identity/service/IdentityService.java +++ b/src/main/java/com/iemr/common/identity/service/IdentityService.java @@ -885,7 +885,7 @@ private MBeneficiarymapping getBeneficiariesDTONew(Object[] benMapArr) { BigInteger benRegId = new BigInteger(benMapArr[5].toString()); RMNCHBeneficiaryDetailsRmnch obj = rMNCHBeneficiaryDetailsRmnchRepo - .getByRegID(benRegId); + .getByRegID(benRegId).get(0); if (obj != null) { if (obj.getHouseoldId() != null) { diff --git a/src/main/java/com/iemr/common/identity/service/rmnch/RmnchDataSyncServiceImpl.java b/src/main/java/com/iemr/common/identity/service/rmnch/RmnchDataSyncServiceImpl.java index bd973193..7dc7806c 100644 --- a/src/main/java/com/iemr/common/identity/service/rmnch/RmnchDataSyncServiceImpl.java +++ b/src/main/java/com/iemr/common/identity/service/rmnch/RmnchDataSyncServiceImpl.java @@ -31,19 +31,16 @@ import java.util.List; import java.util.Map; import java.util.regex.Pattern; - import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Qualifier; import org.springframework.beans.factory.annotation.Value; -import org.springframework.context.annotation.PropertySource; import org.springframework.data.domain.Page; import org.springframework.data.domain.PageRequest; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; - import com.google.gson.Gson; import com.google.gson.JsonElement; import com.google.gson.JsonObject; @@ -148,7 +145,7 @@ public String syncDataToAmrit(String requestOBJ) throws Exception { benRegID = rMNCHMBenRegIdMapRepo.getRegID(obj.getBenficieryid()); obj.setBenRegId(benRegID); RMNCHBeneficiaryDetailsRmnch temp = rMNCHBeneficiaryDetailsRmnchRepo - .getByRegID(benRegID); + .getByRegID(benRegID).get(0); if (temp != null) { obj.setBeneficiaryDetails_RmnchId(temp.getBeneficiaryDetails_RmnchId()); } @@ -407,7 +404,7 @@ private String getMappingsForAddressIDs(List addressLi if (m.getBenRegId() != null) { benDetailsRMNCHOBJ = rMNCHBeneficiaryDetailsRmnchRepo - .getByRegID(m.getBenRegId()); + .getByRegID(m.getBenRegId()).get(0); benBotnBirthRMNCHROBJ = rMNCHBornBirthDetailsRepo.getByRegID(m.getBenRegId()); benCABCRMNCHROBJ = rMNCHCBACDetailsRepo.getByRegID(m.getBenRegId()); From 0021215097f859a5c055c9087dcf5e6a2b372825 Mon Sep 17 00:00:00 2001 From: Saurav Mishra Date: Thu, 4 Jun 2026 14:51:34 +0530 Subject: [PATCH 2/2] fix rmnch duplicate data issue --- .../identity/controller/rmnch/RMNCHMobileAppController.java | 1 + .../identity/service/rmnch/RmnchDataSyncServiceImpl.java | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/iemr/common/identity/controller/rmnch/RMNCHMobileAppController.java b/src/main/java/com/iemr/common/identity/controller/rmnch/RMNCHMobileAppController.java index 26b2694c..198fd5fc 100644 --- a/src/main/java/com/iemr/common/identity/controller/rmnch/RMNCHMobileAppController.java +++ b/src/main/java/com/iemr/common/identity/controller/rmnch/RMNCHMobileAppController.java @@ -66,6 +66,7 @@ public String syncDataToAmrit(@RequestBody String requestOBJ) { response.setError(5000, "Invalid/NULL request obj"); } catch (Exception e) { logger.error("Error in RMNCH mobile data sync : {} " , e.getMessage()); + e.printStackTrace(); response.setError(5000, "Error in RMNCH mobile data sync : " + e); } return response.toString(); diff --git a/src/main/java/com/iemr/common/identity/service/rmnch/RmnchDataSyncServiceImpl.java b/src/main/java/com/iemr/common/identity/service/rmnch/RmnchDataSyncServiceImpl.java index 7dc7806c..df24e584 100644 --- a/src/main/java/com/iemr/common/identity/service/rmnch/RmnchDataSyncServiceImpl.java +++ b/src/main/java/com/iemr/common/identity/service/rmnch/RmnchDataSyncServiceImpl.java @@ -254,7 +254,8 @@ public String syncDataToAmrit(String requestOBJ) throws Exception { } catch ( Exception e) { - throw new Exception(e.getMessage()); + throw new Exception(e); // ✅ original exception wrap karo + } resultMap.put("beneficiaryDetails", beneficiaryDetailsIds); resultMap.put("bornBirthDeatils", bornBirthDeatilsIds);