PSMRI · snehar-nd · Sep 25, 2025 · Jan 8, 2026 · Jan 8, 2026 · Jan 30, 2026
diff --git a/pom.xml b/pom.xml
@@ -5,7 +5,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>com.iemr.common.identity</groupId>
 	<artifactId>identity-api</artifactId>
-	<version>3.6.2</version>
+	<version>3.8.0</version>
 
 	<packaging>war</packaging>
 

diff --git a/src/main/java/com/iemr/common/identity/controller/IdentityController.java b/src/main/java/com/iemr/common/identity/controller/IdentityController.java
@@ -30,10 +30,13 @@
 import java.util.List;
 import java.util.Objects;
 
+import com.iemr.common.identity.data.rmnch.RMNCHBeneficiaryDetailsRmnch;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -315,6 +318,17 @@ public String searchBeneficiaryByVillageIdAndLastModDate(
 		}
 		return response;
 	}
+
+
+	@PostMapping("/getRmnchDataByBenRedID")
+	public ResponseEntity<RMNCHBeneficiaryDetailsRmnch> getRmnchDataByBenID(@RequestBody BigInteger object) {
-	@PostMapping("/getRmnchDataByBenRedID")
-	public ResponseEntity<RMNCHBeneficiaryDetailsRmnch> getRmnchDataByBenID(@RequestBody BigInteger object) {
+	`@Operation`(summary = "Get RMNCH data by beneficiary registration id")
+	`@PostMapping`("/getRmnchDataByBenRegID")
+	public ResponseEntity<RMNCHBeneficiaryDetailsRmnch> getRmnchDataByBenID(`@RequestBody` BigInteger object) {
-	@PostMapping("/getRmnchDataByBenRedID")
-	public ResponseEntity<RMNCHBeneficiaryDetailsRmnch> getRmnchDataByBenID(@RequestBody BigInteger object) {
+	`@Operation`(summary = "Get RMNCH data by beneficiary registration id")
+	`@PostMapping`("/getRmnchDataByBenRegID")
+	public ResponseEntity<RMNCHBeneficiaryDetailsRmnch> getRmnchDataByBenID(`@RequestBody` BigInteger object) {
+		try {
+			RMNCHBeneficiaryDetailsRmnch data = svc.getRmnchDataByBenID(object);
+			return ResponseEntity.ok(data);
+		} catch (Exception e) {
+			return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(null);
+		}
+	}
 	// search beneficiary by lastModDate and districtID
 		@Operation(summary ="Get count of beneficiary by villageId and last modified date-time")
 		@PostMapping(path = "/countBenByVillageIdAndLastModifiedDate")

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
@@ -23,10 +23,13 @@
 
 import java.sql.Timestamp;
 
+import com.google.gson.Gson;
+import com.google.gson.JsonObject;
 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.http.ResponseEntity;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestHeader;
@@ -56,22 +59,68 @@
 
 	@PostMapping(value = "/syncDataToAmrit", consumes = "application/json", produces = "application/json")
 	@Operation(summary = "Sync data to AMRIT for already regestered beneficiary with AMRIT beneficiary id ")
-	public String syncDataToAmrit(@RequestBody String requestOBJ) {
+	public String syncDataToAmrit(@RequestBody String requestOBJ,@RequestHeader(value = "jwttoken") String authorization) {
 		OutputResponse response = new OutputResponse();
 		try {
 			if (requestOBJ != null) {
-				String s = rmnchDataSyncService.syncDataToAmrit(requestOBJ);
+
+				String s = rmnchDataSyncService.syncDataToAmrit(requestOBJ,authorization);
+				logger.info("syncDataToAmrit Response: {}", s);
+
 				response.setResponse(s);
+
+				logger.info(" syncDataToAmrit Final API Response: {}", response.toString());
 			} else
 				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();
 
 	}
 
+	@PostMapping(value = "/syncDataToAmritByHwc", consumes = "application/json", produces = "application/json")
+	@Operation(summary = "Sync data to AMRIT for already registered beneficiary with AMRIT beneficiary id")
+	public ResponseEntity<?> syncDataToAmritHwc(@RequestBody String requestOBJ) {
+
+		try {
+			if (requestOBJ == null || requestOBJ.isEmpty()) {
+				return ResponseEntity.badRequest().body("Invalid/NULL request obj");
+			}
+
+			JsonObject requestObj = new Gson().fromJson(requestOBJ, JsonObject.class);
+
+			Long beneficiaryID = requestObj.has("benficieryid") && !requestObj.get("benficieryid").isJsonNull()
+					? requestObj.get("benficieryid").getAsLong()
+					: null;
+
+			Long beneficiaryRegID = requestObj.has("benRegId") && !requestObj.get("benRegId").isJsonNull()
+					? requestObj.get("benRegId").getAsLong()
+					: null;
+
+			if (beneficiaryID == null || beneficiaryRegID == null) {
+				return ResponseEntity.badRequest().body("beneficiaryID or beneficiaryRegID is missing");
+			}
+
+			String result = rmnchDataSyncService.saveBeneficiaryDetailsAfterRegistration(
+					beneficiaryID,
+					beneficiaryRegID,
+					requestOBJ
+			);
+
+			return ResponseEntity.ok(result);
+
+		} catch (Exception e) {
+			logger.error("Error in RMNCH mobile data sync : {}", e.getMessage());
+			return ResponseEntity.internalServerError()
+					.body("Error in RMNCH mobile data sync : " + e.getMessage());
+		}
+	}
+
+
+
 //	@Deprecated
 	@PostMapping(value = "/getBeneficiaryDataForVillage", consumes = "application/json", produces = "application/json")
 	@Operation(summary = "Get beneficiary data for given village ")

diff --git a/src/main/java/com/iemr/common/identity/data/rmnch/RMNCHBeneficiaryDetailsRmnch.java b/src/main/java/com/iemr/common/identity/data/rmnch/RMNCHBeneficiaryDetailsRmnch.java
@@ -550,4 +550,11 @@ public class RMNCHBeneficiaryDetailsRmnch {
 	@Expose
 	private Boolean isDeactivate;
 
+	@Expose
+	@Transient
+	private String abhaId;
+
+	@Expose
+	@Transient
+	private String familyId;
 }
diff --git a/src/main/java/com/iemr/common/identity/data/rmnch/RMNCHMBeneficiarydetail.java b/src/main/java/com/iemr/common/identity/data/rmnch/RMNCHMBeneficiarydetail.java
@@ -214,4 +214,12 @@ public class RMNCHMBeneficiarydetail {
 	@Expose
 	@Transient
 	private Integer ProviderServiceMapID;
+
+	@Expose
+	@Transient
+	private String abhaId;
+
+	@Expose
+	@Column(name = "familyid")
+	private String familyId;
 }
diff --git a/src/main/java/com/iemr/common/identity/dto/BeneficiariesDTO.java b/src/main/java/com/iemr/common/identity/dto/BeneficiariesDTO.java
@@ -89,6 +89,8 @@ public int compareTo(BeneficiariesDTO ben) {
 	private BigInteger religionId;
 	private String religion;
 	private String monthlyFamilyIncome;
+	private String reproductiveStatus;
+	private Integer reproductiveStatusId;
 	// End Outreach
 
 	// Start 1097

diff --git a/src/main/java/com/iemr/common/identity/dto/IdentityDTO.java b/src/main/java/com/iemr/common/identity/dto/IdentityDTO.java
@@ -125,6 +125,8 @@ public class IdentityDTO {
 	private Integer incomeStatusId;
 	private String incomeStatus;
 	private String monthlyFamilyIncome;
+	private String  reproductiveStatus;
+	private Integer reproductiveStatusId;
 
 	@Expose
 	private Integer vanID;

diff --git a/src/main/java/com/iemr/common/identity/repo/rmnch/RMNCHBenDetailsRepo.java b/src/main/java/com/iemr/common/identity/repo/rmnch/RMNCHBenDetailsRepo.java
@@ -22,7 +22,9 @@
 package com.iemr.common.identity.repo.rmnch;
 
 import java.math.BigInteger;
+import java.util.List;
 
+import io.swagger.v3.oas.annotations.info.License;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.CrudRepository;
 import org.springframework.data.repository.query.Param;
@@ -35,8 +37,16 @@ public interface RMNCHBenDetailsRepo extends CrudRepository<RMNCHMBeneficiarydet
 	@Query(" SELECT t FROM RMNCHMBeneficiarydetail t WHERE t.id = :vanSerialNo AND t.VanID = :vanID")
 	public RMNCHMBeneficiarydetail getByIdAndVanID(@Param("vanSerialNo") BigInteger vanSerialNo,
 			@Param("vanID") int vanID);
-
-	@Query(" SELECT t FROM RMNCHMBeneficiarydetail t WHERE t.id = " +
-			"(SELECT m.benDetailsId from RMNCHMBeneficiarymapping m where m.benRegId = :beneficiaryRegID)")
-	public RMNCHMBeneficiarydetail getByBenRegID(@Param("beneficiaryRegID") BigInteger beneficiaryRegID);
+
+	@Query("""
+       SELECT t
+       FROM RMNCHMBeneficiarydetail t
+       WHERE t.id IN (
+           SELECT m.benDetailsId
+           FROM RMNCHMBeneficiarymapping m
+           WHERE m.benRegId = :beneficiaryRegID
+       )
+       """)
+	List<RMNCHMBeneficiarydetail> getByBenRegID(
+			@Param("beneficiaryRegID") BigInteger beneficiaryRegID);
 }
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
@@ -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<RMNCHBeneficiaryDetailsRmnch> getByRegID(@Param("benRegID") BigInteger benRegId);
 }
diff --git a/src/main/java/com/iemr/common/identity/repo/rmnch/RMNCHBornBirthDetailsRepo.java b/src/main/java/com/iemr/common/identity/repo/rmnch/RMNCHBornBirthDetailsRepo.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;
@@ -36,5 +37,5 @@ public interface RMNCHBornBirthDetailsRepo extends CrudRepository<RMNCHBornBirth
 	public RMNCHBornBirthDetails getByIdAndVanID(@Param("vanSerialNo") Long vanSerialNo, @Param("vanID") int vanID);
 
 	@Query(" SELECT t FROM RMNCHBornBirthDetails t WHERE t.BenRegId =:benRegID ")
-	public RMNCHBornBirthDetails getByRegID(@Param("benRegID") BigInteger benRegID);
+	public List<RMNCHBornBirthDetails> getByRegID(@Param("benRegID") BigInteger benRegID);
 }
diff --git a/src/main/java/com/iemr/common/identity/repo/rmnch/RMNCHCBACDetailsRepo.java b/src/main/java/com/iemr/common/identity/repo/rmnch/RMNCHCBACDetailsRepo.java
@@ -37,7 +37,7 @@ public interface RMNCHCBACDetailsRepo extends CrudRepository<RMNCHCBACdetails, L
 	public RMNCHCBACdetails getByIdAndVanID(@Param("vanSerialNo") Long vanSerialNo, @Param("vanID") int vanID);
 
 	@Query(" SELECT t FROM RMNCHCBACdetails t WHERE t.BenRegId =:benRegID")
-	public RMNCHCBACdetails getByRegID(@Param("benRegID") BigInteger benRegID);
+	public List<RMNCHCBACdetails> getByRegID(@Param("benRegID") BigInteger benRegID);
 
 	@Query(value = "select beneficiary_visit_code,visit_category from db_iemr.i_ben_flow_outreach where beneficiary_reg_id=:benRegID AND beneficiary_visit_code is not null AND visit_category is not null order by created_date desc limit 1", nativeQuery = true)
 	public List<Object[]> getVisitDetailsbyRegID(@Param("benRegID") Long benRegID);

diff --git a/src/main/java/com/iemr/common/identity/repo/rmnch/RMNCHHouseHoldDetailsRepo.java b/src/main/java/com/iemr/common/identity/repo/rmnch/RMNCHHouseHoldDetailsRepo.java
@@ -28,11 +28,13 @@
 
 import com.iemr.common.identity.data.rmnch.RMNCHHouseHoldDetails;
 
+import java.util.List;
+
 @Repository
 public interface RMNCHHouseHoldDetailsRepo extends CrudRepository<RMNCHHouseHoldDetails, Long> {
 	@Query(" SELECT t FROM RMNCHHouseHoldDetails t WHERE t.id = :vanSerialNo AND t.VanID = :vanID")
 	public RMNCHHouseHoldDetails getByIdAndVanID(@Param("vanSerialNo") long vanSerialNo, @Param("vanID") int vanID);
 
-	@Query(" SELECT t FROM RMNCHHouseHoldDetails t WHERE t.houseoldId =:houseoldId ")
-	public RMNCHHouseHoldDetails getByHouseHoldID(@Param("houseoldId") long houseoldId);
+	@Query("SELECT t FROM RMNCHHouseHoldDetails t WHERE t.houseoldId = :houseoldId")
+	List<RMNCHHouseHoldDetails> getByHouseHoldID(@Param("houseoldId") long houseoldId);
 }
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
@@ -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
@@ -809,6 +809,16 @@
         return beneficiaryList;
     }
 
+
+    public RMNCHBeneficiaryDetailsRmnch getRmnchDataByBenID(BigInteger benID) {
+        RMNCHBeneficiaryDetailsRmnch rmnchBeneficiaryDetailsRmnch = new RMNCHBeneficiaryDetailsRmnch();
+
+        if(!rMNCHBeneficiaryDetailsRmnchRepo.getByRegID(benID).isEmpty()){
+            rmnchBeneficiaryDetailsRmnch = rMNCHBeneficiaryDetailsRmnchRepo.getByRegID(benID).get(0);
+        }
+        return rmnchBeneficiaryDetailsRmnch;
+    }
+
     public Long countBeneficiaryByVillageIdAndLastModifyDate(List<Integer> villageIDs, Timestamp lastModifiedDate) {
         Long beneficiaryCount = 0L;
         try {
@@ -853,7 +863,7 @@
        return beneficiaryList;
    }

    private MBeneficiarymapping getBeneficiariesDTONew(Object[] benMapArr) {
        MBeneficiarymapping mapping = new MBeneficiarymapping();
        if (benMapArr != null && benMapArr.length == 12 && benMapArr[8] != null && benMapArr[9] != null) {
            mapping.setBenMapId(getBigIntegerValueFromObject(benMapArr[0]));
@@ -884,21 +894,27 @@
             //benMapOBJ = mappingRepo.getMapping(getBigIntegerValueFromObject(benMapArr[9]), (Integer) benMapArr[8]);
 
             BigInteger benRegId = new BigInteger(benMapArr[5].toString());
-            RMNCHBeneficiaryDetailsRmnch obj = rMNCHBeneficiaryDetailsRmnchRepo
-                    .getByRegID(benRegId);
-
-            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;
     }
@@ -1987,6 +2003,7 @@
      * @return
      */
     private BeneficiariesDTO getBeneficiariesDTO(MBeneficiarymapping benMap) {
+        RMNCHBeneficiaryDetailsRmnch rmnchBeneficiaryDetailsRmnch = new RMNCHBeneficiaryDetailsRmnch();
         BeneficiariesDTO bdto = mapper.mBeneficiarymappingToBeneficiariesDTO(benMap);
         if (null != benMap && null != benMap.getMBeneficiarydetail()
                 && !StringUtils.isEmpty(benMap.getMBeneficiarydetail().getFaceEmbedding())) {
@@ -2002,6 +2019,13 @@
             bdto.setFaceEmbedding(floatList);
         }
         // bdto.setOtherFields(benMap.getMBeneficiarydetail().getOtherFields());
+
+        if(!rMNCHBeneficiaryDetailsRmnchRepo.getByRegID(benMap.getBenRegId()).isEmpty() ){
+            rmnchBeneficiaryDetailsRmnch = rMNCHBeneficiaryDetailsRmnchRepo.getByRegID(benMap.getBenRegId()).get(0);
+            bdto.setReproductiveStatus(rmnchBeneficiaryDetailsRmnch.getReproductiveStatus());
+            bdto.setReproductiveStatusId(rmnchBeneficiaryDetailsRmnch.getReproductiveStatusId());
+        }
+
         bdto.setBeneficiaryFamilyTags(
                 mapper.mapToMBeneficiaryfamilymappingWithBenFamilyDTOList(benMap.getMBeneficiaryfamilymappings()));
         bdto.setBeneficiaryIdentites(

diff --git a/src/main/java/com/iemr/common/identity/service/rmnch/RmnchDataSyncService.java b/src/main/java/com/iemr/common/identity/service/rmnch/RmnchDataSyncService.java
@@ -22,7 +22,11 @@
 package com.iemr.common.identity.service.rmnch;
 
 public interface RmnchDataSyncService {
-	public String syncDataToAmrit(String requestOBJ) throws Exception;
+	public String syncDataToAmrit(String requestOBJ, String authorization) throws Exception;
+	public String  saveBeneficiaryDetailsAfterRegistration(
+			Long beneficiaryID,
+			Long beneficiaryRegID,
+			String comingRequest);
 	public String getBenData(String requestOBJ, String authorisation) throws Exception;
 	public String getBenDataByAsha(String requestOBJ, String authorisation) throws Exception;
 }