From 724174acfe21774b886afae23cebe0b21536aadf Mon Sep 17 00:00:00 2001 From: Saurav Mishra Date: Fri, 12 Jun 2026 17:04:01 +0530 Subject: [PATCH 1/3] hwc fix --- .../service/choApp/CHOAppSyncServiceImpl.java | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/src/main/java/com/iemr/hwc/service/choApp/CHOAppSyncServiceImpl.java b/src/main/java/com/iemr/hwc/service/choApp/CHOAppSyncServiceImpl.java index 4ae01b21..9927281e 100644 --- a/src/main/java/com/iemr/hwc/service/choApp/CHOAppSyncServiceImpl.java +++ b/src/main/java/com/iemr/hwc/service/choApp/CHOAppSyncServiceImpl.java @@ -949,12 +949,12 @@ public ResponseEntity getFlowRecordsByVillageIDAndLastModifiedDate(SyncS } } } - logger.info("Ben FLow data" + - new GsonBuilder() - .excludeFieldsWithoutExposeAnnotation() - .serializeNulls() - .create() - .toJson(benFlowList)); + //logger.info("Ben FLow data" + +// new GsonBuilder() +// .excludeFieldsWithoutExposeAnnotation() +// .serializeNulls() +// .create() +// .toJson(benFlowList)); outputResponse.setResponse(new GsonBuilder().excludeFieldsWithoutExposeAnnotation().serializeNulls().create().toJson(benFlowList)); } else { logger.error("Unable to search beneficiaries to sync based on villageIDs and lastSyncDate. Incomplete request body - Either villageIDs or lastSyncDate missing."); @@ -1016,12 +1016,12 @@ public ResponseEntity getCoupleRecordsByVillageIDAndLastModifiedDate(Syn } } } - logger.info("Ben FLow data" + - new GsonBuilder() - .excludeFieldsWithoutExposeAnnotation() - .serializeNulls() - .create() - .toJson(benFlowList)); +// logger.info("Ben FLow data" + +// new GsonBuilder() +// .excludeFieldsWithoutExposeAnnotation() +// .serializeNulls() +// .create() +// .toJson(benFlowList)); outputResponse.setResponse(new GsonBuilder().excludeFieldsWithoutExposeAnnotation().serializeNulls().create().toJson(benFlowList.stream().filter(beneficiaryFlowStatus -> beneficiaryFlowStatus.getReproductiveStatus() .equals("Eligible Couple")))); } else { From 84e0475e861ad8d1ce95c05bbf4b4d64d80e5bb9 Mon Sep 17 00:00:00 2001 From: Saurav Mishra Date: Fri, 12 Jun 2026 17:18:58 +0530 Subject: [PATCH 2/3] hwc fix --- .../iemr/hwc/controller/generalOPD/GeneralOPDController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/iemr/hwc/controller/generalOPD/GeneralOPDController.java b/src/main/java/com/iemr/hwc/controller/generalOPD/GeneralOPDController.java index 44d88537..067ab43d 100644 --- a/src/main/java/com/iemr/hwc/controller/generalOPD/GeneralOPDController.java +++ b/src/main/java/com/iemr/hwc/controller/generalOPD/GeneralOPDController.java @@ -314,7 +314,7 @@ public String getBenCaseRecordFromDoctorGeneralOPD( logger.info("Invalid Request Data."); response.setError(5000, "Invalid request"); } - logger.info("getBenCaseRecordFromDoctorGeneralOPD response:" + response); + //logger.info("getBenCaseRecordFromDoctorGeneralOPD response:" + response); } catch (Exception e) { response.setError(5000, "Error while getting beneficiary doctor data"); logger.error("Error in getBenCaseRecordFromDoctorGeneralOPD:" + e); From f321186ea61f163c9b6c652bd7f5bfd757ac4f6a Mon Sep 17 00:00:00 2001 From: Saurav Mishra Date: Fri, 12 Jun 2026 17:48:00 +0530 Subject: [PATCH 3/3] hwc fix --- .../service/choApp/CHOAppSyncServiceImpl.java | 50 +++++++++---------- 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/src/main/java/com/iemr/hwc/service/choApp/CHOAppSyncServiceImpl.java b/src/main/java/com/iemr/hwc/service/choApp/CHOAppSyncServiceImpl.java index 9927281e..ccf183b6 100644 --- a/src/main/java/com/iemr/hwc/service/choApp/CHOAppSyncServiceImpl.java +++ b/src/main/java/com/iemr/hwc/service/choApp/CHOAppSyncServiceImpl.java @@ -239,14 +239,14 @@ public ResponseEntity registerCHOAPPBeneficiary(String comingRequest, St ? requestObj.get("spouseName").getAsString() : ""); - 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("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("providerServiceMapID", requestObj.get("providerServiceMapID").getAsInt()); beneficiaryDetailsRmnch.addProperty("genderName", @@ -296,17 +296,17 @@ public ResponseEntity registerCHOAPPBeneficiary(String comingRequest, St ? requestObj.get("parkingPlaceID").getAsInt() : 0); - beneficiaryDetailsRmnch.addProperty("facilityID", - requestObj.has("facilityID") && !requestObj.get("facilityID").isJsonNull() - ? requestObj.get("facilityID").getAsInt() - : null); +// 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("vanID", +// requestObj.has("facilityID") && !requestObj.get("facilityID").isJsonNull() +// ? requestObj.get("facilityID").getAsInt() +// : requestObj.has("vanID") && !requestObj.get("vanID").isJsonNull() +// ? requestObj.get("vanID").getAsInt() +// : 0); JsonElement providerServiceMapElement = requestObj.has("providerServiceMapID") @@ -532,13 +532,13 @@ public ResponseEntity choAppUpdateBeneficiary(String comingRequest, Stri 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); +// 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")