Skip to content

Small correction #131

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
helenKaryamsetty merged 24 commits into from
Dec 30, 2025
Merged

Small correction #131

Changes from all commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
f501ca7
Abdm v3 (#112)
helenKaryamsetty Oct 7, 2025
efa413b
Update pom.xml
helenKaryamsetty Oct 7, 2025
2275422
mongo query change fetch to linktoken (#113)
helenKaryamsetty Oct 13, 2025
4809e07
Abdm v3 (#114)
helenKaryamsetty Oct 14, 2025
f55c90e
ABDM Abdm HiTypes addition in linktoken (#115)
helenKaryamsetty Oct 31, 2025
d417c96
Minor fixes (#116)
helenKaryamsetty Nov 4, 2025
84427db
response correction (#117)
helenKaryamsetty Nov 6, 2025
c0312c4
generate token logic change (#120)
helenKaryamsetty Nov 19, 2025
b5b9995
hiType correction and modification in error message format (#121)
helenKaryamsetty Dec 15, 2025
6dadda6
Modified error message display (#122)
helenKaryamsetty Dec 15, 2025
955ec3f
M2 FHIR bundles creation (#123)
helenKaryamsetty Dec 23, 2025
32ba209
added missed variable change (#124)
helenKaryamsetty Dec 23, 2025
81dda6d
Modified the constructor for better handling (#125)
helenKaryamsetty Dec 23, 2025
1128ffa
medication statement correction (#126)
helenKaryamsetty Dec 23, 2025
7bf1e45
Bundle model fixes (#127)
helenKaryamsetty Dec 30, 2025
ba2c133
Merge branch 'release-3.6.1' into abdmV3
helenKaryamsetty Dec 30, 2025
1578ade
Update jboss-web.xml
helenKaryamsetty Dec 30, 2025
b3a6b11
Update common_docker.properties
helenKaryamsetty Dec 30, 2025
179b34d
Delete src/main/environment/common_test.properties
helenKaryamsetty Dec 30, 2025
cd22115
Delete src/main/environment/common_dev.properties
helenKaryamsetty Dec 30, 2025
534d757
taken coderabbit comments (#129)
helenKaryamsetty Dec 30, 2025
8b16580
Update CareContextRepo.java
helenKaryamsetty Dec 30, 2025
25fb37c
merging small error (#130)
helenKaryamsetty Dec 30, 2025
9412ce8
Merge branch 'release-3.6.1' into abdmV3
helenKaryamsetty Dec 30, 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
6 changes: 3 additions & 3 deletions src/main/java/com/wipro/fhir/service/v3/careContext/CareContextLinkingServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ public String generateTokenForCareContext(String request) throws FHIRException {
}

GenerateCareContextTokenRequest generateTokenRequest = new GenerateCareContextTokenRequest();
if (null != careContextLinkRequest.getAbhaNumber() && careContextLinkRequest.getAbhaNumber().isEmpty() ) {
if (null != careContextLinkRequest.getAbhaNumber() && !careContextLinkRequest.getAbhaNumber().isEmpty() ) {
String abha = careContextLinkRequest.getAbhaNumber();
String abhaNumber = abha.replace("-", "");
generateTokenRequest.setAbhaNumber(abhaNumber);
Expand Down Expand Up @@ -245,7 +245,7 @@ public String linkCareContext(String request) throws FHIRException {
headers.add("Authorization", abhaAuthToken);
headers.add("X-CM-ID", abhaMode);
if (null != addCareContextRequest.getAbdmFacilityId()
&& addCareContextRequest.getAbdmFacilityId().isEmpty()) {
&& !addCareContextRequest.getAbdmFacilityId().isEmpty()) {
headers.add("X-HIP-ID", addCareContextRequest.getAbdmFacilityId());
} else {
headers.add("X-HIP-ID", abdmFacilityId);
Expand Down Expand Up @@ -275,7 +275,7 @@ public String linkCareContext(String request) throws FHIRException {
pcc.add(patient);
}

if (null != addCareContextRequest.getAbhaNumber() && addCareContextRequest.getAbhaNumber().isEmpty()) {
if (null != addCareContextRequest.getAbhaNumber() && !addCareContextRequest.getAbhaNumber().isEmpty()) {
String abha = addCareContextRequest.getAbhaNumber();
String abhaNumber = abha.replace("-", "");
linkCareContextRequest.setAbhaNumber(abhaNumber);
Expand Down
Loading