Merge pull request #169 from PSMRI/feature/save_health_id_in_health_maping

SauravBizbRolly · web-flow · commit 59dbd6c6fdf5 · 2026-06-19T18:17:30.000+05:30
Feature/save health id in health maping
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.9.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) {
+		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,11 +59,11 @@ public class RMNCHMobileAppController {
 
 	@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);
 				response.setResponse(s);
 			} else
 				response.setError(5000, "Invalid/NULL request obj");
@@ -73,6 +76,46 @@ public String syncDataToAmrit(@RequestBody String requestOBJ) {
 
 	}
 
+	@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,7 @@ public class RMNCHBeneficiaryDetailsRmnch {
 	@Expose
 	private Boolean isDeactivate;
 
+	@Expose
+	@Transient
+	private String abhaId;
 }
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,8 @@ public class RMNCHMBeneficiarydetail {
 	@Expose
 	@Transient
 	private Integer ProviderServiceMapID;
+
+	@Expose
+	@Transient
+	private String abhaId;
 }
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
@@ -24,6 +24,7 @@
 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;
@@ -36,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 List<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/service/IdentityService.java b/src/main/java/com/iemr/common/identity/service/IdentityService.java
@@ -809,6 +809,16 @@ public List<BeneficiariesDTO> searchBeneficiaryByVillageIdAndLastModifyDate(List
         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 {
@@ -1993,6 +2003,7 @@ public List<BeneficiariesDTO> getBeneficiariesDeatilsByBenRegIdList(List<BigInte
      * @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())) {
@@ -2008,6 +2019,13 @@ private BeneficiariesDTO getBeneficiariesDTO(MBeneficiarymapping benMap) {
             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;
 }
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
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties

Original file line number	Diff line number	Diff line change
`@@ -550,4 +550,7 @@ public class RMNCHBeneficiaryDetailsRmnch {`
`550`	`550`	`@Expose`
`551`	`551`	`private Boolean isDeactivate;`
`552`	`552`
	`553`	`+ @Expose`
	`554`	`+ @Transient`
	`555`	`+ private String abhaId;`
`553`	`556`	`}`
Original file line number	Diff line number	Diff line change
`@@ -214,4 +214,8 @@ public class RMNCHMBeneficiarydetail {`
`214`	`214`	`@Expose`
`215`	`215`	`@Transient`
`216`	`216`	`private Integer ProviderServiceMapID;`
	`217`	`+`
	`218`	`+ @Expose`
	`219`	`+ @Transient`
	`220`	`+ private String abhaId;`
`217`	`221`	`}`