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); 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 3b634188..f98403a6 100644 --- a/src/main/java/com/iemr/hwc/service/choApp/CHOAppSyncServiceImpl.java +++ b/src/main/java/com/iemr/hwc/service/choApp/CHOAppSyncServiceImpl.java @@ -334,17 +334,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("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); + +// 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") @@ -588,13 +588,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") @@ -1084,12 +1084,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 {