Skip to content

merge vb/3.9 to release-3.8.2 #214

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

Open
vishwab1 wants to merge 4 commits into
base: release-3.8.2
Choose a base branch
from
Open

merge vb/3.9 to release-3.8.2 #214

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
724174a
hwc fix
SauravBizbRolly Jun 12, 2026
84e0475
hwc fix
SauravBizbRolly Jun 12, 2026
f321186
hwc fix
SauravBizbRolly Jun 12, 2026
a4bac63
Merge remote-tracking branch 'origin/vb/hwc-3.9.0' into release-3.8.2
vishwab1 Jun 29, 2026
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/iemr/hwc/controller/generalOPD/GeneralOPDController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -314,7 +314,7 @@
logger.info("Invalid Request Data.");
response.setError(5000, "Invalid request");
}
logger.info("getBenCaseRecordFromDoctorGeneralOPD response:" + response);
//logger.info("getBenCaseRecordFromDoctorGeneralOPD response:" + response);

Check warning on line 317 in src/main/java/com/iemr/hwc/controller/generalOPD/GeneralOPDController.java

View check run for this annotation

SonarQubeCloud / SonarCloud Code Analysis

This block of commented-out lines of code should be removed. 


See more on https://sonarcloud.io/project/issues?id=PSMRI_HWC-API&issues=AZ8So8bAK31AziteXvih&open=AZ8So8bAK31AziteXvih&pullRequest=214
} catch (Exception e) {
response.setError(5000, "Error while getting beneficiary doctor data");
logger.error("Error in getBenCaseRecordFromDoctorGeneralOPD:" + e);
Expand Down
48 changes: 24 additions & 24 deletions src/main/java/com/iemr/hwc/service/choApp/CHOAppSyncServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -334,17 +334,17 @@
? requestObj.get("parkingPlaceID").getAsInt()
: 0);

beneficiaryDetailsRmnch.addProperty("facilityID",
requestObj.has("facilityID") && !requestObj.get("facilityID").isJsonNull()
? requestObj.get("facilityID").getAsInt()
: null);

beneficiaryDetailsRmnch.addProperty("vanID",
requestObj.has("facilityID") && !requestObj.get("facilityID").isJsonNull()
? requestObj.get("facilityID").getAsInt()
: requestObj.has("vanID") && !requestObj.get("vanID").isJsonNull()
? requestObj.get("vanID").getAsInt()
: 0);
// beneficiaryDetailsRmnch.addProperty("facilityID",
// requestObj.has("facilityID") && !requestObj.get("facilityID").isJsonNull()
// ? requestObj.get("facilityID").getAsInt()
// : null);

Check warning on line 340 in src/main/java/com/iemr/hwc/service/choApp/CHOAppSyncServiceImpl.java

View check run for this annotation

SonarQubeCloud / SonarCloud Code Analysis

This block of commented-out lines of code should be removed. 


See more on https://sonarcloud.io/project/issues?id=PSMRI_HWC-API&issues=AZ8So8XvK31AziteXvid&open=AZ8So8XvK31AziteXvid&pullRequest=214

// beneficiaryDetailsRmnch.addProperty("vanID",
// requestObj.has("facilityID") && !requestObj.get("facilityID").isJsonNull()
// ? requestObj.get("facilityID").getAsInt()
// : requestObj.has("vanID") && !requestObj.get("vanID").isJsonNull()
// ? requestObj.get("vanID").getAsInt()
// : 0);

Check warning on line 347 in src/main/java/com/iemr/hwc/service/choApp/CHOAppSyncServiceImpl.java

View check run for this annotation

SonarQubeCloud / SonarCloud Code Analysis

This block of commented-out lines of code should be removed. 


See more on https://sonarcloud.io/project/issues?id=PSMRI_HWC-API&issues=AZ8So8XvK31AziteXvie&open=AZ8So8XvK31AziteXvie&pullRequest=214

JsonElement providerServiceMapElement =
requestObj.has("providerServiceMapID")
Expand Down Expand Up @@ -588,13 +588,13 @@
beneficiaryDetailsRmnch.addProperty("emergencyRegistration", requestObj.get("emergencyRegistration").getAsBoolean());

beneficiaryDetailsRmnch.addProperty("parkingPlaceID", requestObj.get("parkingPlaceID").getAsInt());
beneficiaryDetailsRmnch.addProperty("facilityID",
requestObj.has("facilityID") && !requestObj.get("facilityID").isJsonNull()
? requestObj.get("facilityID").getAsInt() : null);
beneficiaryDetailsRmnch.addProperty("vanID",
requestObj.has("facilityID") && !requestObj.get("facilityID").isJsonNull()
? requestObj.get("facilityID").getAsInt()
: requestObj.get("vanID").getAsInt());
// beneficiaryDetailsRmnch.addProperty("facilityID",
// requestObj.has("facilityID") && !requestObj.get("facilityID").isJsonNull()
// ? requestObj.get("facilityID").getAsInt() : null);

Check warning on line 593 in src/main/java/com/iemr/hwc/service/choApp/CHOAppSyncServiceImpl.java

View check run for this annotation

SonarQubeCloud / SonarCloud Code Analysis

This block of commented-out lines of code should be removed. 


See more on https://sonarcloud.io/project/issues?id=PSMRI_HWC-API&issues=AZ8So8XvK31AziteXvif&open=AZ8So8XvK31AziteXvif&pullRequest=214
// beneficiaryDetailsRmnch.addProperty("vanID",
// requestObj.has("facilityID") && !requestObj.get("facilityID").isJsonNull()
// ? requestObj.get("facilityID").getAsInt()
// : requestObj.get("vanID").getAsInt());

JsonElement psmID = requestObj.has("providerServiceMapID")
? requestObj.get("providerServiceMapID")
Expand Down Expand Up @@ -1084,12 +1084,12 @@
}
}
}
logger.info("Ben FLow data" +
new GsonBuilder()
.excludeFieldsWithoutExposeAnnotation()
.serializeNulls()
.create()
.toJson(benFlowList));
// logger.info("Ben FLow data" +
// new GsonBuilder()
// .excludeFieldsWithoutExposeAnnotation()
// .serializeNulls()
// .create()
// .toJson(benFlowList));

Check warning on line 1092 in src/main/java/com/iemr/hwc/service/choApp/CHOAppSyncServiceImpl.java

View check run for this annotation

SonarQubeCloud / SonarCloud Code Analysis

This block of commented-out lines of code should be removed. 


See more on https://sonarcloud.io/project/issues?id=PSMRI_HWC-API&issues=AZ8So8XvK31AziteXvig&open=AZ8So8XvK31AziteXvig&pullRequest=214
outputResponse.setResponse(new GsonBuilder().excludeFieldsWithoutExposeAnnotation().serializeNulls().create().toJson(benFlowList.stream().filter(beneficiaryFlowStatus -> beneficiaryFlowStatus.getReproductiveStatus()
.equals("Eligible Couple"))));
} else {
Expand Down