Skip to content

isNewAbha null issue #85

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
ravishanigarapu merged 2 commits into from
May 20, 2025
Merged

isNewAbha null issue #85

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
16dca5c
fix(bug): isNewAbha null issue
May 20, 2025
2159bb0
fix: coderabbit suggestions
May 20, 2025
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
2 changes: 1 addition & 1 deletion src/main/java/com/wipro/fhir/data/healthID/BenHealthIDMapping.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,6 @@ public class BenHealthIDMapping {
private Timestamp lastModDate;

@Transient
private boolean isNewAbha;
private Boolean isNewAbha;

}
2 changes: 1 addition & 1 deletion src/main/java/com/wipro/fhir/repo/healthID/BenHealthIDMappingRepo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,6 @@ public interface BenHealthIDMappingRepo extends CrudRepository<BenHealthIDMappin
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);
Boolean getIsNewAbha(@Param("healthIdNumber") String healthIdNumber);

}
4 changes: 2 additions & 2 deletions src/main/java/com/wipro/fhir/service/healthID/HealthIDServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,8 +123,8 @@ public String getBenHealthID(Long benRegID) {
if(healthDetailsList.size() > 0) {
for(BenHealthIDMapping healthDetails: healthDetailsList) {
String healthIdNumber = healthDetails.getHealthIdNumber();
boolean isNewAbha = benHealthIDMappingRepo.getIsNewAbha(healthIdNumber);
healthDetails.setNewAbha(isNewAbha);
Boolean isNewAbha = benHealthIDMappingRepo.getIsNewAbha(healthIdNumber);
healthDetails.setIsNewAbha(isNewAbha);

healthDetailsWithAbhaList.add(healthDetails);
}
Expand Down
4 changes: 3 additions & 1 deletion src/main/java/com/wipro/fhir/service/v3/abha/CreateAbhaV3ServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,8 +211,10 @@ public String enrollmentByAadhaar(String request) throws FHIRException {
constructHealthIdResponse(healthIDResp, abhaProfileAsJsonObj);
healthIDResp.setProviderServiceMapID(loginData.getProviderServiceMapId());
healthIDResp.setCreatedBy(loginData.getCreatedBy());
if(jsonResponse.get("isNew") != null && jsonResponse.get("isNew").getAsString() == "true") {
if(jsonResponse.get("isNew") != null && "true".equals(jsonResponse.get("isNew").getAsString())) {
healthIDResp.setIsNewAbha(true);
} else {
healthIDResp.setIsNewAbha(false);
}
Integer healthIdCount = healthIDRepo.getCountOfHealthIdNumber(healthIDResp.getHealthIdNumber());
HealthIDResponse save = healthIDResp;
Expand Down
Loading