GetBenHealthIdDetails API changes

src/main/java/com/wipro/fhir/data/healthID/BenHealthIDMapping.java

@@ -30,10 +30,12 @@
 import jakarta.persistence.Id;
 import jakarta.persistence.Table;
 import jakarta.persistence.Transient;
+import lombok.Data;
 
 import com.google.gson.annotations.Expose;
 @Entity
 @Table(name = "m_benhealthidmapping")
+@Data
 public class BenHealthIDMapping {
 	@Id
 	@GeneratedValue(strategy = GenerationType.IDENTITY)
@@ -57,13 +59,6 @@ public class BenHealthIDMapping {
 	@Expose
 	@Column(name = "AuthenticationMode")
     String authenticationMode;
-
-	public String getAuthenticationMode() {
-		return authenticationMode;
-	}
-	public void setAuthenticationMode(String authenticationMode) {
-		this.authenticationMode = authenticationMode;
-	}
 	@Column(name = "Deleted", insertable = false, updatable = true)
 	private Boolean deleted = false;
 	@Expose
@@ -79,77 +74,8 @@ public void setAuthenticationMode(String authenticationMode) {
 	private String modifiedBy;
 	@Column(name = "LastModDate", insertable = false, updatable = false)
 	private Timestamp lastModDate;
-	public Integer getBenHealthID() {
-		return benHealthID;
-	}
-	public void setBenHealthID(Integer benHealthID) {
-		this.benHealthID = benHealthID;
-	}
-	public String getHealthIdNumber() {
-		return healthIdNumber;
-	}
-	public void setHealthIdNumber(String healthIdNumber) {
-		this.healthIdNumber = healthIdNumber;
-	}
-	public Integer getProviderServiceMapID() {
-		return providerServiceMapId;
-	}
-	public void setProviderServiceMapID(Integer providerServiceMapID) {
-		this.providerServiceMapId = providerServiceMapID;
-	}
-	public Long getBeneficiaryRegId() {
-		return beneficiaryRegID;
-	}
-	public void setBeneficiaryRegId(Long beneficiaryRegId) {
-		this.beneficiaryRegID = beneficiaryRegId;
-	}
-	public String getHealthId() {
-		return healthId;
-	}
-	public void setHealthId(String healthId) {
-		this.healthId = healthId;
-	}
-	public Boolean getDeleted() {
-		return deleted;
-	}
-	public void setDeleted(Boolean deleted) {
-		this.deleted = deleted;
-	}
-	public String getProcessed() {
-		return processed;
-	}
-	public void setProcessed(String processed) {
-		this.processed = processed;
-	}
-	public String getCreatedBy() {
-		return createdBy;
-	}
-	public void setCreatedBy(String createdBy) {
-		this.createdBy = createdBy;
-	}
-	public Timestamp getCreatedDate() {
-		return createdDate;
-	}
-	public void setCreatedDate(Timestamp createdDate) {
-		this.createdDate = createdDate;
-	}
-	public String getModifiedBy() {
-		return modifiedBy;
-	}
-	public void setModifiedBy(String modifiedBy) {
-		this.modifiedBy = modifiedBy;
-	}
-	public Timestamp getLastModDate() {
-		return lastModDate;
-	}
-	public void setLastModDate(Timestamp lastModDate) {
-		this.lastModDate = lastModDate;
-	}
-	public Long getBeneficiaryID() {
-		return beneficiaryID;
-	}
-	public void setBeneficiaryID(Long beneficiaryID) {
-		this.beneficiaryID = beneficiaryID;
-	}
 
+	@Transient
+	private boolean isNewAbha;
+
 }

src/main/java/com/wipro/fhir/repo/healthID/BenHealthIDMappingRepo.java

@@ -75,5 +75,8 @@ public interface BenHealthIDMappingRepo extends CrudRepository<BenHealthIDMappin
 	@Modifying
 	@Query(value = "UPDATE db_iemr.t_benvisitdetail SET AbdmFacilityID = :abdmFacilityId WHERE VisitCode= :visitCode", nativeQuery = true)
 	Integer updateFacilityIdForVisit(@Param("visitCode") BigInteger visitCode, @Param("abdmFacilityId") String abdmFacilityId);
+
+	@Query(value = "select isNewAbha from t_healthid where HealthIdNumber=:healthIdNumber order by 1 desc limit 1", nativeQuery = true)
+	boolean getIsNewAbha(@Param("healthIdNumber") String healthIdNumber);
 
 }

src/main/java/com/wipro/fhir/service/healthID/HealthIDServiceImpl.java

@@ -25,6 +25,7 @@
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 import org.slf4j.Logger;
@@ -61,14 +62,14 @@ public String mapHealthIDToBeneficiary(String request) throws FHIRException {
 		BenHealthIDMapping health = InputMapper.gson().fromJson(request, BenHealthIDMapping.class);
 		 health = InputMapper.gson().fromJson(request, BenHealthIDMapping.class);
 		try {
-			if (health.getBeneficiaryRegId() == null && health.getBeneficiaryID() == null)
+			if (health.getBeneficiaryRegID() == null && health.getBeneficiaryID() == null)
 				throw new FHIRException("Error in mapping request");
-			if (health.getBeneficiaryRegId() != null)
+			if (health.getBeneficiaryRegID() != null)
 				health = benHealthIDMappingRepo.save(health);
 			else {
 				if (health.getBeneficiaryID() != null) {
 					Long check1 = benHealthIDMappingRepo.getBenRegID(health.getBeneficiaryID());
-					health.setBeneficiaryRegId(check1);
+					health.setBeneficiaryRegID(check1);
 					health = benHealthIDMappingRepo.save(health);
 				}
 			}
@@ -116,7 +117,18 @@ public String getBenHealthID(Long benRegID) {
 		Map<String, Object> resMap = new HashMap<>();
 
 		ArrayList<BenHealthIDMapping> healthDetailsList = benHealthIDMappingRepo.getHealthDetails(benRegID);
-		resMap.put("BenHealthDetails", new Gson().toJson(healthDetailsList));
+		ArrayList<BenHealthIDMapping> healthDetailsWithAbhaList = new ArrayList<>();
+
+		if(healthDetailsList.size() > 0) {
+			for(BenHealthIDMapping healthDetails: healthDetailsList) {
+				String healthIdNumber = healthDetails.getHealthIdNumber();
+				boolean isNewAbha = benHealthIDMappingRepo.getIsNewAbha(healthIdNumber);
+				healthDetails.setNewAbha(isNewAbha);
+
+				healthDetailsWithAbhaList.add(healthDetails);
+			}
+		}
+		resMap.put("BenHealthDetails", new Gson().toJson(healthDetailsWithAbhaList));
 
 		return resMap.toString();
 	}