diff --git a/src/main/java/com/iemr/hwc/controller/adolescent/ChildhoodAdolescenceController.java b/src/main/java/com/iemr/hwc/controller/adolescent/ChildhoodAdolescenceController.java index fb48043a..c412ffac 100644 --- a/src/main/java/com/iemr/hwc/controller/adolescent/ChildhoodAdolescenceController.java +++ b/src/main/java/com/iemr/hwc/controller/adolescent/ChildhoodAdolescenceController.java @@ -21,8 +21,6 @@ */ package com.iemr.hwc.controller.adolescent; -import java.sql.SQLException; - import org.json.JSONObject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -36,13 +34,14 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import com.google.gson.JsonElement; import com.google.gson.JsonObject; import com.google.gson.JsonParser; import com.iemr.hwc.data.nurse.CommonUtilityClass; import com.iemr.hwc.service.adolescent.AdolescentAndChildCareService; import com.iemr.hwc.utils.exception.IEMRException; import com.iemr.hwc.utils.response.OutputResponse; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; import io.swagger.v3.oas.annotations.Operation; @@ -62,62 +61,37 @@ public class ChildhoodAdolescenceController { */ @Operation(summary = "Save child adolescent care (CAC) nurse data") @PostMapping(value = { "/save/nurseData" }) - public String saveBenNurseDataCAC(@RequestBody String requestObj, + public ResponseEntity saveBenNurseDataCAC(@RequestBody String requestObj, @RequestHeader(value = "Authorization") String Authorization) throws Exception { OutputResponse response = new OutputResponse(); if (null != requestObj) { - JsonObject jsnOBJ = new JsonObject(); - JsonParser jsnParser = new JsonParser(); - JsonElement jsnElmnt = jsnParser.parse(requestObj); - jsnOBJ = jsnElmnt.getAsJsonObject(); - try { - logger.info("Request object for child-adolescent-care nurse data saving :" + requestObj); - - if (jsnOBJ != null) { - String genOPDRes = adolescentAndChildCareService.saveNurseData(jsnOBJ, Authorization); - response.setResponse(genOPDRes); - - } else { - response.setResponse("Invalid request"); - } - } catch (SQLException e) { - logger.error("Error in nurse data saving :" + e); - response.setError(5000, "Unable to save data : " + e.getLocalizedMessage()); - } catch (Exception e) { - logger.error("Error in nurse data saving :" + e.getMessage()); - adolescentAndChildCareService.deleteVisitDetails(jsnOBJ); - response.setError(5000, e.getMessage()); - } + JsonObject jsnOBJ = JsonParser.parseString(requestObj).getAsJsonObject(); + logger.info("Request object for child-adolescent-care nurse data saving :" + requestObj); + String genOPDRes = adolescentAndChildCareService.saveNurseData(jsnOBJ, Authorization); + response.setResponse(genOPDRes); + } else { + response.setResponse("Invalid request"); + return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(response.toString()); } - return response.toString(); + return ResponseEntity.ok(response.toString()); } @Operation(summary = "Save child adolescent care doctor data") @PostMapping(value = { "save/doctorData" }) - public String saveDoctorDataCAC(@RequestBody String requestObj, - @RequestHeader(value = "Authorization") String Authorization) { + public ResponseEntity saveDoctorDataCAC(@RequestBody String requestObj, + @RequestHeader(value = "Authorization") String Authorization) throws Exception { OutputResponse response = new OutputResponse(); - try { - logger.info("Request object for child-adolescent-care doctor data saving :" + requestObj); - - JsonParser jsnParser = new JsonParser(); - JsonElement jsnElmnt = jsnParser.parse(requestObj); - JsonObject jsnOBJ = jsnElmnt.getAsJsonObject(); - if (jsnOBJ != null) { - int i = adolescentAndChildCareService.saveDoctorDataCAC(jsnOBJ, Authorization); - - if (i == 1) - response.setResponse("Data saved successfully"); - } else { - - response.setError(5000, "Invalid request object : NULL"); - } - - } catch (Exception e) { - logger.error("Error while saving doctor data:" + e.getMessage()); - response.setError(5000, e.getMessage()); + logger.info("Request object for child-adolescent-care doctor data saving :" + requestObj); + JsonObject jsnOBJ = JsonParser.parseString(requestObj).getAsJsonObject(); + if (jsnOBJ != null) { + int i = adolescentAndChildCareService.saveDoctorDataCAC(jsnOBJ, Authorization); + if (i == 1) + response.setResponse("Data saved successfully"); + } else { + response.setError(5000, "Invalid request object : NULL"); + return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(response.toString()); } - return response.toString(); + return ResponseEntity.ok(response.toString()); } /** @@ -128,29 +102,24 @@ public String saveDoctorDataCAC(@RequestBody String requestObj, @Operation(summary = "Get beneficiary visit details from nurse for child adolescent care") @PostMapping(value = { "/getBenVisitDetailsFrmNurseCAC" }) @Transactional(rollbackFor = Exception.class) - public String getBenVisitDetailsFrmNurseCAC( - @Param(value = "{\"benRegID\":\"Long\",\"visitCode\":\"Long\"}") @RequestBody String comingRequest) { + public ResponseEntity getBenVisitDetailsFrmNurseCAC( + @Param(value = "{\"benRegID\":\"Long\",\"visitCode\":\"Long\"}") @RequestBody String comingRequest) + throws Exception { OutputResponse response = new OutputResponse(); - logger.info("Request obj to fetch CAC visit details :" + comingRequest); - try { - JSONObject obj = new JSONObject(comingRequest); - if (obj.length() > 1) { - Long benRegID = obj.getLong("benRegID"); - Long visitCode = obj.getLong("visitCode"); - - String res = adolescentAndChildCareService.getBenVisitDetailsFrmNurseCAC(benRegID, visitCode); - response.setResponse(res); - } else { - logger.info("Invalid Request Data."); - response.setError(5000, "Invalid request : missing visit information"); - } - logger.info("getBenVisitDetailsFrmNurseCAC response:" + response); - } catch (Exception e) { - response.setError(5000, "Error while getting beneficiary visit data : " + e.getLocalizedMessage()); - logger.error("Error in getBenVisitDetailsFrmNurseCAC:" + e); + JSONObject obj = new JSONObject(comingRequest); + if (obj.length() > 1 && obj.has("benRegID") && obj.has("visitCode")) { + Long benRegID = obj.getLong("benRegID"); + Long visitCode = obj.getLong("visitCode"); + String res = adolescentAndChildCareService.getBenVisitDetailsFrmNurseCAC(benRegID, visitCode); + response.setResponse(res); + } else { + logger.info("Invalid Request Data."); + response.setError(5000, "Invalid request : missing visit information"); + return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(response.toString()); } - return response.toString(); + logger.info("getBenVisitDetailsFrmNurseCAC response:" + response); + return ResponseEntity.ok(response.toString()); } /** @@ -160,28 +129,21 @@ public String getBenVisitDetailsFrmNurseCAC( */ @Operation(summary = "Get child adolescent care beneficiary history") @PostMapping(value = { "/getBenHistoryDetails" }) - - public String getBenHistoryDetails( - @Param(value = "{\"benRegID\":\"Long\",\"visitCode\":\"Long\"}") @RequestBody CommonUtilityClass commonUtilityClass) { + public ResponseEntity getBenHistoryDetails( + @Param(value = "{\"benRegID\":\"Long\",\"visitCode\":\"Long\"}") @RequestBody CommonUtilityClass commonUtilityClass) + throws Exception { OutputResponse response = new OutputResponse(); - logger.info("getBenHistoryDetails request:" + commonUtilityClass.toString()); - try { - - if (commonUtilityClass.getBenRegID() != null) { - - String s = adolescentAndChildCareService.getBirthAndImmuniHistory(commonUtilityClass.getBenRegID(), - commonUtilityClass.getVisitCode()); - response.setResponse(s); - } else { - response.setError(5000, "Invalid request : missing ben information"); - } - logger.info("getBenHistoryDetails response:" + response); - } catch (Exception e) { - response.setError(5000, "Error while getting beneficiary history data : " + e.getLocalizedMessage()); - logger.error("Error in getBenHistoryDetails:" + e); + if (commonUtilityClass.getBenRegID() != null) { + String s = adolescentAndChildCareService.getBirthAndImmuniHistory(commonUtilityClass.getBenRegID(), + commonUtilityClass.getVisitCode()); + response.setResponse(s); + } else { + response.setError(5000, "Invalid request : missing ben information"); + return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(response.toString()); } - return response.toString(); + logger.info("getBenHistoryDetails response:" + response); + return ResponseEntity.ok(response.toString()); } /** @@ -191,29 +153,24 @@ public String getBenHistoryDetails( */ @Operation(summary = "Get child adolescent care beneficiary vitals from nurse") @PostMapping(value = { "/getBenVitalDetailsFrmNurse" }) - public String getBenVitalDetailsFrmNurse( - @Param(value = "{\"benRegID\":\"Long\",\"visitCode\":\"Long\"}") @RequestBody String comingRequest) { + public ResponseEntity getBenVitalDetailsFrmNurse( + @Param(value = "{\"benRegID\":\"Long\",\"visitCode\":\"Long\"}") @RequestBody String comingRequest) + throws Exception { OutputResponse response = new OutputResponse(); - logger.info("getBenVitalDetailsFrmNurse request:" + comingRequest); - try { - JSONObject obj = new JSONObject(comingRequest); - if (obj.has("benRegID") && obj.has("visitCode")) { - Long benRegID = obj.getLong("benRegID"); - Long visitCode = obj.getLong("visitCode"); - - String res = adolescentAndChildCareService.getBeneficiaryVitalDetails(benRegID, visitCode); - response.setResponse(res); - } else { - logger.info("Invalid Request Data."); - response.setError(5000, "Invalid request : visit information missing"); - } - logger.info("getBenVitalDetailsFrmNurse response:" + response); - } catch (Exception e) { - response.setError(5000, "Error while getting beneficiary vital data : " + e.getLocalizedMessage()); - logger.error("Error in getBenVitalDetailsFrmNurse:" + e); + JSONObject obj = new JSONObject(comingRequest); + if (obj.has("benRegID") && obj.has("visitCode")) { + Long benRegID = obj.getLong("benRegID"); + Long visitCode = obj.getLong("visitCode"); + String res = adolescentAndChildCareService.getBeneficiaryVitalDetails(benRegID, visitCode); + response.setResponse(res); + } else { + logger.info("Invalid Request Data."); + response.setError(5000, "Invalid request : visit information missing"); + return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(response.toString()); } - return response.toString(); + logger.info("getBenVitalDetailsFrmNurse response:" + response); + return ResponseEntity.ok(response.toString()); } /** @@ -224,29 +181,21 @@ public String getBenVitalDetailsFrmNurse( */ @Operation(summary = "Get child adolescent care beneficiary immunization details") @PostMapping(value = { "/getBenImmunizationServiceDetails" }) - - public String getBenImmunizationServiceDetails( - @Param(value = "{\"benRegID\":\"Long\",\"visitCode\":\"Long\"}") @RequestBody CommonUtilityClass commonUtilityClass) { + public ResponseEntity getBenImmunizationServiceDetails( + @Param(value = "{\"benRegID\":\"Long\",\"visitCode\":\"Long\"}") @RequestBody CommonUtilityClass commonUtilityClass) + throws Exception { OutputResponse response = new OutputResponse(); - logger.info("getBenImmunizationServiceDetails request:" + commonUtilityClass.toString()); - try { - - if (commonUtilityClass.getBenRegID() != null && commonUtilityClass.getVisitCode() != null) { - - String s = adolescentAndChildCareService.getBeneficiaryImmunizationServiceDetails( - commonUtilityClass.getBenRegID(), commonUtilityClass.getVisitCode()); - response.setResponse(s); - } else { - response.setError(5000, "Invalid request : missing ben information"); - } - logger.info("getBenImmunizationServiceDetails response:" + response); - } catch (Exception e) { - response.setError(5000, - "Error while getting beneficiary immunization service data : " + e.getLocalizedMessage()); - logger.error("Error in getBenImmunizationServiceDetails:" + e); + if (commonUtilityClass.getBenRegID() != null && commonUtilityClass.getVisitCode() != null) { + String s = adolescentAndChildCareService.getBeneficiaryImmunizationServiceDetails( + commonUtilityClass.getBenRegID(), commonUtilityClass.getVisitCode()); + response.setResponse(s); + } else { + response.setError(5000, "Invalid request : missing ben information"); + return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(response.toString()); } - return response.toString(); + logger.info("getBenImmunizationServiceDetails response:" + response); + return ResponseEntity.ok(response.toString()); } /** @@ -257,29 +206,24 @@ public String getBenImmunizationServiceDetails( @Operation(summary = "Get child adolescent care beneficiary details entered by doctor") @PostMapping(value = { "/getBenCaseRecordFromDoctor" }) @Transactional(rollbackFor = Exception.class) - public String getBenCaseRecordFromDoctor( - @Param(value = "{\"benRegID\":\"Long\",\"visitCode\":\"Long\"}") @RequestBody String comingRequest) { + public ResponseEntity getBenCaseRecordFromDoctor( + @Param(value = "{\"benRegID\":\"Long\",\"visitCode\":\"Long\"}") @RequestBody String comingRequest) + throws Exception { OutputResponse response = new OutputResponse(); - logger.info("getBenCaseRecordFromDoctor CAC request:" + comingRequest); - try { - JSONObject obj = new JSONObject(comingRequest); - if (null != obj && obj.length() > 1 && obj.has("benRegID") && obj.has("visitCode")) { - Long benRegID = obj.getLong("benRegID"); - Long visitCode = obj.getLong("visitCode"); - - String res = adolescentAndChildCareService.getBenCaseRecordFromDoctorCAC(benRegID, visitCode); - response.setResponse(res); - } else { - logger.info("Invalid Request Data."); - response.setError(5000, "Invalid request"); - } - logger.info("getBenCaseRecordFromDoctor CAC response:" + response); - } catch (Exception e) { - response.setError(5000, "Error while getting beneficiary doctor data : " + e.getLocalizedMessage()); - logger.error("Error in getBenCaseRecordFromDoctor CAC :" + e); + JSONObject obj = new JSONObject(comingRequest); + if (null != obj && obj.length() > 1 && obj.has("benRegID") && obj.has("visitCode")) { + Long benRegID = obj.getLong("benRegID"); + Long visitCode = obj.getLong("visitCode"); + String res = adolescentAndChildCareService.getBenCaseRecordFromDoctorCAC(benRegID, visitCode); + response.setResponse(res); + } else { + logger.info("Invalid Request Data."); + response.setError(5000, "Invalid request"); + return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(response.toString()); } - return response.toString(); + logger.info("getBenCaseRecordFromDoctor CAC response:" + response); + return ResponseEntity.ok(response.toString()); } /** @@ -289,30 +233,19 @@ public String getBenCaseRecordFromDoctor( */ @Operation(summary = "Update child adolescent care beneficiary vitals") @PostMapping(value = { "/update/vitalScreen" }) - public String updateVitalNurseCAC(@RequestBody String requestObj) { - + public ResponseEntity updateVitalNurseCAC(@RequestBody String requestObj) throws Exception { OutputResponse response = new OutputResponse(); logger.info("Request object for CAC Vital data updating :" + requestObj); - - try { - JsonObject jsnOBJ = new JsonObject(); - JsonParser jsnParser = new JsonParser(); - JsonElement jsnElmnt = jsnParser.parse(requestObj); - jsnOBJ = jsnElmnt.getAsJsonObject(); - - int i = adolescentAndChildCareService.updateBenVitalDetailsCAC(jsnOBJ); - if (i == 1) - response.setResponse("Data updated successfully"); - else - response.setError(500, "Unable to modify data, please contact administrator"); - - logger.info("CAC vital data update Response:" + response); - } catch (Exception e) { - response.setError(5000, "Unable to modify data : " + e.getLocalizedMessage()); - logger.error("Error while updating beneficiary vital data :" + e); + JsonObject jsnOBJ = JsonParser.parseString(requestObj).getAsJsonObject(); + int i = adolescentAndChildCareService.updateBenVitalDetailsCAC(jsnOBJ); + if (i == 1) { + response.setResponse("Data updated successfully"); + } else { + response.setError(500, "Unable to modify data, please contact administrator"); + return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(response.toString()); } - - return response.toString(); + logger.info("CAC vital data update Response:" + response); + return ResponseEntity.ok(response.toString()); } /** @@ -322,30 +255,17 @@ public String updateVitalNurseCAC(@RequestBody String requestObj) { */ @Operation(summary = "Update birth and immunization history") @PostMapping(value = { "/update/BirthAndImmunizationHistoryScreen" }) - public String updateBirthAndImmunizationHistoryNurse(@RequestBody String requestObj) { - + public ResponseEntity updateBirthAndImmunizationHistoryNurse(@RequestBody String requestObj) + throws Exception { OutputResponse response = new OutputResponse(); logger.info("Request object for CAC data updating :" + requestObj); - - try { - JsonObject jsnOBJ = new JsonObject(); - JsonParser jsnParser = new JsonParser(); - JsonElement jsnElmnt = jsnParser.parse(requestObj); - jsnOBJ = jsnElmnt.getAsJsonObject(); - - int i = adolescentAndChildCareService.updateBenHistoryDetails(jsnOBJ); - - if (i > 0) - response.setResponse("data updated successfully"); - else - throw new IEMRException("error in updating data. please contact administrator"); - - } catch (Exception e) { - response.setError(5000, "Unable to modify data : " + e.getLocalizedMessage()); - logger.error("Error while updating beneficiary CAC data :" + e); - } - - return response.toString(); + JsonObject jsnOBJ = JsonParser.parseString(requestObj).getAsJsonObject(); + int i = adolescentAndChildCareService.updateBenHistoryDetails(jsnOBJ); + if (i > 0) + response.setResponse("data updated successfully"); + else + throw new IEMRException("error in updating data. please contact administrator"); + return ResponseEntity.ok(response.toString()); } /** @@ -356,30 +276,16 @@ public String updateBirthAndImmunizationHistoryNurse(@RequestBody String request */ @Operation(summary = "Update immunization service data") @PostMapping(value = { "/update/ImmunizationServicesScreen" }) - public String updateImmunizationServicesNurse(@RequestBody String requestObj) { - + public ResponseEntity updateImmunizationServicesNurse(@RequestBody String requestObj) throws Exception { OutputResponse response = new OutputResponse(); logger.info("Request object for CAC data updating :" + requestObj); - - try { - JsonObject jsnOBJ = new JsonObject(); - JsonParser jsnParser = new JsonParser(); - JsonElement jsnElmnt = jsnParser.parse(requestObj); - jsnOBJ = jsnElmnt.getAsJsonObject(); - - int i = adolescentAndChildCareService.updateBenImmunServiceDetailsCAC(jsnOBJ); - - if (i > 0) - response.setResponse("data updated successfully"); - else - throw new IEMRException("error in updating data, please contact administrator"); - - } catch (Exception e) { - response.setError(5000, "Unable to modify data : " + e.getLocalizedMessage()); - logger.error("Error while updating beneficiary CAC data :" + e); - } - - return response.toString(); + JsonObject jsnOBJ = JsonParser.parseString(requestObj).getAsJsonObject(); + int i = adolescentAndChildCareService.updateBenImmunServiceDetailsCAC(jsnOBJ); + if (i > 0) + response.setResponse("data updated successfully"); + else + throw new IEMRException("error in updating data, please contact administrator"); + return ResponseEntity.ok(response.toString()); } /** @@ -389,31 +295,18 @@ public String updateImmunizationServicesNurse(@RequestBody String requestObj) { */ @Operation(summary = "Update child adolescent care doctor data") @PostMapping(value = { "/update/doctorData" }) - public String updateCACDoctorData(@RequestBody String requestObj, - @RequestHeader(value = "Authorization") String Authorization) { - + public ResponseEntity updateCACDoctorData(@RequestBody String requestObj, + @RequestHeader(value = "Authorization") String Authorization) throws Exception { OutputResponse response = new OutputResponse(); logger.info("Request object for doctor data updating :" + requestObj); - try { - JsonObject jsnOBJ = new JsonObject(); - JsonParser jsnParser = new JsonParser(); - JsonElement jsnElmnt = jsnParser.parse(requestObj); - jsnOBJ = jsnElmnt.getAsJsonObject(); - - Long result = adolescentAndChildCareService.updateDoctorDataCAC(jsnOBJ, Authorization); - - if (null != result && result > 0) { - response.setResponse("Data updated successfully"); - } else - throw new IEMRException("error in updating data - NULL"); - - logger.info("Doctor data update response:" + response); - } catch (Exception e) { - logger.error("Unable to modify data. " + e.getLocalizedMessage()); - response.setError(5000, e.getMessage()); - } - - return response.toString(); + JsonObject jsnOBJ = JsonParser.parseString(requestObj).getAsJsonObject(); + Long result = adolescentAndChildCareService.updateDoctorDataCAC(jsnOBJ, Authorization); + if (null != result && result > 0) { + response.setResponse("Data updated successfully"); + } else + throw new IEMRException("error in updating data - NULL"); + logger.info("Doctor data update response:" + response); + return ResponseEntity.ok(response.toString()); } } diff --git a/src/main/java/com/iemr/hwc/controller/anc/AntenatalCareController.java b/src/main/java/com/iemr/hwc/controller/anc/AntenatalCareController.java index 02c62cea..a22653ce 100644 --- a/src/main/java/com/iemr/hwc/controller/anc/AntenatalCareController.java +++ b/src/main/java/com/iemr/hwc/controller/anc/AntenatalCareController.java @@ -35,17 +35,17 @@ import org.springframework.web.bind.annotation.RestController; import com.google.gson.Gson; -import com.google.gson.JsonElement; import com.google.gson.JsonObject; import com.google.gson.JsonParser; import com.iemr.hwc.data.anc.HrpStatusAndReasonsRequestModel; import com.iemr.hwc.data.anc.SysObstetricExamination; import com.iemr.hwc.data.nurse.CommonUtilityClass; import com.iemr.hwc.service.anc.ANCService; -import com.iemr.hwc.utils.exception.IEMRException; import com.iemr.hwc.utils.response.OutputResponse; import io.swagger.v3.oas.annotations.Operation; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; /** * @@ -68,34 +68,19 @@ public class AntenatalCareController { */ @Operation(summary = "Save ANC nurse data") @PostMapping(value = { "/save/nurseData" }) - public String saveBenANCNurseData(@RequestBody String requestObj, + public ResponseEntity saveBenANCNurseData(@RequestBody String requestObj, @RequestHeader(value = "Authorization") String Authorization) throws Exception { OutputResponse response = new OutputResponse(); - if (null != requestObj) { - JsonObject jsnOBJ = new JsonObject(); - JsonParser jsnParser = new JsonParser(); - JsonElement jsnElmnt = jsnParser.parse(requestObj); - jsnOBJ = jsnElmnt.getAsJsonObject(); - - try { - - logger.info("Request object for ANC nurse data saving :" + requestObj); - - if (jsnOBJ != null) { - String ancRes = ancService.saveANCNurseData(jsnOBJ, Authorization); - response.setResponse(ancRes); - } else { - response.setError(5000, "Invalid request"); - } - - } catch (Exception e) { - logger.error("Error while saving nurse data:" + e.getMessage()); - ancService.deleteVisitDetails(jsnOBJ); - response.setError(5000, e.getMessage()); - } + JsonObject jsnOBJ = JsonParser.parseString(requestObj).getAsJsonObject(); + logger.info("Request object for ANC nurse data saving :" + requestObj); + String ancRes = ancService.saveANCNurseData(jsnOBJ, Authorization); + response.setResponse(ancRes); + } else { + response.setError(5000, "Invalid request"); + return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(response.toString()); } - return response.toString(); + return ResponseEntity.ok(response.toString()); } /** @@ -105,32 +90,24 @@ public String saveBenANCNurseData(@RequestBody String requestObj, */ @Operation(summary = "Save ANC doctor data") @PostMapping(value = { "/save/doctorData" }) - public String saveBenANCDoctorData(@RequestBody String requestObj, - @RequestHeader(value = "Authorization") String Authorization) { + public ResponseEntity saveBenANCDoctorData(@RequestBody String requestObj, + @RequestHeader(value = "Authorization") String Authorization) throws Exception { OutputResponse response = new OutputResponse(); - try { - logger.info("Request object for ANC doctor data saving :" + requestObj); - - JsonObject jsnOBJ = new JsonObject(); - JsonParser jsnParser = new JsonParser(); - JsonElement jsnElmnt = jsnParser.parse(requestObj); - jsnOBJ = jsnElmnt.getAsJsonObject(); - if (jsnOBJ != null) { - Long r = ancService.saveANCDoctorData(jsnOBJ, Authorization); - if (r != null && r > 0) { - response.setResponse("Data saved successfully"); - } else { - response.setError(5000, "Unable to save data"); - } + logger.info("Request object for ANC doctor data saving :" + requestObj); + JsonObject jsnOBJ = JsonParser.parseString(requestObj).getAsJsonObject(); + if (jsnOBJ != null) { + Long r = ancService.saveANCDoctorData(jsnOBJ, Authorization); + if (r != null && r > 0) { + response.setResponse("Data saved successfully"); } else { - response.setError(5000, "Invalid request"); + response.setError(5000, "Unable to save data"); + return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(response.toString()); } - - } catch (Exception e) { - logger.error("Error while saving doctor data:" + e.getMessage()); - response.setError(5000, e.getMessage()); + } else { + response.setError(5000, "Invalid request"); + return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(response.toString()); } - return response.toString(); + return ResponseEntity.ok(response.toString()); } /** @@ -141,28 +118,24 @@ public String saveBenANCDoctorData(@RequestBody String requestObj, @Operation(summary = "Get ANC beneficiary visit details from nurse") @PostMapping(value = { "/getBenVisitDetailsFrmNurseANC" }) @Transactional(rollbackFor = Exception.class) - public String getBenVisitDetailsFrmNurseANC( - @Param(value = "{\"benRegID\":\"Long\", \"visitCode\":\"Long\"}") @RequestBody String comingRequest) { + public ResponseEntity getBenVisitDetailsFrmNurseANC( + @Param(value = "{\"benRegID\":\"Long\", \"visitCode\":\"Long\"}") @RequestBody String comingRequest) + throws Exception { OutputResponse response = new OutputResponse(); - logger.info("Request object for ANC visit data fetching :" + comingRequest); - try { - JSONObject obj = new JSONObject(comingRequest); - if (obj.length() > 1) { - Long benRegID = obj.getLong("benRegID"); - Long visitCode = obj.getLong("visitCode"); - String res = ancService.getBenVisitDetailsFrmNurseANC(benRegID, visitCode); - response.setResponse(res); - } else { - logger.info("Invalid request"); - response.setError(5000, "Invalid request"); - } - logger.info("ANC visit data fetching Response:" + response); - } catch (Exception e) { - response.setError(5000, "Error while getting beneficiary visit data"); - logger.error("Error while getting beneficiary visit data:" + e); + JSONObject obj = new JSONObject(comingRequest); + if (obj.length() > 1 && obj.has("benRegID") && obj.has("visitCode")) { + Long benRegID = obj.getLong("benRegID"); + Long visitCode = obj.getLong("visitCode"); + String res = ancService.getBenVisitDetailsFrmNurseANC(benRegID, visitCode); + response.setResponse(res); + } else { + logger.info("Invalid request"); + response.setError(5000, "Invalid request"); + return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(response.toString()); } - return response.toString(); + logger.info("ANC visit data fetching Response:" + response); + return ResponseEntity.ok(response.toString()); } /** @@ -173,32 +146,28 @@ public String getBenVisitDetailsFrmNurseANC( @Operation(summary = "Get ANC beneficiary details from nurse") @PostMapping(value = { "/getBenANCDetailsFrmNurseANC" }) @Transactional(rollbackFor = Exception.class) - public String getBenANCDetailsFrmNurseANC( - @Param(value = "{\"benRegID\":\"Long\", \"visitCode\":\"Long\"}") @RequestBody String comingRequest) { + public ResponseEntity getBenANCDetailsFrmNurseANC( + @Param(value = "{\"benRegID\":\"Long\", \"visitCode\":\"Long\"}") @RequestBody String comingRequest) + throws Exception { OutputResponse response = new OutputResponse(); - logger.info("Request object for ANC Care data fetching :" + comingRequest); - try { - JSONObject obj = new JSONObject(comingRequest); - Long visitCode = null; - if (obj.has("benRegID")) { - Long benRegID = obj.getLong("benRegID"); + JSONObject obj = new JSONObject(comingRequest); + Long visitCode = null; + if (obj.has("benRegID") && !obj.isNull("benRegID")) { + Long benRegID = obj.getLong("benRegID"); - if (obj.has("visitCode") && !obj.isNull("visitCode") && obj.get("visitCode") != null) - visitCode = obj.getLong("visitCode"); + if (obj.has("visitCode") && !obj.isNull("visitCode") && obj.get("visitCode") != null) + visitCode = obj.getLong("visitCode"); - String res = ancService.getBenANCDetailsFrmNurseANC(benRegID, visitCode); - response.setResponse(res); - } else { - logger.info("Invalid request"); - response.setError(5000, "Invalid request, Beneficiary information is NULL"); - } - logger.info("ANC Care data fetching response :" + response); - } catch (Exception e) { - response.setError(5000, "Error while getting beneficiary ANC care data"); - logger.error("Error while getting beneficiary ANC care data:" + e); + String res = ancService.getBenANCDetailsFrmNurseANC(benRegID, visitCode); + response.setResponse(res); + } else { + logger.info("Invalid request"); + response.setError(5000, "Invalid request, Beneficiary information is NULL"); + return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(response.toString()); } - return response.toString(); + logger.info("ANC Care data fetching response :" + response); + return ResponseEntity.ok(response.toString()); } /** @@ -208,29 +177,23 @@ public String getBenANCDetailsFrmNurseANC( */ @Operation(summary = "Get ANC beneficiary history from nurse") @PostMapping(value = { "/getBenANCHistoryDetails" }) - - public String getBenANCHistoryDetails( - @Param(value = "{\"benRegID\":\"Long\", \"visitCode\":\"Long\"}") @RequestBody String comingRequest) { + public ResponseEntity getBenANCHistoryDetails( + @Param(value = "{\"benRegID\":\"Long\", \"visitCode\":\"Long\"}") @RequestBody String comingRequest) + throws Exception { OutputResponse response = new OutputResponse(); - logger.info("Request object for ANC history data fetching :" + comingRequest); - try { - JSONObject obj = new JSONObject(comingRequest); - if (obj.has("benRegID") && obj.has("visitCode")) { - Long benRegID = obj.getLong("benRegID"); - Long visitCode = obj.getLong("visitCode"); - - String s = ancService.getBenANCHistoryDetails(benRegID, visitCode); - response.setResponse(s); - } else { - response.setError(5000, "Invalid request"); - } - logger.info("ANC history data fetching Response:" + response); - } catch (Exception e) { - response.setError(5000, "Error while getting beneficiary history data"); - logger.error("Error while getting beneficiary history data :" + e); + JSONObject obj = new JSONObject(comingRequest); + if (obj.has("benRegID") && obj.has("visitCode")) { + Long benRegID = obj.getLong("benRegID"); + Long visitCode = obj.getLong("visitCode"); + String s = ancService.getBenANCHistoryDetails(benRegID, visitCode); + response.setResponse(s); + } else { + response.setError(5000, "Invalid request"); + return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(response.toString()); } - return response.toString(); + logger.info("ANC history data fetching Response:" + response); + return ResponseEntity.ok(response.toString()); } /** @@ -240,29 +203,24 @@ public String getBenANCHistoryDetails( */ @Operation(summary = "Get ANC beneficiary vitals from nurse") @PostMapping(value = { "/getBenANCVitalDetailsFrmNurseANC" }) - public String getBenANCVitalDetailsFrmNurseANC( - @Param(value = "{\"benRegID\":\"Long\",\"visitCode\":\"Long\"}") @RequestBody String comingRequest) { + public ResponseEntity getBenANCVitalDetailsFrmNurseANC( + @Param(value = "{\"benRegID\":\"Long\",\"visitCode\":\"Long\"}") @RequestBody String comingRequest) + throws Exception { OutputResponse response = new OutputResponse(); - logger.info("Request object for ANC vital data fetching :" + comingRequest); - try { - JSONObject obj = new JSONObject(comingRequest); - if (obj.has("benRegID") && obj.has("visitCode")) { - Long benRegID = obj.getLong("benRegID"); - Long visitCode = obj.getLong("visitCode"); - - String res = ancService.getBeneficiaryVitalDetails(benRegID, visitCode); - response.setResponse(res); - } else { - logger.info("Invalid request"); - response.setError(5000, "Invalid request"); - } - logger.info("ANC vital data fetching Response:" + response); - } catch (Exception e) { - response.setError(5000, "Error while getting beneficiary vital data"); - logger.error("Error while getting beneficiary vital data :" + e); + JSONObject obj = new JSONObject(comingRequest); + if (obj.has("benRegID") && obj.has("visitCode")) { + Long benRegID = obj.getLong("benRegID"); + Long visitCode = obj.getLong("visitCode"); + String res = ancService.getBeneficiaryVitalDetails(benRegID, visitCode); + response.setResponse(res); + } else { + logger.info("Invalid request"); + response.setError(5000, "Invalid request"); + return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(response.toString()); } - return response.toString(); + logger.info("ANC vital data fetching Response:" + response); + return ResponseEntity.ok(response.toString()); } /** @@ -272,29 +230,23 @@ public String getBenANCVitalDetailsFrmNurseANC( */ @Operation(summary = "Get ANC beneficiary examination details from nurse") @PostMapping(value = { "/getBenExaminationDetailsANC" }) - - public String getBenExaminationDetailsANC( - @Param(value = "{\"benRegID\":\"Long\",\"visitCode\":\"Long\"}") @RequestBody String comingRequest) { + public ResponseEntity getBenExaminationDetailsANC( + @Param(value = "{\"benRegID\":\"Long\",\"visitCode\":\"Long\"}") @RequestBody String comingRequest) + throws Exception { OutputResponse response = new OutputResponse(); - logger.info("Request object for ANC examination data fetching :" + comingRequest); - try { - JSONObject obj = new JSONObject(comingRequest); - if (obj.has("benRegID") && obj.has("visitCode")) { - Long benRegID = obj.getLong("benRegID"); - Long visitCode = obj.getLong("visitCode"); - - String s = ancService.getANCExaminationDetailsData(benRegID, visitCode); - response.setResponse(s); - } else { - response.setError(5000, "Invalid request"); - } - logger.info("ANC examination data fetching Response:" + response); - } catch (Exception e) { - response.setError(5000, "Error while getting beneficiary examination data"); - logger.error("Error while getting beneficiary examination data :" + e); + JSONObject obj = new JSONObject(comingRequest); + if (obj.has("benRegID") && obj.has("visitCode")) { + Long benRegID = obj.getLong("benRegID"); + Long visitCode = obj.getLong("visitCode"); + String s = ancService.getANCExaminationDetailsData(benRegID, visitCode); + response.setResponse(s); + } else { + response.setError(5000, "Invalid request"); + return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(response.toString()); } - return response.toString(); + logger.info("ANC examination data fetching Response:" + response); + return ResponseEntity.ok(response.toString()); } /** @@ -305,48 +257,36 @@ public String getBenExaminationDetailsANC( @Operation(summary = "Get ANC beneficiary case record") @PostMapping(value = { "/getBenCaseRecordFromDoctorANC" }) @Transactional(rollbackFor = Exception.class) - public String getBenCaseRecordFromDoctorANC( - @Param(value = "{\"benRegID\":\"Long\",\"visitCode\":\"Long\"}") @RequestBody String comingRequest) { + public ResponseEntity getBenCaseRecordFromDoctorANC( + @Param(value = "{\"benRegID\":\"Long\",\"visitCode\":\"Long\"}") @RequestBody String comingRequest) + throws Exception { OutputResponse response = new OutputResponse(); - logger.info("Request object for doctor data fetching :" + comingRequest); - try { - JSONObject obj = new JSONObject(comingRequest); - if (null != obj && obj.length() > 1 && obj.has("benRegID") && obj.has("visitCode")) { - Long benRegID = obj.getLong("benRegID"); - Long visitCode = obj.getLong("visitCode"); - - String res = ancService.getBenCaseRecordFromDoctorANC(benRegID, visitCode); - response.setResponse(res); - } else { - logger.info("Invalid request"); - response.setError(5000, "Invalid request"); - } - logger.info("ANC doctor data fetching Response:" + response); - } catch (Exception e) { - response.setError(5000, "Error while getting beneficiary doctor data"); - logger.error("Error while getting beneficiary doctor data :" + e); + JSONObject obj = new JSONObject(comingRequest); + if (null != obj && obj.length() > 1 && obj.has("benRegID") && obj.has("visitCode")) { + Long benRegID = obj.getLong("benRegID"); + Long visitCode = obj.getLong("visitCode"); + String res = ancService.getBenCaseRecordFromDoctorANC(benRegID, visitCode); + response.setResponse(res); + } else { + logger.info("Invalid request"); + response.setError(5000, "Invalid request"); + return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(response.toString()); } - return response.toString(); + logger.info("ANC doctor data fetching Response:" + response); + return ResponseEntity.ok(response.toString()); } @Operation(summary = "Check high risk pregnancy status for ANC beneficiary") @PostMapping(value = { "/getHRPStatus" }) @Transactional(rollbackFor = Exception.class) - public String getHRPStatus(@RequestBody HrpStatusAndReasonsRequestModel hrpStatusAndReasonsRequestModel) { + public ResponseEntity getHRPStatus( + @RequestBody HrpStatusAndReasonsRequestModel hrpStatusAndReasonsRequestModel) throws Exception { OutputResponse response = new OutputResponse(); - logger.info("Request object for doctor data fetching :" + hrpStatusAndReasonsRequestModel.toString()); - try { - - String res = ancService.getHRPStatus(hrpStatusAndReasonsRequestModel); - response.setResponse(res); - - } catch (Exception e) { - response.setError(5000, "error in getting HRP status"); - logger.error("error in getting HRP status : " + e); - } - return response.toString(); + String res = ancService.getHRPStatus(hrpStatusAndReasonsRequestModel); + response.setResponse(res); + return ResponseEntity.ok(response.toString()); } // changes for get HRP information - follow-up, can be used at other places also @@ -357,24 +297,18 @@ public String getHRPStatus(@RequestBody HrpStatusAndReasonsRequestModel hrpStatu + "as per the latest visit") @PostMapping(value = { "/getHrpInformation" }) @Transactional(rollbackFor = Exception.class) - public String getHrpInformation( - @Param(value = "{\"beneficiaryRegId\":\"Long\"}") @RequestBody CommonUtilityClass commonUtilityClass) { + public ResponseEntity getHrpInformation( + @Param(value = "{\"beneficiaryRegId\":\"Long\"}") @RequestBody CommonUtilityClass commonUtilityClass) + throws Exception { OutputResponse response = new OutputResponse(); - logger.info("Request object for getHrpInformation :" + commonUtilityClass.toString()); - try { - - SysObstetricExamination sysObstetricExamination = aNCService - .getHRPInformation(commonUtilityClass.getBeneficiaryRegId()); - if (sysObstetricExamination != null) - response.setResponse(new Gson().toJson(sysObstetricExamination)); - else - response.setResponse("no information found"); - } catch (IEMRException e) { - response.setError(5000, "error in getting HRP information : " + e.getLocalizedMessage()); - logger.error("error in getting HRP information : " + e); - } - return response.toString(); + SysObstetricExamination sysObstetricExamination = aNCService + .getHRPInformation(commonUtilityClass.getBeneficiaryRegId()); + if (sysObstetricExamination != null) + response.setResponse(new Gson().toJson(sysObstetricExamination)); + else + response.setResponse("no information found"); + return ResponseEntity.ok(response.toString()); } /** @@ -386,30 +320,19 @@ public String getHrpInformation( */ @Operation(summary = "Update ANC beneficiary data") @PostMapping(value = { "/update/ANCScreen" }) - public String updateANCCareNurse(@RequestBody String requestObj) { - + public ResponseEntity updateANCCareNurse(@RequestBody String requestObj) throws Exception { OutputResponse response = new OutputResponse(); logger.info("Request object for ANC Care data updating :" + requestObj); - - JsonObject jsnOBJ = new JsonObject(); - JsonParser jsnParser = new JsonParser(); - JsonElement jsnElmnt = jsnParser.parse(requestObj); - jsnOBJ = jsnElmnt.getAsJsonObject(); - - try { - int result = ancService.updateBenANCDetails(jsnOBJ); - if (result > 0) { - response.setResponse("Data updated successfully"); - } else { - response.setError(500, "Unable to modify data"); - } - logger.info("ANC Care data update Response:" + response); - } catch (Exception e) { - response.setError(5000, "Unable to modify data"); - logger.error("Error while updating beneficiary ANC care data :" + e); + JsonObject jsnOBJ = JsonParser.parseString(requestObj).getAsJsonObject(); + int result = ancService.updateBenANCDetails(jsnOBJ); + if (result > 0) { + response.setResponse("Data updated successfully"); + } else { + response.setError(500, "Unable to modify data"); + return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(response.toString()); } - - return response.toString(); + logger.info("ANC Care data update Response:" + response); + return ResponseEntity.ok(response.toString()); } /** @@ -421,30 +344,19 @@ public String updateANCCareNurse(@RequestBody String requestObj) { */ @Operation(summary = "Update ANC beneficiary history") @PostMapping(value = { "/update/historyScreen" }) - public String updateANCHistoryNurse(@RequestBody String requestObj) { - + public ResponseEntity updateANCHistoryNurse(@RequestBody String requestObj) throws Exception { OutputResponse response = new OutputResponse(); logger.info("Request object for ANC history data updating :" + requestObj); - - JsonObject jsnOBJ = new JsonObject(); - JsonParser jsnParser = new JsonParser(); - JsonElement jsnElmnt = jsnParser.parse(requestObj); - jsnOBJ = jsnElmnt.getAsJsonObject(); - - try { - int result = ancService.updateBenANCHistoryDetails(jsnOBJ); - if (result > 0) { - response.setResponse("Data updated successfully"); - } else { - response.setError(500, "Unable to modify data"); - } - logger.info("ANC history data update Response:" + response); - } catch (Exception e) { - response.setError(5000, "Unable to modify data"); - logger.error("Error while updating beneficiary history data :" + e); + JsonObject jsnOBJ = JsonParser.parseString(requestObj).getAsJsonObject(); + int result = ancService.updateBenANCHistoryDetails(jsnOBJ); + if (result > 0) { + response.setResponse("Data updated successfully"); + } else { + response.setError(500, "Unable to modify data"); + return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(response.toString()); } - - return response.toString(); + logger.info("ANC history data update Response:" + response); + return ResponseEntity.ok(response.toString()); } /** @@ -456,30 +368,19 @@ public String updateANCHistoryNurse(@RequestBody String requestObj) { */ @Operation(summary = "Update ANC beneficiary vitals") @PostMapping(value = { "/update/vitalScreen" }) - public String updateANCVitalNurse(@RequestBody String requestObj) { - + public ResponseEntity updateANCVitalNurse(@RequestBody String requestObj) throws Exception { OutputResponse response = new OutputResponse(); logger.info("Request object for ANC Vital data updating :" + requestObj); - - JsonObject jsnOBJ = new JsonObject(); - JsonParser jsnParser = new JsonParser(); - JsonElement jsnElmnt = jsnParser.parse(requestObj); - jsnOBJ = jsnElmnt.getAsJsonObject(); - - try { - int result = ancService.updateBenANCVitalDetails(jsnOBJ); - if (result > 0) { - response.setResponse("Data updated successfully"); - } else { - response.setError(500, "Unable to modify data"); - } - logger.info("ANC vital data update Response:" + response); - } catch (Exception e) { - response.setError(5000, "Unable to modify data"); - logger.error("Error while updating beneficiary vital data :" + e); + JsonObject jsnOBJ = JsonParser.parseString(requestObj).getAsJsonObject(); + int result = ancService.updateBenANCVitalDetails(jsnOBJ); + if (result > 0) { + response.setResponse("Data updated successfully"); + } else { + response.setError(500, "Unable to modify data"); + return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(response.toString()); } - - return response.toString(); + logger.info("ANC vital data update Response:" + response); + return ResponseEntity.ok(response.toString()); } /** @@ -491,30 +392,19 @@ public String updateANCVitalNurse(@RequestBody String requestObj) { */ @Operation(summary = "Update ANC examination data") @PostMapping(value = { "/update/examinationScreen" }) - public String updateANCExaminationNurse(@RequestBody String requestObj) { - + public ResponseEntity updateANCExaminationNurse(@RequestBody String requestObj) throws Exception { OutputResponse response = new OutputResponse(); logger.info("Request object for ANC examination data updating :" + requestObj); - - JsonObject jsnOBJ = new JsonObject(); - JsonParser jsnParser = new JsonParser(); - JsonElement jsnElmnt = jsnParser.parse(requestObj); - jsnOBJ = jsnElmnt.getAsJsonObject(); - - try { - int result = ancService.updateBenANCExaminationDetails(jsnOBJ); - if (result > 0) { - response.setResponse("Data updated successfully"); - } else { - response.setError(500, "Unable to modify data"); - } - logger.info("ANC examination data update Response:" + response); - } catch (Exception e) { - response.setError(5000, "Unable to modify data"); - logger.error("Error while updating beneficiary examination data :" + e); + JsonObject jsnOBJ = JsonParser.parseString(requestObj).getAsJsonObject(); + int result = ancService.updateBenANCExaminationDetails(jsnOBJ); + if (result > 0) { + response.setResponse("Data updated successfully"); + } else { + response.setError(500, "Unable to modify data"); + return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(response.toString()); } - - return response.toString(); + logger.info("ANC examination data update Response:" + response); + return ResponseEntity.ok(response.toString()); } /** @@ -526,31 +416,20 @@ public String updateANCExaminationNurse(@RequestBody String requestObj) { */ @Operation(summary = "Update ANC doctor data") @PostMapping(value = { "/update/doctorData" }) - public String updateANCDoctorData(@RequestBody String requestObj, - @RequestHeader(value = "Authorization") String Authorization) { - + public ResponseEntity updateANCDoctorData(@RequestBody String requestObj, + @RequestHeader(value = "Authorization") String Authorization) throws Exception { OutputResponse response = new OutputResponse(); logger.info("Request object for ANC doctor data updating :" + requestObj); - - JsonObject jsnOBJ = new JsonObject(); - JsonParser jsnParser = new JsonParser(); - JsonElement jsnElmnt = jsnParser.parse(requestObj); - jsnOBJ = jsnElmnt.getAsJsonObject(); - - try { - Long result = ancService.updateANCDoctorData(jsnOBJ, Authorization); - if (null != result && result > 0) { - response.setResponse("Data updated successfully"); - } else { - response.setError(500, "Unable to modify data"); - } - logger.info("ANC doctor data update Response:" + response); - } catch (Exception e) { - logger.error("Unable to modify data. " + e.getMessage()); - response.setError(5000, e.getMessage()); + JsonObject jsnOBJ = JsonParser.parseString(requestObj).getAsJsonObject(); + Long result = ancService.updateANCDoctorData(jsnOBJ, Authorization); + if (null != result && result > 0) { + response.setResponse("Data updated successfully"); + } else { + response.setError(500, "Unable to modify data"); + return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(response.toString()); } - - return response.toString(); + logger.info("ANC doctor data update Response:" + response); + return ResponseEntity.ok(response.toString()); } } diff --git a/src/main/java/com/iemr/hwc/controller/cancerscreening/CancerScreeningController.java b/src/main/java/com/iemr/hwc/controller/cancerscreening/CancerScreeningController.java index 356f28e7..1fdd8ae9 100644 --- a/src/main/java/com/iemr/hwc/controller/cancerscreening/CancerScreeningController.java +++ b/src/main/java/com/iemr/hwc/controller/cancerscreening/CancerScreeningController.java @@ -34,7 +34,6 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import com.google.gson.JsonElement; import com.google.gson.JsonObject; import com.google.gson.JsonParser; import com.iemr.hwc.data.doctor.CancerDiagnosis; @@ -42,6 +41,8 @@ import com.iemr.hwc.service.cancerScreening.CSServiceImpl; import com.iemr.hwc.utils.mapper.InputMapper; import com.iemr.hwc.utils.response.OutputResponse; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; import io.swagger.v3.oas.annotations.Operation; @@ -54,7 +55,6 @@ @RequestMapping(value = "/CS-cancerScreening", headers = "Authorization", consumes = "application/json", produces = "application/json") public class CancerScreeningController { private Logger logger = LoggerFactory.getLogger(CancerScreeningController.class); - private OutputResponse response; private CSServiceImpl cSServiceImpl; @Autowired @@ -70,32 +70,19 @@ public void setCancerScreeningServiceImpl(CSServiceImpl cSServiceImpl) { */ @Operation(summary = "Save cancer screening data collected by nurse") @PostMapping(value = { "/save/nurseData" }) - public String saveBenCancerScreeningNurseData(@RequestBody String requestObj, + public ResponseEntity saveBenCancerScreeningNurseData(@RequestBody String requestObj, @RequestHeader(value = "Authorization") String Authorization) throws Exception { OutputResponse response = new OutputResponse(); - if (null != requestObj) { - JsonObject jsnOBJ = new JsonObject(); - JsonParser jsnParser = new JsonParser(); - JsonElement jsnElmnt = jsnParser.parse(requestObj); - jsnOBJ = jsnElmnt.getAsJsonObject(); - - try { - logger.info("Request object for CS nurse data saving :" + requestObj); - - if (jsnOBJ != null) { - String nurseDataSaveSuccessFlag = cSServiceImpl.saveCancerScreeningNurseData(jsnOBJ, Authorization); - response.setResponse(nurseDataSaveSuccessFlag); - } else { - response.setError(5000, "Invalid request"); - } - } catch (Exception e) { - logger.error("Error while saving beneficiary nurse data :" + e.getMessage()); - cSServiceImpl.deleteVisitDetails(jsnOBJ); - response.setError(5000, e.getMessage()); - } + JsonObject jsnOBJ = JsonParser.parseString(requestObj).getAsJsonObject(); + logger.info("Request object for CS nurse data saving :" + requestObj); + String nurseDataSaveSuccessFlag = cSServiceImpl.saveCancerScreeningNurseData(jsnOBJ, Authorization); + response.setResponse(nurseDataSaveSuccessFlag); + } else { + response.setError(5000, "Invalid request"); + return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(response.toString()); } - return response.toString(); + return ResponseEntity.ok(response.toString()); } /** @@ -105,33 +92,24 @@ public String saveBenCancerScreeningNurseData(@RequestBody String requestObj, */ @Operation(summary = "Update cancer screening data by the doctor") @PostMapping(value = { "/save/doctorData" }) - public String saveBenCancerScreeningDoctorData(@RequestBody String requestObj, - @RequestHeader String Authorization) { + public ResponseEntity saveBenCancerScreeningDoctorData(@RequestBody String requestObj, + @RequestHeader String Authorization) throws Exception { OutputResponse response = new OutputResponse(); - try { - logger.info("Request object for CS doctor data saving :" + requestObj); - - JsonObject jsnOBJ = new JsonObject(); - JsonParser jsnParser = new JsonParser(); - JsonElement jsnElmnt = jsnParser.parse(requestObj); - jsnOBJ = jsnElmnt.getAsJsonObject(); - - if (jsnOBJ != null) { - Long csDocDataSaveSuccessFlag = cSServiceImpl.saveCancerScreeningDoctorData(jsnOBJ, Authorization); - if (csDocDataSaveSuccessFlag != null && csDocDataSaveSuccessFlag > 0) { - response.setResponse("Data saved successfully"); - } else { - response.setError(5000, "Unable to save data"); - } + logger.info("Request object for CS doctor data saving :" + requestObj); + JsonObject jsnOBJ = JsonParser.parseString(requestObj).getAsJsonObject(); + if (jsnOBJ != null) { + Long csDocDataSaveSuccessFlag = cSServiceImpl.saveCancerScreeningDoctorData(jsnOBJ, Authorization); + if (csDocDataSaveSuccessFlag != null && csDocDataSaveSuccessFlag > 0) { + response.setResponse("Data saved successfully"); } else { - response.setError(5000, "Invalid request"); + response.setError(5000, "Unable to save data"); + return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(response.toString()); } - - } catch (Exception e) { - logger.error("Error while saving beneficiary doctor data :" + e.getMessage()); - response.setError(5000, e.getMessage()); + } else { + response.setError(5000, "Invalid request"); + return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(response.toString()); } - return response.toString(); + return ResponseEntity.ok(response.toString()); } /** @@ -141,27 +119,23 @@ public String saveBenCancerScreeningDoctorData(@RequestBody String requestObj, */ @Operation(summary = "Get beneficiary visit details") @PostMapping(value = { "/getBenDataFrmNurseToDocVisitDetailsScreen" }) - public String getBenDataFrmNurseScrnToDocScrnVisitDetails( - @Param(value = "{\"benRegID\":\"Long\", \"visitCode\":\"Long\"}") @RequestBody String comingRequest) { + public ResponseEntity getBenDataFrmNurseScrnToDocScrnVisitDetails( + @Param(value = "{\"benRegID\":\"Long\", \"visitCode\":\"Long\"}") @RequestBody String comingRequest) + throws Exception { OutputResponse response = new OutputResponse(); - logger.info("Request object for CS visit data fetching :" + comingRequest); - try { - JSONObject obj = new JSONObject(comingRequest); - if (obj.length() > 1) { - Long benRegID = obj.getLong("benRegID"); - Long visitCode = obj.getLong("visitCode"); - String s = cSServiceImpl.getBenDataFrmNurseToDocVisitDetailsScreen(benRegID, visitCode); - response.setResponse(s); - } else { - response.setError(5000, "Invalid request"); - } - logger.info("CS visit data fetching Response:" + response); - } catch (Exception e) { - response.setError(5000, "Error while getting beneficiary visit data"); - logger.error("Error while getting beneficiary visit data :" + e); + JSONObject obj = new JSONObject(comingRequest); + if (obj.length() > 1 && obj.has("benRegID") && obj.has("visitCode")) { + Long benRegID = obj.getLong("benRegID"); + Long visitCode = obj.getLong("visitCode"); + String s = cSServiceImpl.getBenDataFrmNurseToDocVisitDetailsScreen(benRegID, visitCode); + response.setResponse(s); + } else { + response.setError(5000, "Invalid request"); + return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(response.toString()); } - return response.toString(); + logger.info("CS visit data fetching Response:" + response); + return ResponseEntity.ok(response.toString()); } /** @@ -171,26 +145,23 @@ public String getBenDataFrmNurseScrnToDocScrnVisitDetails( */ @Operation(summary = "Get beneficiary cancer history") @PostMapping(value = { "/getBenDataFrmNurseToDocHistoryScreen" }) - public String getBenDataFrmNurseScrnToDocScrnHistory( - @Param(value = "{\"benRegID\":\"Long\", \"visitCode\":\"Long\"}") @RequestBody String comingRequest) { + public ResponseEntity getBenDataFrmNurseScrnToDocScrnHistory( + @Param(value = "{\"benRegID\":\"Long\", \"visitCode\":\"Long\"}") @RequestBody String comingRequest) + throws Exception { OutputResponse response = new OutputResponse(); logger.info("Request object for CS history data fetching :" + comingRequest); - try { - JSONObject obj = new JSONObject(comingRequest); - if (obj.length() > 1) { - Long benRegID = obj.getLong("benRegID"); - Long visitCode = obj.getLong("visitCode"); - String s = cSServiceImpl.getBenDataFrmNurseToDocHistoryScreen(benRegID, visitCode); - response.setResponse(s); - } else { - response.setError(5000, "Invalid request"); - } - logger.info("CS history data fetching Response:" + response); - } catch (Exception e) { - response.setError(5000, "Error while getting beneficiary history data"); - logger.error("Error while getting beneficiary history data :" + e); + JSONObject obj = new JSONObject(comingRequest); + if (obj.length() > 1 && obj.has("benRegID") && obj.has("visitCode")) { + Long benRegID = obj.getLong("benRegID"); + Long visitCode = obj.getLong("visitCode"); + String s = cSServiceImpl.getBenDataFrmNurseToDocHistoryScreen(benRegID, visitCode); + response.setResponse(s); + } else { + response.setError(5000, "Invalid request"); + return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(response.toString()); } - return response.toString(); + logger.info("CS history data fetching Response:" + response); + return ResponseEntity.ok(response.toString()); } /** @@ -200,27 +171,23 @@ public String getBenDataFrmNurseScrnToDocScrnHistory( */ @Operation(summary = "Get beneficiary vitals") @PostMapping(value = { "/getBenDataFrmNurseToDocVitalScreen" }) - public String getBenDataFrmNurseScrnToDocScrnVital( - @Param(value = "{\"benRegID\":\"Long\", \"visitCode\":\"Long\"}") @RequestBody String comingRequest) { + public ResponseEntity getBenDataFrmNurseScrnToDocScrnVital( + @Param(value = "{\"benRegID\":\"Long\", \"visitCode\":\"Long\"}") @RequestBody String comingRequest) + throws Exception { OutputResponse response = new OutputResponse(); logger.info("Request object for CS vital data fetching :" + comingRequest); - try { - JSONObject obj = new JSONObject(comingRequest); - if (obj.length() > 1) { - Long benRegID = obj.getLong("benRegID"); - Long visitCode = obj.getLong("visitCode"); - - String s = cSServiceImpl.getBenDataFrmNurseToDocVitalScreen(benRegID, visitCode); - response.setResponse(s); - } else { - response.setError(5000, "Invalid request"); - } - logger.info("CS vital data fetching Response:" + response); - } catch (Exception e) { - response.setError(5000, "Error while getting beneficiary vital data"); - logger.error("Error while getting beneficiary vital data :" + e); + JSONObject obj = new JSONObject(comingRequest); + if (obj.length() > 1 && obj.has("benRegID") && obj.has("visitCode")) { + Long benRegID = obj.getLong("benRegID"); + Long visitCode = obj.getLong("visitCode"); + String s = cSServiceImpl.getBenDataFrmNurseToDocVitalScreen(benRegID, visitCode); + response.setResponse(s); + } else { + response.setError(5000, "Invalid request"); + return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(response.toString()); } - return response.toString(); + logger.info("CS vital data fetching Response:" + response); + return ResponseEntity.ok(response.toString()); } /** @@ -230,26 +197,23 @@ public String getBenDataFrmNurseScrnToDocScrnVital( */ @Operation(summary = "Get beneficiary examination details") @PostMapping(value = { "/getBenDataFrmNurseToDocExaminationScreen" }) - public String getBenDataFrmNurseScrnToDocScrnExamination( - @Param(value = "{\"benRegID\":\"Long\", \"visitCode\":\"Long\"}") @RequestBody String comingRequest) { + public ResponseEntity getBenDataFrmNurseScrnToDocScrnExamination( + @Param(value = "{\"benRegID\":\"Long\", \"visitCode\":\"Long\"}") @RequestBody String comingRequest) + throws Exception { OutputResponse response = new OutputResponse(); logger.info("Request object for CS examination data fetching :" + comingRequest); - try { - JSONObject obj = new JSONObject(comingRequest); - if (obj.length() > 1) { - Long benRegID = obj.getLong("benRegID"); - Long visitCode = obj.getLong("visitCode"); - String s = cSServiceImpl.getBenDataFrmNurseToDocExaminationScreen(benRegID, visitCode); - response.setResponse(s); - } else { - response.setError(5000, "Invalid request"); - } - logger.info("CS examination data fetching Response:" + response); - } catch (Exception e) { - response.setError(5000, "Error while getting beneficiary examination data"); - logger.error("Error while getting beneficiary examination data :" + e); + JSONObject obj = new JSONObject(comingRequest); + if (obj.length() > 1 && obj.has("benRegID") && obj.has("visitCode")) { + Long benRegID = obj.getLong("benRegID"); + Long visitCode = obj.getLong("visitCode"); + String s = cSServiceImpl.getBenDataFrmNurseToDocExaminationScreen(benRegID, visitCode); + response.setResponse(s); + } else { + response.setError(5000, "Invalid request"); + return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(response.toString()); } - return response.toString(); + logger.info("CS examination data fetching Response:" + response); + return ResponseEntity.ok(response.toString()); } /** @@ -260,28 +224,22 @@ public String getBenDataFrmNurseScrnToDocScrnExamination( */ @Operation(summary = "Get beneficiary family history") @PostMapping(value = { "/getBenCancerFamilyHistory" }) - public String getBenCancerFamilyHistory( - @Param(value = "{\"benRegID\":\"Long\"}") @RequestBody String comingRequest) { + public ResponseEntity getBenCancerFamilyHistory( + @Param(value = "{\"benRegID\":\"Long\"}") @RequestBody String comingRequest) throws Exception { OutputResponse response = new OutputResponse(); - logger.info("Request object for CS family history data fetching :" + comingRequest); - try { - JSONObject obj = new JSONObject(comingRequest); - if (obj.has("benRegID")) { - Long benRegID = obj.getLong("benRegID"); - String s = cSServiceImpl.getBenFamilyHistoryData(benRegID); - response.setResponse(s); - - } else { - logger.info("Invalid Request Data."); - response.setError(5000, "Invalid request"); - } - logger.info("CS family history data fetching Response:" + response); - } catch (Exception e) { - response.setError(5000, "Error while getting beneficiary family history data"); - logger.error("Error while getting beneficiary family history data:" + e); + JSONObject obj = new JSONObject(comingRequest); + if (obj.has("benRegID")) { + Long benRegID = obj.getLong("benRegID"); + String s = cSServiceImpl.getBenFamilyHistoryData(benRegID); + response.setResponse(s); + } else { + logger.info("Invalid Request Data."); + response.setError(5000, "Invalid request"); + return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(response.toString()); } - return response.toString(); + logger.info("CS family history data fetching Response:" + response); + return ResponseEntity.ok(response.toString()); } /** @@ -292,27 +250,22 @@ public String getBenCancerFamilyHistory( */ @Operation(summary = "Get beneficiary personal history") @PostMapping(value = { "/getBenCancerPersonalHistory" }) - public String getBenCancerPersonalHistory( - @Param(value = "{\"benRegID\":\"Long\"}") @RequestBody String comingRequest) { + public ResponseEntity getBenCancerPersonalHistory( + @Param(value = "{\"benRegID\":\"Long\"}") @RequestBody String comingRequest) throws Exception { OutputResponse response = new OutputResponse(); - logger.info("Request object for CS personal history data fetching :" + comingRequest); - try { - JSONObject obj = new JSONObject(comingRequest); - if (obj.has("benRegID")) { - Long benRegID = obj.getLong("benRegID"); - String s = cSServiceImpl.getBenPersonalHistoryData(benRegID); - response.setResponse(s); - } else { - logger.info("Invalid Request Data."); - response.setError(5000, "Invalid request"); - } - logger.info("CS personal history data fetching Response:" + response); - } catch (Exception e) { - response.setError(5000, "Error while getting beneficiary personal history data"); - logger.error("Error while getting beneficiary personal history data :" + e); + JSONObject obj = new JSONObject(comingRequest); + if (obj.has("benRegID")) { + Long benRegID = obj.getLong("benRegID"); + String s = cSServiceImpl.getBenPersonalHistoryData(benRegID); + response.setResponse(s); + } else { + logger.info("Invalid Request Data."); + response.setError(5000, "Invalid request"); + return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(response.toString()); } - return response.toString(); + logger.info("CS personal history data fetching Response:" + response); + return ResponseEntity.ok(response.toString()); } /** @@ -323,28 +276,22 @@ public String getBenCancerPersonalHistory( */ @Operation(summary = "Get beneficiary personal diet history") @PostMapping(value = { "/getBenCancerPersonalDietHistory" }) - public String getBenCancerPersonalDietHistory( - @Param(value = "{\"benRegID\":\"Long\"}") @RequestBody String comingRequest) { + public ResponseEntity getBenCancerPersonalDietHistory( + @Param(value = "{\"benRegID\":\"Long\"}") @RequestBody String comingRequest) throws Exception { OutputResponse response = new OutputResponse(); - logger.info("Request object for CS personal diet history data fetching :" + comingRequest); - try { - JSONObject obj = new JSONObject(comingRequest); - if (obj.has("benRegID")) { - Long benRegID = obj.getLong("benRegID"); - String s = cSServiceImpl.getBenPersonalDietHistoryData(benRegID); - response.setResponse(s); - - } else { - logger.info("Invalid Request Data."); - response.setError(5000, "Invalid request"); - } - logger.info("CS personal diet history data fetching Response:" + response); - } catch (Exception e) { - response.setError(5000, "Error while getting beneficiary personal diet history data"); - logger.error("Error while getting beneficiary personal diet history data :" + e); + JSONObject obj = new JSONObject(comingRequest); + if (obj.has("benRegID")) { + Long benRegID = obj.getLong("benRegID"); + String s = cSServiceImpl.getBenPersonalDietHistoryData(benRegID); + response.setResponse(s); + } else { + logger.info("Invalid Request Data."); + response.setError(5000, "Invalid request"); + return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(response.toString()); } - return response.toString(); + logger.info("CS personal diet history data fetching Response:" + response); + return ResponseEntity.ok(response.toString()); } /** @@ -355,27 +302,22 @@ public String getBenCancerPersonalDietHistory( */ @Operation(summary = "Get beneficiary obstetric history") @PostMapping(value = { "/getBenCancerObstetricHistory" }) - public String getBenCancerObstetricHistory( - @Param(value = "{\"benRegID\":\"Long\"}") @RequestBody String comingRequest) { + public ResponseEntity getBenCancerObstetricHistory( + @Param(value = "{\"benRegID\":\"Long\"}") @RequestBody String comingRequest) throws Exception { OutputResponse response = new OutputResponse(); - logger.info("Request object for CS obstetric history data fetching :" + comingRequest); - try { - JSONObject obj = new JSONObject(comingRequest); - if (obj.has("benRegID")) { - Long benRegID = obj.getLong("benRegID"); - String s = cSServiceImpl.getBenObstetricHistoryData(benRegID); - response.setResponse(s); - } else { - logger.info("Invalid Request Data."); - response.setError(5000, "Invalid request"); - } - logger.info("CS obstetric history data fetching Response:" + response); - } catch (Exception e) { - response.setError(5000, "Error while getting beneficiary obstetric history data"); - logger.error("Error while getting beneficiary obstetric history data:" + e); + JSONObject obj = new JSONObject(comingRequest); + if (obj.has("benRegID")) { + Long benRegID = obj.getLong("benRegID"); + String s = cSServiceImpl.getBenObstetricHistoryData(benRegID); + response.setResponse(s); + } else { + logger.info("Invalid Request Data."); + response.setError(5000, "Invalid request"); + return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(response.toString()); } - return response.toString(); + logger.info("CS obstetric history data fetching Response:" + response); + return ResponseEntity.ok(response.toString()); } /** @@ -386,27 +328,24 @@ public String getBenCancerObstetricHistory( @Operation(summary = "Get beneficiary case record and referral details") @PostMapping(value = { "/getBenCaseRecordFromDoctorCS" }) @Transactional(rollbackFor = Exception.class) - public String getBenCaseRecordFromDoctorCS( - @Param(value = "{\"benRegID\":\"Long\", \"visitCode\":\"Long\"}") @RequestBody String comingRequest) { + public ResponseEntity getBenCaseRecordFromDoctorCS( + @Param(value = "{\"benRegID\":\"Long\", \"visitCode\":\"Long\"}") @RequestBody String comingRequest) + throws Exception { OutputResponse response = new OutputResponse(); logger.info("Request object for CS doctor data fetching :" + comingRequest); - try { - JSONObject obj = new JSONObject(comingRequest); - if (null != obj && obj.length() > 1 && obj.has("benRegID") && obj.has("visitCode")) { - Long benRegID = obj.getLong("benRegID"); - Long visitCode = obj.getLong("visitCode"); - String res = cSServiceImpl.getBenCaseRecordFromDoctorCS(benRegID, visitCode); - response.setResponse(res); - } else { - logger.info("Invalid Request Data."); - response.setError(5000, "Invalid request"); - } - logger.info("CS doctor data fetching Response:" + response); - } catch (Exception e) { - response.setError(5000, "Error while getting beneficiary doctor data"); - logger.error("Error while getting beneficiary doctor data :" + e); + JSONObject obj = new JSONObject(comingRequest); + if (null != obj && obj.length() > 1 && obj.has("benRegID") && obj.has("visitCode")) { + Long benRegID = obj.getLong("benRegID"); + Long visitCode = obj.getLong("visitCode"); + String res = cSServiceImpl.getBenCaseRecordFromDoctorCS(benRegID, visitCode); + response.setResponse(res); + } else { + logger.info("Invalid Request Data."); + response.setError(5000, "Invalid request"); + return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(response.toString()); } - return response.toString(); + logger.info("CS doctor data fetching Response:" + response); + return ResponseEntity.ok(response.toString()); } /** @@ -418,7 +357,7 @@ public String getBenCaseRecordFromDoctorCS( */ @Operation(summary = "Update cancer screening history") @PostMapping(value = { "/update/historyScreen" }) - public String updateCSHistoryNurse( + public ResponseEntity updateCSHistoryNurse( @Param(value = "{\"historyDetails\": {\"familyHistory\":{\"diseases\": [{\"beneficiaryRegID\":\"Long\", \"benVisitID\":\"Long\", " + "\"providerServiceMapID\":\"Integer\", \"cancerDiseaseType\":\"String\", \"otherDiseaseType\":\"String\", \"familyMemberList\":\"List\", " + "\"createdBy\":\"String\"}]}, \"personalHistory\":{\"beneficiaryRegID\":\"Long\",\"benVisitID\":\"Long\", \"providerServiceMapID\":\"Integer\", " @@ -433,28 +372,20 @@ public String updateCSHistoryNurse( + "\"isAbortion\":\"Boolean\",\"isOralContraceptiveUsed\":\"Boolean\", \"isHormoneReplacementTherapy\":\"Boolean\",\"menarche_Age\":\"Integer\", " + "\"isMenstrualCycleRegular\":\"Boolean\",\"menstrualCycleLength\":\"Integer\", \"menstrualFlowDuration\":\"Integer\", " + "\"menstrualFlowType\":\"String\", \"isDysmenorrhea\":\"Boolean\", \"isInterMenstrualBleeding\":\"Boolean\", " - + "\"menopauseAge\":\"Integer\", \"isPostMenopauseBleeding\":\"Boolean\", \"createdBy\":\"String\"}}}") @RequestBody String requestObj) { - + + "\"menopauseAge\":\"Integer\", \"isPostMenopauseBleeding\":\"Boolean\", \"createdBy\":\"String\"}}}") @RequestBody String requestObj) + throws Exception { OutputResponse response = new OutputResponse(); logger.info("Request object for CS history data updating :" + requestObj); - JsonObject jsnOBJ = new JsonObject(); - JsonParser jsnParser = new JsonParser(); - JsonElement jsnElmnt = jsnParser.parse(requestObj); - jsnOBJ = jsnElmnt.getAsJsonObject(); - try { - int result = cSServiceImpl.UpdateCSHistoryNurseData(jsnOBJ); - if (result > 0) { - response.setResponse("Data updated successfully"); - } else { - response.setError(500, "Unable to modify data"); - } - logger.info("CS history data update Response:" + response); - } catch (Exception e) { - response.setError(5000, "Unable to modify data"); - logger.error("Error while updating beneficiary history data :" + e); + JsonObject jsnOBJ = JsonParser.parseString(requestObj).getAsJsonObject(); + int result = cSServiceImpl.UpdateCSHistoryNurseData(jsnOBJ); + if (result > 0) { + response.setResponse("Data updated successfully"); + } else { + response.setError(500, "Unable to modify data"); + return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(response.toString()); } - - return response.toString(); + logger.info("CS history data update Response:" + response); + return ResponseEntity.ok(response.toString()); } /** @@ -466,31 +397,27 @@ public String updateCSHistoryNurse( */ @Operation(summary = "Update beneficiary vitals") @PostMapping(value = { "/update/vitalScreen" }) - public String upodateBenVitalDetail( + public ResponseEntity upodateBenVitalDetail( @Param(value = "{\"ID\": \"Long\", \"beneficiaryRegID\":\"Long\",\"benVisitID\":\"Long\"," + "\"weight_Kg\":\"Double\", \"height_cm\":\"Double\", \"waistCircumference_cm\":\"Double\", \"bloodGlucose_Fasting\":\"Short\"," + "\"bloodGlucose_Random\":\"Short\", \"bloodGlucose_2HrPostPrandial\":\"Short\", \"systolicBP_1stReading\":\"Short\", " + "\"diastolicBP_1stReading\":\"Short\", \"systolicBP_2ndReading\":\"Short\", \"diastolicBP_2ndReading\":\"Short\", " + "\"systolicBP_3rdReading\":\"Short\", \"diastolicBP_3rdReading\":\"Short\"," - + " \"hbA1C\":\"Short\",\"hemoglobin\":\"Short\",\"modifiedBy\":\"String\"}") @RequestBody String requestObj) { - + + " \"hbA1C\":\"Short\",\"hemoglobin\":\"Short\",\"modifiedBy\":\"String\"}") @RequestBody String requestObj) + throws Exception { OutputResponse response = new OutputResponse(); logger.info("Request object for CS vital data updating :" + requestObj); - try { - BenCancerVitalDetail benCancerVitalDetail = InputMapper.gson().fromJson(requestObj, - BenCancerVitalDetail.class); - int responseObj = cSServiceImpl.updateBenVitalDetail(benCancerVitalDetail); - if (responseObj > 0) { - response.setResponse("Data updated successfully"); - } else { - response.setError(500, "Unable to modify data"); - } - logger.info("CS vital data update Response:" + response); - } catch (Exception e) { - response.setError(5000, "Unable to modify data"); - logger.error("Error while updating beneficiary vital data :" + e); + BenCancerVitalDetail benCancerVitalDetail = InputMapper.gson().fromJson(requestObj, + BenCancerVitalDetail.class); + int responseObj = cSServiceImpl.updateBenVitalDetail(benCancerVitalDetail); + if (responseObj > 0) { + response.setResponse("Data updated successfully"); + } else { + response.setError(500, "Unable to modify data"); + return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(response.toString()); } - return response.toString(); + logger.info("CS vital data update Response:" + response); + return ResponseEntity.ok(response.toString()); } /** @@ -502,26 +429,19 @@ public String upodateBenVitalDetail( */ @Operation(summary = "Update beneficiary examination details") @PostMapping(value = { "/update/examinationScreen" }) - public String upodateBenExaminationDetail(@RequestBody String requestObj) { + public ResponseEntity upodateBenExaminationDetail(@RequestBody String requestObj) throws Exception { OutputResponse response = new OutputResponse(); logger.info("Request object for CS examination data updating :" + requestObj); - JsonObject jsnOBJ = new JsonObject(); - JsonParser jsnParser = new JsonParser(); - JsonElement jsnElmnt = jsnParser.parse(requestObj); - jsnOBJ = jsnElmnt.getAsJsonObject(); - try { - int responseObj = cSServiceImpl.updateBenExaminationDetail(jsnOBJ); - if (responseObj > 0) { - response.setResponse("Data updated successfully"); - } else { - response.setError(500, "Unable to modify data"); - } - logger.info("CS examination data update Response:" + response); - } catch (Exception e) { - response.setError(5000, "Unable to modify data"); - logger.error("Error while updating beneficiary examination data :" + e); + JsonObject jsnOBJ = JsonParser.parseString(requestObj).getAsJsonObject(); + int responseObj = cSServiceImpl.updateBenExaminationDetail(jsnOBJ); + if (responseObj > 0) { + response.setResponse("Data updated successfully"); + } else { + response.setError(500, "Unable to modify data"); + return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(response.toString()); } - return response.toString(); + logger.info("CS examination data update Response:" + response); + return ResponseEntity.ok(response.toString()); } /** @@ -533,26 +453,22 @@ public String upodateBenExaminationDetail(@RequestBody String requestObj) { */ @Operation(summary = "Update cancer diagnosis details by Oncologist") @PostMapping(value = { "/update/examinationScreen/diagnosis" }) - public String updateCancerDiagnosisDetailsByOncologist( + public ResponseEntity updateCancerDiagnosisDetailsByOncologist( @Param(value = "{\"beneficiaryRegID\":\"Long\", \"benVisitID\":\"Long\", \"visitCode\":\"Long\", " - + "\"provisionalDiagnosisOncologist\":\"String\", \"modifiedBy\":\"string\"}") @RequestBody String requestObj) { - - response = new OutputResponse(); + + "\"provisionalDiagnosisOncologist\":\"String\", \"modifiedBy\":\"string\"}") @RequestBody String requestObj) + throws Exception { + OutputResponse response = new OutputResponse(); logger.info("Request object for CS diagnosis data updating :" + requestObj); - try { - CancerDiagnosis cancerDiagnosis = InputMapper.gson().fromJson(requestObj, CancerDiagnosis.class); - int result = cSServiceImpl.updateCancerDiagnosisDetailsByOncologist(cancerDiagnosis); - if (result > 0) { - response.setResponse("Data updated successfully"); - } else { - response.setError(5000, "Unable to modify data"); - } - logger.info("CS diagnosis data update Response:" + response); - } catch (Exception e) { + CancerDiagnosis cancerDiagnosis = InputMapper.gson().fromJson(requestObj, CancerDiagnosis.class); + int result = cSServiceImpl.updateCancerDiagnosisDetailsByOncologist(cancerDiagnosis); + if (result > 0) { + response.setResponse("Data updated successfully"); + } else { response.setError(5000, "Unable to modify data"); - logger.error("Error while updating beneficiary diagnosis data :" + e); + return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(response.toString()); } - return response.toString(); + logger.info("CS diagnosis data update Response:" + response); + return ResponseEntity.ok(response.toString()); } /** @@ -564,25 +480,18 @@ public String updateCancerDiagnosisDetailsByOncologist( */ @Operation(summary = "Update cancer screening data") @PostMapping(value = { "/update/doctorData" }) - public String updateCancerScreeningDoctorData(@RequestBody String requestObj) { + public ResponseEntity updateCancerScreeningDoctorData(@RequestBody String requestObj) throws Exception { OutputResponse response = new OutputResponse(); logger.info("Request object for CS doctor data updating :" + requestObj); - JsonObject jsnOBJ = new JsonObject(); - JsonParser jsnParser = new JsonParser(); - JsonElement jsnElmnt = jsnParser.parse(requestObj); - jsnOBJ = jsnElmnt.getAsJsonObject(); - try { - int result = cSServiceImpl.updateCancerScreeningDoctorData(jsnOBJ); - if (result > 0) { - response.setResponse("Data updated successfully"); - } else { - response.setError(500, "Unable to modify data"); - } - logger.info("CS doctor data update Response:" + response); - } catch (Exception e) { - logger.error("Error while updating beneficiary data. " + e.getMessage()); - response.setError(5000, e.getMessage()); + JsonObject jsnOBJ = JsonParser.parseString(requestObj).getAsJsonObject(); + int result = cSServiceImpl.updateCancerScreeningDoctorData(jsnOBJ); + if (result > 0) { + response.setResponse("Data updated successfully"); + } else { + response.setError(500, "Unable to modify data"); + return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(response.toString()); } - return response.toString(); + logger.info("CS doctor data update Response:" + response); + return ResponseEntity.ok(response.toString()); } } diff --git a/src/main/java/com/iemr/hwc/controller/common/main/WorklistController.java b/src/main/java/com/iemr/hwc/controller/common/main/WorklistController.java index a99c3e17..090e97a4 100644 --- a/src/main/java/com/iemr/hwc/controller/common/main/WorklistController.java +++ b/src/main/java/com/iemr/hwc/controller/common/main/WorklistController.java @@ -29,13 +29,14 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.repository.query.Param; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestHeader; import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RestController; import com.iemr.hwc.data.benFlowStatus.BeneficiaryFlowStatus; @@ -74,353 +75,297 @@ public void setCommonNurseServiceImpl(CommonNurseServiceImpl commonNurseServiceI @Operation(summary = "Get doctor worklist") @GetMapping(value = { "/getDocWorklistNew/{providerServiceMapID}/{serviceID}/{vanID}" }) - public String getDocWorkListNew(@PathVariable("providerServiceMapID") Integer providerServiceMapID, + public ResponseEntity getDocWorkListNew(@PathVariable("providerServiceMapID") Integer providerServiceMapID, @PathVariable("serviceID") Integer serviceID, @PathVariable("vanID") Integer vanID) { OutputResponse response = new OutputResponse(); - try { - if (providerServiceMapID != null && serviceID != null) { - String s = commonDoctorServiceImpl.getDocWorkListNew(providerServiceMapID, serviceID, vanID); - if (s != null) - response.setResponse(s); - } else { - logger.error("Invalid request, either ProviderServiceMapID or ServiceID is invalid. PSMID = " - + providerServiceMapID + " SID = " + serviceID); - response.setError(5000, "Invalid request, either ProviderServiceMapID or ServiceID is invalid"); - } - } catch (Exception e) { - logger.error("Error in getDocWorkList:" + e); - response.setError(5000, "Error while getting doctor worklist"); + if (providerServiceMapID != null && serviceID != null) { + String s = commonDoctorServiceImpl.getDocWorkListNew(providerServiceMapID, serviceID, vanID); + if (s != null) + response.setResponse(s); + } else { + logger.error("Invalid request, either ProviderServiceMapID or ServiceID is invalid. PSMID = " + + providerServiceMapID + " SID = " + serviceID); + response.setError(5000, "Invalid request, either ProviderServiceMapID or ServiceID is invalid"); + return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(response.toString()); } - return response.toString(); + return ResponseEntity.ok(response.toString()); } // doc worklist new (TM future scheduled beneficiary) @Operation(summary = "Get doctor future worklist scheduled for telemedicine") @GetMapping(value = { "/getDocWorkListNewFutureScheduledForTM/{providerServiceMapID}/{serviceID}/{vanID}" }) - public String getDocWorkListNewFutureScheduledForTM( + public ResponseEntity getDocWorkListNewFutureScheduledForTM( @PathVariable("providerServiceMapID") Integer providerServiceMapID, @PathVariable("serviceID") Integer serviceID, @PathVariable("vanID") Integer vanID) { OutputResponse response = new OutputResponse(); - try { - if (providerServiceMapID != null && serviceID != null) { - String s = commonDoctorServiceImpl.getDocWorkListNewFutureScheduledForTM(providerServiceMapID, - serviceID, vanID); - if (s != null) - response.setResponse(s); - } else { - logger.error("Invalid request, either ProviderServiceMapID or ServiceID is invalid. PSMID = " - + providerServiceMapID + " SID = " + serviceID); - response.setError(5000, "Invalid request, either ProviderServiceMapID or ServiceID is invalid"); - } - - } catch (Exception e) { - logger.error("Error in getDocWorkListFutureScheduledbeneficiary:" + e); - response.setError(5000, "Error while getting doctor worklist for future scheduled beneficiay"); + if (providerServiceMapID != null && serviceID != null) { + String s = commonDoctorServiceImpl.getDocWorkListNewFutureScheduledForTM(providerServiceMapID, + serviceID, vanID); + if (s != null) + response.setResponse(s); + } else { + logger.error("Invalid request, either ProviderServiceMapID or ServiceID is invalid. PSMID = " + + providerServiceMapID + " SID = " + serviceID); + response.setError(5000, "Invalid request, either ProviderServiceMapID or ServiceID is invalid"); + return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(response.toString()); } - return response.toString(); + return ResponseEntity.ok(response.toString()); } // nurse worklist new @Operation(summary = "Get nurse worklist") @GetMapping(value = { "/getNurseWorklistNew/{providerServiceMapID}/{serviceID}/{vanID}" }) - public String getNurseWorkListNew(@PathVariable("providerServiceMapID") Integer providerServiceMapID, + public ResponseEntity getNurseWorkListNew( + @PathVariable("providerServiceMapID") Integer providerServiceMapID, @PathVariable("vanID") Integer vanID) { OutputResponse response = new OutputResponse(); - try { - String s = commonNurseServiceImpl.getNurseWorkListNew(providerServiceMapID, vanID); - if (s != null) - response.setResponse(s); - else - response.setError(5000, "Error while getting nurse worklist"); - } catch (Exception e) { - // e.printStackTrace(); - logger.error("Error in getNurseWorklist:" + e); + String s = commonNurseServiceImpl.getNurseWorkListNew(providerServiceMapID, vanID); + if (s != null) + response.setResponse(s); + else { response.setError(5000, "Error while getting nurse worklist"); + return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(response.toString()); } - return response.toString(); + return ResponseEntity.ok(response.toString()); } // nurse worklist TC schedule (current-date) new @Operation(summary = "Get worklist for teleconsultation for the current date") @GetMapping(value = { "/getNurseWorkListTcCurrentDate/{providerServiceMapID}/{serviceID}/{vanID}" }) - public String getNurseWorkListTcCurrentDateNew(@PathVariable("providerServiceMapID") Integer providerServiceMapID, + public ResponseEntity getNurseWorkListTcCurrentDateNew( + @PathVariable("providerServiceMapID") Integer providerServiceMapID, @PathVariable("vanID") Integer vanID) { OutputResponse response = new OutputResponse(); - try { - String s = commonNurseServiceImpl.getNurseWorkListTcCurrentDate(providerServiceMapID, vanID); - if (s != null) - response.setResponse(s); - else - response.setError(5000, "Error while getting nurse worklist"); - } catch (Exception e) { - logger.error("Error in getNurseWorklist:" + e); + String s = commonNurseServiceImpl.getNurseWorkListTcCurrentDate(providerServiceMapID, vanID); + if (s != null) + response.setResponse(s); + else { response.setError(5000, "Error while getting nurse worklist"); + return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(response.toString()); } - return response.toString(); + return ResponseEntity.ok(response.toString()); } // nurse worklist TC schedule (future-date) new @Operation(summary = "Get worklist for teleconsultation for the future date") @GetMapping(value = { "/getNurseWorkListTcFutureDate/{providerServiceMapID}/{serviceID}/{vanID}" }) - public String getNurseWorkListTcFutureDateNew(@PathVariable("providerServiceMapID") Integer providerServiceMapID, + public ResponseEntity getNurseWorkListTcFutureDateNew( + @PathVariable("providerServiceMapID") Integer providerServiceMapID, @PathVariable("vanID") Integer vanID) { OutputResponse response = new OutputResponse(); - try { - String s = commonNurseServiceImpl.getNurseWorkListTcFutureDate(providerServiceMapID, vanID); - if (s != null) - response.setResponse(s); - else - response.setError(5000, "Error while getting nurse worklist"); - } catch (Exception e) { - logger.error("Error in getNurseWorklist:" + e); + String s = commonNurseServiceImpl.getNurseWorkListTcFutureDate(providerServiceMapID, vanID); + if (s != null) + response.setResponse(s); + else { response.setError(5000, "Error while getting nurse worklist"); + return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(response.toString()); } - return response.toString(); + return ResponseEntity.ok(response.toString()); } @Operation(summary = "Get previous significant findings") @PostMapping(value = { "/getDoctorPreviousSignificantFindings" }) - public String getDoctorPreviousSignificantFindings( - @Param(value = "{\"beneficiaryRegID\": \"Long\"}") @RequestBody String comingRequest) { + public ResponseEntity getDoctorPreviousSignificantFindings( + @Param(value = "{\"beneficiaryRegID\": \"Long\"}") @RequestBody String comingRequest) throws Exception { OutputResponse response = new OutputResponse(); - try { - JSONObject obj = new JSONObject(comingRequest); - if (obj != null && obj.has("beneficiaryRegID") && obj.get("beneficiaryRegID") != null) { - Long beneficiaryRegID = obj.getLong("beneficiaryRegID"); - String s = commonDoctorServiceImpl.fetchBenPreviousSignificantFindings(beneficiaryRegID); - if (s != null) - response.setResponse(s); - else - response.setError(5000, "Error while getting previous significant findings"); - } else { - response.setError(5000, "Invalid data!"); + JSONObject obj = new JSONObject(comingRequest); + if (obj != null && obj.has("beneficiaryRegID") && !obj.isNull("beneficiaryRegID")) { + Long beneficiaryRegID = obj.getLong("beneficiaryRegID"); + String s = commonDoctorServiceImpl.fetchBenPreviousSignificantFindings(beneficiaryRegID); + if (s != null) + response.setResponse(s); + else { + response.setError(5000, "Error while getting previous significant findings"); + return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(response.toString()); } - } catch (Exception e) { - logger.error("Error while fetching previous significant findings" + e); - response.setError(5000, "Error while getting previous significant findings"); + } else { + response.setError(5000, "Invalid data!"); + return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(response.toString()); } - return response.toString(); + return ResponseEntity.ok(response.toString()); } // Get Lab technician worklist new @Operation(summary = "Get lab technician worklist") @GetMapping(value = { "/getLabWorklistNew/{providerServiceMapID}/{serviceID}/{vanID}" }) - public String getLabWorkListNew(@PathVariable("providerServiceMapID") Integer providerServiceMapID, + public ResponseEntity getLabWorkListNew(@PathVariable("providerServiceMapID") Integer providerServiceMapID, @PathVariable("vanID") Integer vanID) { OutputResponse response = new OutputResponse(); - try { - String s = commonNurseServiceImpl.getLabWorkListNew(providerServiceMapID, vanID); - if (s != null) - response.setResponse(s); - else - response.setError(5000, "Error while getting lab technician worklist"); - } catch (Exception e) { - logger.error("Error in getLabWorklist:" + e); + String s = commonNurseServiceImpl.getLabWorkListNew(providerServiceMapID, vanID); + if (s != null) + response.setResponse(s); + else { response.setError(5000, "Error while getting lab technician worklist"); + return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(response.toString()); } - return response.toString(); + return ResponseEntity.ok(response.toString()); } // Get radiologist worklist new @Operation(summary = "Get radiologist worklist") @PostMapping(value = { "/getRadiologist-worklist-New/{providerServiceMapID}/{serviceID}/{vanID}" }) - public String getRadiologistWorklistNew(@PathVariable("providerServiceMapID") Integer providerServiceMapID, + public ResponseEntity getRadiologistWorklistNew( + @PathVariable("providerServiceMapID") Integer providerServiceMapID, @PathVariable("vanID") Integer vanID) { OutputResponse response = new OutputResponse(); - try { - String s = commonNurseServiceImpl.getRadiologistWorkListNew(providerServiceMapID, vanID); - if (s != null) - response.setResponse(s); - else - response.setError(5000, "Error while getting radiologist worklist"); - } catch (Exception e) { - logger.error("Error in getLabWorklist:" + e); + String s = commonNurseServiceImpl.getRadiologistWorkListNew(providerServiceMapID, vanID); + if (s != null) + response.setResponse(s); + else { response.setError(5000, "Error while getting radiologist worklist"); + return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(response.toString()); } - return response.toString(); + return ResponseEntity.ok(response.toString()); } // Get oncologist worklist new @Operation(summary = "Get oncologist worklist") @PostMapping(value = { "/getOncologist-worklist-New/{providerServiceMapID}/{serviceID}/{vanID}" }) - public String getOncologistWorklistNew(@PathVariable("providerServiceMapID") Integer providerServiceMapID, + public ResponseEntity getOncologistWorklistNew( + @PathVariable("providerServiceMapID") Integer providerServiceMapID, @PathVariable("vanID") Integer vanID) { OutputResponse response = new OutputResponse(); - try { - String s = commonNurseServiceImpl.getOncologistWorkListNew(providerServiceMapID, vanID); - if (s != null) - response.setResponse(s); - else - response.setError(5000, "Error while getting oncologist worklist"); - } catch (Exception e) { - logger.error("Error in getLabWorklist:" + e); + String s = commonNurseServiceImpl.getOncologistWorkListNew(providerServiceMapID, vanID); + if (s != null) + response.setResponse(s); + else { response.setError(5000, "Error while getting oncologist worklist"); + return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(response.toString()); } - return response.toString(); + return ResponseEntity.ok(response.toString()); } // Get pharma worklist new @Operation(summary = "Get pharmacist worklist") @GetMapping(value = { "/getPharma-worklist-New/{providerServiceMapID}/{serviceID}/{vanID}" }) - public String getPharmaWorklistNew(@PathVariable("providerServiceMapID") Integer providerServiceMapID, + public ResponseEntity getPharmaWorklistNew( + @PathVariable("providerServiceMapID") Integer providerServiceMapID, @PathVariable("vanID") Integer vanID) { OutputResponse response = new OutputResponse(); - try { - String s = commonNurseServiceImpl.getPharmaWorkListNew(providerServiceMapID, vanID); - if (s != null) - response.setResponse(s); - else - response.setError(5000, "Error while getting pharma worklist"); - } catch (Exception e) { - logger.error("Error in getLabWorklist:" + e); + String s = commonNurseServiceImpl.getPharmaWorkListNew(providerServiceMapID, vanID); + if (s != null) + response.setResponse(s); + else { response.setError(5000, "Error while getting pharma worklist"); + return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(response.toString()); } - return response.toString(); + return ResponseEntity.ok(response.toString()); } @Operation(summary = "Print case sheet of beneficiary.") @PostMapping(value = { "/get/Case-sheet/printData" }) - public String getCasesheetPrintData(@RequestBody String comingReq, - @RequestHeader(value = "Authorization") String Authorization) { + public ResponseEntity getCasesheetPrintData(@RequestBody String comingReq, + @RequestHeader(value = "Authorization") String Authorization) throws Exception { OutputResponse response = new OutputResponse(); - try { - if (comingReq != null) { - BeneficiaryFlowStatus obj = InputMapper.gson().fromJson(comingReq, BeneficiaryFlowStatus.class); - String casesheetData = commonServiceImpl.getCaseSheetPrintDataForBeneficiary(obj, Authorization); - response.setResponse(casesheetData); - } else - response.setError(5000, "Invalid request"); - } catch (Exception e) { - logger.error("" + e); + if (comingReq != null) { + BeneficiaryFlowStatus obj = InputMapper.gson().fromJson(comingReq, BeneficiaryFlowStatus.class); + String casesheetData = commonServiceImpl.getCaseSheetPrintDataForBeneficiary(obj, Authorization); + response.setResponse(casesheetData); + } else { + response.setError(5000, "Invalid request"); + return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(response.toString()); } - return response.toString(); + return ResponseEntity.ok(response.toString()); } // Start of Fetch Previous Medical History... @Operation(summary = "Get beneficiary history") @PostMapping(value = { "/getBenPastHistory" }) - public String getBenPastHistory(@Param(value = "{\"benRegID\":\"Long\"}") @RequestBody String comingRequest) { + public ResponseEntity getBenPastHistory( + @Param(value = "{\"benRegID\":\"Long\"}") @RequestBody String comingRequest) throws Exception { OutputResponse response = new OutputResponse(); - logger.info("getBenPastHistory request:" + comingRequest); - try { - JSONObject obj = new JSONObject(comingRequest); - if (obj.has("benRegID")) { - Long benRegID = obj.getLong("benRegID"); - String s = commonServiceImpl.getBenPastHistoryData(benRegID); - response.setResponse(s); - - } else { - logger.info("Invalid Request Data."); - response.setError(5000, "Invalid request"); - } - logger.info("getBenPastHistory response:" + response); - } catch (Exception e) { - response.setError(5000, "Error while getting illness and surgery history"); - logger.error("Error in getBenPastHistory:" + e); + JSONObject obj = new JSONObject(comingRequest); + if (obj.has("benRegID") && !obj.isNull("benRegID")) { + Long benRegID = obj.getLong("benRegID"); + String s = commonServiceImpl.getBenPastHistoryData(benRegID); + response.setResponse(s); + } else { + logger.info("Invalid Request Data."); + response.setError(5000, "Invalid request"); + return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(response.toString()); } - return response.toString(); + logger.info("getBenPastHistory response:" + response); + return ResponseEntity.ok(response.toString()); } @Operation(summary = "Get beneficiary tobacco consumption history") @PostMapping(value = { "/getBenTobaccoHistory" }) - public String getBenTobaccoHistory(@Param(value = "{\"benRegID\":\"Long\"}") @RequestBody String comingRequest) { + public ResponseEntity getBenTobaccoHistory( + @Param(value = "{\"benRegID\":\"Long\"}") @RequestBody String comingRequest) throws Exception { OutputResponse response = new OutputResponse(); - logger.info("getBenTobaccoHistory request:" + comingRequest); - try { - JSONObject obj = new JSONObject(comingRequest); - if (obj.has("benRegID")) { - Long benRegID = obj.getLong("benRegID"); - String s = commonServiceImpl.getPersonalTobaccoHistoryData(benRegID); - response.setResponse(s); - } else { - logger.info("Invalid Request Data."); - response.setError(5000, "Invalid request"); - } - logger.info("getBenTobaccoHistory response:" + response); - } catch (Exception e) { - response.setError(5000, "Error while getting tobacco history"); - logger.error("Error in getBenTobaccoHistory:" + e); + JSONObject obj = new JSONObject(comingRequest); + if (obj.has("benRegID") && !obj.isNull("benRegID")) { + Long benRegID = obj.getLong("benRegID"); + String s = commonServiceImpl.getPersonalTobaccoHistoryData(benRegID); + response.setResponse(s); + } else { + logger.info("Invalid Request Data."); + response.setError(5000, "Invalid request"); + return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(response.toString()); } - return response.toString(); + logger.info("getBenTobaccoHistory response:" + response); + return ResponseEntity.ok(response.toString()); } @Operation(summary = "Get beneficiary alcohol consumption history") @PostMapping(value = { "/getBenAlcoholHistory" }) - public String getBenAlcoholHistory(@Param(value = "{\"benRegID\":\"Long\"}") @RequestBody String comingRequest) { + public ResponseEntity getBenAlcoholHistory( + @Param(value = "{\"benRegID\":\"Long\"}") @RequestBody String comingRequest) throws Exception { OutputResponse response = new OutputResponse(); - logger.info("getBenAlcoholHistory request:" + comingRequest); - try { - JSONObject obj = new JSONObject(comingRequest); - if (obj.has("benRegID")) { - Long benRegID = obj.getLong("benRegID"); - String s = commonServiceImpl.getPersonalAlcoholHistoryData(benRegID); - response.setResponse(s); - } else { - logger.info("Invalid Request Data."); - response.setError(5000, "Invalid request"); - } - logger.info("getBenAlcoholHistory response:" + response); - } catch (Exception e) { - response.setError(5000, "Error while getting alcohol history"); - logger.error("Error in getBenAlcoholHistory:" + e); + JSONObject obj = new JSONObject(comingRequest); + if (obj.has("benRegID") && !obj.isNull("benRegID")) { + Long benRegID = obj.getLong("benRegID"); + String s = commonServiceImpl.getPersonalAlcoholHistoryData(benRegID); + response.setResponse(s); + } else { + logger.info("Invalid Request Data."); + response.setError(5000, "Invalid request"); + return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(response.toString()); } - return response.toString(); + logger.info("getBenAlcoholHistory response:" + response); + return ResponseEntity.ok(response.toString()); } @Operation(summary = "Get beneficiary allergy history") @PostMapping(value = { "/getBenAllergyHistory" }) - public String getBenANCAllergyHistory(@Param(value = "{\"benRegID\":\"Long\"}") @RequestBody String comingRequest) { + public ResponseEntity getBenANCAllergyHistory( + @Param(value = "{\"benRegID\":\"Long\"}") @RequestBody String comingRequest) throws Exception { OutputResponse response = new OutputResponse(); - logger.info("getBenAllergyHistory request:" + comingRequest); - try { - JSONObject obj = new JSONObject(comingRequest); - if (obj.has("benRegID")) { - Long benRegID = obj.getLong("benRegID"); - String s = commonServiceImpl.getPersonalAllergyHistoryData(benRegID); - response.setResponse(s); - - } else { - logger.info("Invalid Request Data."); - response.setError(5000, "Invalid request"); - } - logger.info("getBenAllergyHistory response:" + response); - } catch (Exception e) { - response.setError(5000, "Error while getting allergy history"); - logger.error("Error in getBenAllergyHistory:" + e); + JSONObject obj = new JSONObject(comingRequest); + if (obj.has("benRegID") && !obj.isNull("benRegID")) { + Long benRegID = obj.getLong("benRegID"); + String s = commonServiceImpl.getPersonalAllergyHistoryData(benRegID); + response.setResponse(s); + } else { + logger.info("Invalid Request Data."); + response.setError(5000, "Invalid request"); + return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(response.toString()); } - return response.toString(); + logger.info("getBenAllergyHistory response:" + response); + return ResponseEntity.ok(response.toString()); } @Operation(summary = "Get beneficiary referral details by created by") @PostMapping(value = { "/getBenReferDetailsByCreatedBy" }, headers = "Authorization") - public String getBenReferDetailsByCreatedBy( + public ResponseEntity getBenReferDetailsByCreatedBy( @Param(value = "{\"createdBy\":\"String\"}") @RequestBody String comingRequest, - @RequestHeader(value = "Authorization") String Authorization) { + @RequestHeader(value = "Authorization") String Authorization) throws Exception { OutputResponse response = new OutputResponse(); - logger.info("getBenReferDetailsByCreatedBy request:" + comingRequest); - System.out.println("getBenReferDetailsByCreatedBy request:" + comingRequest); - try { - JSONObject obj = new JSONObject(comingRequest); - if (obj.has("createdBy")) { - String createdBy = obj.getString("createdBy"); - System.out.println("createdBy:" + createdBy); - String s = commonDoctorServiceImpl.getBenReferDetailsByCreatedBy(createdBy); - response.setResponse(s); - } else { - logger.info("Invalid Request Data."); - response.setError(5000, "Invalid request - createdBy is required"); - } - logger.info("getBenReferDetailsByCreatedBy response:" + response); - } catch (Exception e) { - response.setError(5000, "Error while getting referral details by createdBy"); - logger.error("Error in getBenReferDetailsByCreatedBy:" + e); + JSONObject obj = new JSONObject(comingRequest); + if (obj.has("createdBy") && !obj.isNull("createdBy")) { + String createdBy = obj.getString("createdBy"); + String s = commonDoctorServiceImpl.getBenReferDetailsByCreatedBy(createdBy); + response.setResponse(s); + } else { + response.setError(5000, "Invalid request"); + return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(response.toString()); } - return response.toString(); + return ResponseEntity.ok(response.toString()); } @Operation(summary = "Get beneficiary medication history") @@ -449,223 +394,182 @@ public String getBenMedicationHistory(@Param(value = "{\"benRegID\":\"Long\"}") @Operation(summary = "Get beneficiary family history") @PostMapping(value = { "/getBenFamilyHistory" }) - public String getBenFamilyHistory(@Param(value = "{\"benRegID\":\"Long\"}") @RequestBody String comingRequest) { + public ResponseEntity getBenFamilyHistory( + @Param(value = "{\"benRegID\":\"Long\"}") @RequestBody String comingRequest) throws Exception { OutputResponse response = new OutputResponse(); - logger.info("getBenFamilyHistory request:" + comingRequest); - try { - JSONObject obj = new JSONObject(comingRequest); - if (obj.has("benRegID")) { - Long benRegID = obj.getLong("benRegID"); - String s = commonServiceImpl.getFamilyHistoryData(benRegID); - response.setResponse(s); - } else { - logger.info("Invalid Request Data."); - response.setError(5000, "Invalid request"); - } - logger.info("getBenFamilyHistory response:" + response); - } catch (Exception e) { - response.setError(5000, "Error while getting family history"); - logger.error("Error in getBenFamilyHistory:" + e); + JSONObject obj = new JSONObject(comingRequest); + if (obj.has("benRegID") && !obj.isNull("benRegID")) { + Long benRegID = obj.getLong("benRegID"); + String s = commonServiceImpl.getFamilyHistoryData(benRegID); + response.setResponse(s); + } else { + logger.info("Invalid Request Data."); + response.setError(5000, "Invalid request"); + return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(response.toString()); } - return response.toString(); + logger.info("getBenFamilyHistory response:" + response); + return ResponseEntity.ok(response.toString()); } @Operation(summary = "Get beneficiary menstrual history") @PostMapping(value = { "/getBenMenstrualHistory" }) - public String getBenMenstrualHistory(@Param(value = "{\"benRegID\":\"Long\"}") @RequestBody String comingRequest) { + public ResponseEntity getBenMenstrualHistory( + @Param(value = "{\"benRegID\":\"Long\"}") @RequestBody String comingRequest) throws Exception { OutputResponse response = new OutputResponse(); - logger.info("getBenMenstrualHistory request:" + comingRequest); - try { - JSONObject obj = new JSONObject(comingRequest); - if (obj.has("benRegID")) { - Long benRegID = obj.getLong("benRegID"); - String s = commonServiceImpl.getMenstrualHistoryData(benRegID); - response.setResponse(s); - } else { - logger.info("Invalid Request Data."); - response.setError(5000, "Invalid request"); - } - logger.info("getBenMenstrualHistory response:" + response); - } catch (Exception e) { - response.setError(5000, "Error while getting menstrual history"); - logger.error("Error in getBenMenstrualHistory:" + e); + JSONObject obj = new JSONObject(comingRequest); + if (obj.has("benRegID") && !obj.isNull("benRegID")) { + Long benRegID = obj.getLong("benRegID"); + String s = commonServiceImpl.getMenstrualHistoryData(benRegID); + response.setResponse(s); + } else { + logger.info("Invalid Request Data."); + response.setError(5000, "Invalid request"); + return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(response.toString()); } - return response.toString(); + logger.info("getBenMenstrualHistory response:" + response); + return ResponseEntity.ok(response.toString()); } @Operation(summary = "Get beneficiary obstetrics history") @PostMapping(value = { "/getBenPastObstetricHistory" }) - public String getBenPastObstetricHistory( - @Param(value = "{\"benRegID\":\"Long\"}") @RequestBody String comingRequest) { + public ResponseEntity getBenPastObstetricHistory( + @Param(value = "{\"benRegID\":\"Long\"}") @RequestBody String comingRequest) throws Exception { OutputResponse response = new OutputResponse(); - logger.info("getBenPastObstetricHistory request:" + comingRequest); - try { - JSONObject obj = new JSONObject(comingRequest); - if (obj.has("benRegID")) { - Long benRegID = obj.getLong("benRegID"); - String s = commonServiceImpl.getObstetricHistoryData(benRegID); - response.setResponse(s); - } else { - logger.info("Invalid Request Data."); - response.setError(5000, "Invalid request"); - } - logger.info("getBenPastObstetricHistory response:" + response); - } catch (Exception e) { - response.setError(5000, "Error while getting obstetric history"); - logger.error("Error in getBenPastObstetricHistory:" + e); + JSONObject obj = new JSONObject(comingRequest); + if (obj.has("benRegID") && !obj.isNull("benRegID")) { + Long benRegID = obj.getLong("benRegID"); + String s = commonServiceImpl.getObstetricHistoryData(benRegID); + response.setResponse(s); + } else { + logger.info("Invalid Request Data."); + response.setError(5000, "Invalid request"); + return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(response.toString()); } - return response.toString(); + logger.info("getBenPastObstetricHistory response:" + response); + return ResponseEntity.ok(response.toString()); } @Operation(summary = "Get beneficiary comorbidity condition details") @PostMapping(value = { "/getBenComorbidityConditionHistory" }) - public String getBenANCComorbidityConditionHistory( - @Param(value = "{\"benRegID\":\"Long\"}") @RequestBody String comingRequest) { + public ResponseEntity getBenANCComorbidityConditionHistory( + @Param(value = "{\"benRegID\":\"Long\"}") @RequestBody String comingRequest) throws Exception { OutputResponse response = new OutputResponse(); - logger.info("getBenComorbidityConditionHistory request:" + comingRequest); - try { - JSONObject obj = new JSONObject(comingRequest); - if (obj.has("benRegID")) { - Long benRegID = obj.getLong("benRegID"); - String s = commonServiceImpl.getComorbidHistoryData(benRegID); - response.setResponse(s); - } else { - logger.info("Invalid Request Data."); - response.setError(5000, "Invalid request"); - } - logger.info("getBenComorbidityConditionHistory response:" + response); - } catch (Exception e) { - response.setError(5000, "Error while getting comodbidity history"); - logger.error("Error in getBenComorbidityConditionHistory:" + e); + JSONObject obj = new JSONObject(comingRequest); + if (obj.has("benRegID") && !obj.isNull("benRegID")) { + Long benRegID = obj.getLong("benRegID"); + String s = commonServiceImpl.getComorbidHistoryData(benRegID); + response.setResponse(s); + } else { + logger.info("Invalid Request Data."); + response.setError(5000, "Invalid request"); + return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(response.toString()); } - return response.toString(); + logger.info("getBenComorbidityConditionHistory response:" + response); + return ResponseEntity.ok(response.toString()); } @Operation(summary = "Get beneficiary optional vaccine details") @PostMapping(value = { "/getBenOptionalVaccineHistory" }) - public String getBenOptionalVaccineHistory( - @Param(value = "{\"benRegID\":\"Long\"}") @RequestBody String comingRequest) { + public ResponseEntity getBenOptionalVaccineHistory( + @Param(value = "{\"benRegID\":\"Long\"}") @RequestBody String comingRequest) throws Exception { OutputResponse response = new OutputResponse(); - logger.info("getBenOptionalVaccineHistory request:" + comingRequest); - try { - JSONObject obj = new JSONObject(comingRequest); - if (obj.has("benRegID")) { - Long benRegID = obj.getLong("benRegID"); - String s = commonServiceImpl.getChildVaccineHistoryData(benRegID); - response.setResponse(s); - } else { - logger.info("Invalid Request Data."); - response.setError(5000, "Invalid request"); - } - logger.info("getBenOptionalVaccineHistory response:" + response); - } catch (Exception e) { - response.setError(5000, "Error while getting optional vaccination history"); - logger.error("Error in getBenOptionalVaccineHistory:" + e); + JSONObject obj = new JSONObject(comingRequest); + if (obj.has("benRegID") && !obj.isNull("benRegID")) { + Long benRegID = obj.getLong("benRegID"); + String s = commonServiceImpl.getChildVaccineHistoryData(benRegID); + response.setResponse(s); + } else { + logger.info("Invalid Request Data."); + response.setError(5000, "Invalid request"); + return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(response.toString()); } - return response.toString(); + logger.info("getBenOptionalVaccineHistory response:" + response); + return ResponseEntity.ok(response.toString()); } @Operation(summary = "Get child beneficiary vaccine details") @PostMapping(value = { "/getBenChildVaccineHistory" }) - public String getBenImmunizationHistory( - @Param(value = "{\"benRegID\":\"Long\"}") @RequestBody String comingRequest) { + public ResponseEntity getBenImmunizationHistory( + @Param(value = "{\"benRegID\":\"Long\"}") @RequestBody String comingRequest) throws Exception { OutputResponse response = new OutputResponse(); - logger.info("getBenImmunizationHistory request:" + comingRequest); - try { - JSONObject obj = new JSONObject(comingRequest); - if (obj.has("benRegID")) { - Long benRegID = obj.getLong("benRegID"); - String s = commonServiceImpl.getImmunizationHistoryData(benRegID); - response.setResponse(s); - } else { - logger.info("Invalid Request Data."); - response.setError(5000, "Invalid request"); - } - logger.info("getBenImmunizationHistory response:" + response); - } catch (Exception e) { - response.setError(5000, "Error while getting child vaccine(immunization) history"); - logger.error("Error in getBenImmunizationHistory:" + e); + JSONObject obj = new JSONObject(comingRequest); + if (obj.has("benRegID") && !obj.isNull("benRegID")) { + Long benRegID = obj.getLong("benRegID"); + String s = commonServiceImpl.getImmunizationHistoryData(benRegID); + response.setResponse(s); + } else { + logger.info("Invalid Request Data."); + response.setError(5000, "Invalid request"); + return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(response.toString()); } - return response.toString(); + logger.info("getBenImmunizationHistory response:" + response); + return ResponseEntity.ok(response.toString()); } @Operation(summary = "Get beneficiary perinatal history") @PostMapping(value = { "/getBenPerinatalHistory" }) - public String getBenPerinatalHistory(@Param(value = "{\"benRegID\":\"Long\"}") @RequestBody String comingRequest) { + public ResponseEntity getBenPerinatalHistory( + @Param(value = "{\"benRegID\":\"Long\"}") @RequestBody String comingRequest) throws Exception { OutputResponse response = new OutputResponse(); - logger.info("getBenPerinatalHistory request:" + comingRequest); - try { - JSONObject obj = new JSONObject(comingRequest); - if (obj.has("benRegID")) { - Long benRegID = obj.getLong("benRegID"); - String s = commonServiceImpl.getBenPerinatalHistoryData(benRegID); - response.setResponse(s); - } else { - logger.info("Invalid Request Data."); - response.setError(5000, "Invalid request"); - } - logger.info("getBenPerinatalHistory response:" + response); - } catch (Exception e) { - response.setError(5000, "Error while getting perinatal history"); - logger.error("Error in getBenPerinatalHistory:" + e); + JSONObject obj = new JSONObject(comingRequest); + if (obj.has("benRegID") && !obj.isNull("benRegID")) { + Long benRegID = obj.getLong("benRegID"); + String s = commonServiceImpl.getBenPerinatalHistoryData(benRegID); + response.setResponse(s); + } else { + logger.info("Invalid Request Data."); + response.setError(5000, "Invalid request"); + return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(response.toString()); } - return response.toString(); + logger.info("getBenPerinatalHistory response:" + response); + return ResponseEntity.ok(response.toString()); } @Operation(summary = "Get child beneficiary feeding history") @PostMapping(value = { "/getBenFeedingHistory" }) - public String getBenFeedingHistory(@Param(value = "{\"benRegID\":\"Long\"}") @RequestBody String comingRequest) { + public ResponseEntity getBenFeedingHistory( + @Param(value = "{\"benRegID\":\"Long\"}") @RequestBody String comingRequest) throws Exception { OutputResponse response = new OutputResponse(); - logger.info("getBenFeedingHistory request:" + comingRequest); - try { - JSONObject obj = new JSONObject(comingRequest); - if (obj.has("benRegID")) { - Long benRegID = obj.getLong("benRegID"); - String s = commonServiceImpl.getBenFeedingHistoryData(benRegID); - response.setResponse(s); - } else { - logger.info("Invalid Request Data."); - response.setError(5000, "Invalid request"); - } - logger.info("getBenFeedingHistory response:" + response); - } catch (Exception e) { - response.setError(5000, "Error while getting child feeding history"); - logger.error("Error in getBenFeedingHistory:" + e); + JSONObject obj = new JSONObject(comingRequest); + if (obj.has("benRegID") && !obj.isNull("benRegID")) { + Long benRegID = obj.getLong("benRegID"); + String s = commonServiceImpl.getBenFeedingHistoryData(benRegID); + response.setResponse(s); + } else { + logger.info("Invalid Request Data."); + response.setError(5000, "Invalid request"); + return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(response.toString()); } - return response.toString(); + logger.info("getBenFeedingHistory response:" + response); + return ResponseEntity.ok(response.toString()); } @Operation(summary = "Get child beneficiary development history") @PostMapping(value = { "/getBenDevelopmentHistory" }) - public String getBenDevelopmentHistory( - @Param(value = "{\"benRegID\":\"Long\"}") @RequestBody String comingRequest) { + public ResponseEntity getBenDevelopmentHistory( + @Param(value = "{\"benRegID\":\"Long\"}") @RequestBody String comingRequest) throws Exception { OutputResponse response = new OutputResponse(); - logger.info("getBenDevelopmentHistory request:" + comingRequest); - try { - JSONObject obj = new JSONObject(comingRequest); - if (obj.has("benRegID")) { - Long benRegID = obj.getLong("benRegID"); - String s = commonServiceImpl.getBenDevelopmentHistoryData(benRegID); - response.setResponse(s); - } else { - logger.info("Invalid Request Data."); - response.setError(5000, "Invalid request"); - } - logger.info("getBenDevelopmentHistory response:" + response); - } catch (Exception e) { - response.setError(5000, "Error while getting child development history"); - logger.error("Error in getBenDevelopmentHistory:" + e); + JSONObject obj = new JSONObject(comingRequest); + if (obj.has("benRegID") && !obj.isNull("benRegID")) { + Long benRegID = obj.getLong("benRegID"); + String s = commonServiceImpl.getBenDevelopmentHistoryData(benRegID); + response.setResponse(s); + } else { + logger.info("Invalid Request Data."); + response.setError(5000, "Invalid request"); + return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(response.toString()); } - return response.toString(); + logger.info("getBenDevelopmentHistory response:" + response); + return ResponseEntity.ok(response.toString()); } // End of Fetch Previous History... @@ -676,241 +580,199 @@ public String getBenDevelopmentHistory( */ @Operation(summary = "Get beneficiary casesheet history") @PostMapping(value = { "/getBeneficiaryCaseSheetHistory" }) - public String getBeneficiaryCaseSheetHistory( - @Param(value = "{\"benRegID\":\"Long\"}") @RequestBody String comingRequest) { + public ResponseEntity getBeneficiaryCaseSheetHistory( + @Param(value = "{\"benRegID\":\"Long\"}") @RequestBody String comingRequest) throws Exception { OutputResponse response = new OutputResponse(); logger.info("Request object for fetching beneficiary previous visit history :" + comingRequest); - try { - String responseData = commonServiceImpl.getBenPreviousVisitDataForCaseRecord(comingRequest); - if (responseData != null) - response.setResponse(responseData); - else - response.setError(5000, "Error while fetching beneficiary previous visit history details"); - } catch (Exception e) { + String responseData = commonServiceImpl.getBenPreviousVisitDataForCaseRecord(comingRequest); + if (responseData != null) + response.setResponse(responseData); + else { response.setError(5000, "Error while fetching beneficiary previous visit history details"); - logger.error("Error while fetching beneficiary previous visit history :" + e); + return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(response.toString()); } - return response.toString(); + return ResponseEntity.ok(response.toString()); } // TC specialist worklist new @Operation(summary = "Get teleconsultation specialist worklist") @GetMapping(value = { "/getTCSpecialistWorklist/{providerServiceMapID}/{serviceID}/{userID}" }) - public String getTCSpecialistWorkListNew(@PathVariable("providerServiceMapID") Integer providerServiceMapID, + public ResponseEntity getTCSpecialistWorkListNew( + @PathVariable("providerServiceMapID") Integer providerServiceMapID, @PathVariable("userID") Integer userID, @PathVariable("serviceID") Integer serviceID) { OutputResponse response = new OutputResponse(); - try { - if (providerServiceMapID != null && userID != null) { - String s = commonDoctorServiceImpl.getTCSpecialistWorkListNewForTM(providerServiceMapID, userID, - serviceID); - if (s != null) - response.setResponse(s); - } else { - logger.error("Invalid request, either ProviderServiceMapID or userID is invalid. PSMID = " - + providerServiceMapID + " SID = " + userID); - response.setError(5000, "Invalid request, either ProviderServiceMapID or userID is invalid"); - } - } catch (Exception e) { - logger.error("Error in getTC_SpecialistWorkList:" + e); - response.setError(5000, "Error while getting TC specialist worklist"); + if (providerServiceMapID != null && userID != null) { + String s = commonDoctorServiceImpl.getTCSpecialistWorkListNewForTM(providerServiceMapID, userID, + serviceID); + if (s != null) + response.setResponse(s); + } else { + logger.error("Invalid request, either ProviderServiceMapID or userID is invalid. PSMID = " + + providerServiceMapID + " SID = " + userID); + response.setError(5000, "Invalid request, either ProviderServiceMapID or userID is invalid"); + return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(response.toString()); } - return response.toString(); + return ResponseEntity.ok(response.toString()); } // TC specialist worklist new, patient App, 14-08-2020 @Operation(summary = "Get teleconsultation specialist worklist for patient app") @GetMapping(value = { "/getTCSpecialistWorklistPatientApp/{providerServiceMapID}/{serviceID}/{userID}/{vanID}" }) - public String getTCSpecialistWorkListNewPatientApp( + public ResponseEntity getTCSpecialistWorkListNewPatientApp( @PathVariable("providerServiceMapID") Integer providerServiceMapID, @PathVariable("userID") Integer userID, @PathVariable("serviceID") Integer serviceID, @PathVariable("vanID") Integer vanID) { OutputResponse response = new OutputResponse(); - try { - if (providerServiceMapID != null && userID != null) { - String s = commonDoctorServiceImpl.getTCSpecialistWorkListNewForTMPatientApp(providerServiceMapID, - userID, serviceID, vanID); - if (s != null) - response.setResponse(s); - } else { - logger.error("Invalid request, either ProviderServiceMapID or userID is invalid. PSMID = " - + providerServiceMapID + " SID = " + userID); - response.setError(5000, "Invalid request, either ProviderServiceMapID or userID is invalid"); - } - } catch (Exception e) { - logger.error("Error in getTC_SpecialistWorkList:" + e); - response.setError(5000, "Error while getting TC specialist worklist"); + if (providerServiceMapID != null && userID != null) { + String s = commonDoctorServiceImpl.getTCSpecialistWorkListNewForTMPatientApp(providerServiceMapID, + userID, serviceID, vanID); + if (s != null) + response.setResponse(s); + } else { + logger.error("Invalid request, either ProviderServiceMapID or userID is invalid. PSMID = " + + providerServiceMapID + " SID = " + userID); + response.setError(5000, "Invalid request, either ProviderServiceMapID or userID is invalid"); + return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(response.toString()); } - return response.toString(); + return ResponseEntity.ok(response.toString()); } // TC specialist worklist new future scheduled @Operation(summary = "Get teleconsultation specialist future scheduled") @GetMapping(value = { "/getTCSpecialistWorklistFutureScheduled/{providerServiceMapID}/{serviceID}/{userID}" }) - public String getTCSpecialistWorklistFutureScheduled( + public ResponseEntity getTCSpecialistWorklistFutureScheduled( @PathVariable("providerServiceMapID") Integer providerServiceMapID, @PathVariable("userID") Integer userID, @PathVariable("serviceID") Integer serviceID) { OutputResponse response = new OutputResponse(); - try { - if (providerServiceMapID != null && userID != null) { - String s = commonDoctorServiceImpl.getTCSpecialistWorkListNewFutureScheduledForTM(providerServiceMapID, - userID, serviceID); - if (s != null) - response.setResponse(s); - } else { - logger.error("Invalid request, either ProviderServiceMapID or userID is invalid. PSMID = " - + providerServiceMapID + " UserID = " + userID); - response.setError(5000, "Invalid request, either ProviderServiceMapID or userID is invalid"); - } - - } catch (Exception e) { - logger.error("Error in getTC_SpecialistWorkList future scheduled:" + e); - response.setError(5000, "Error while getting TC specialist future scheduled worklist"); + if (providerServiceMapID != null && userID != null) { + String s = commonDoctorServiceImpl.getTCSpecialistWorkListNewFutureScheduledForTM(providerServiceMapID, + userID, serviceID); + if (s != null) + response.setResponse(s); + } else { + logger.error("Invalid request, either ProviderServiceMapID or userID is invalid. PSMID = " + + providerServiceMapID + " UserID = " + userID); + response.setError(5000, "Invalid request, either ProviderServiceMapID or userID is invalid"); + return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(response.toString()); } - return response.toString(); + return ResponseEntity.ok(response.toString()); } // openkm file download @Operation(summary = "Add file as string to openKM.") @PostMapping(value = "/getKMFile", produces = MediaType.APPLICATION_JSON, consumes = MediaType.APPLICATION_JSON, headers = "Authorization") - public String getKMFile(@Param(value = "{}") @RequestBody String request, - @RequestHeader(value = "Authorization") String Authorization) { + public ResponseEntity getKMFile(@Param(value = "{}") @RequestBody String request, + @RequestHeader(value = "Authorization") String Authorization) throws Exception { OutputResponse response = new OutputResponse(); logger.info("add file request is " + request); - try { - String s = commonServiceImpl.getOpenKMDocURL(request, Authorization); - if (s != null) - response.setResponse(s); - else { - logger.error("file not available for request : " + request); - response.setError(5000, "file not available, please contact administrator"); - } - } catch (Exception e) { - logger.error("Error while getting file download url : " + e); + String s = commonServiceImpl.getOpenKMDocURL(request, Authorization); + if (s != null) + response.setResponse(s); + else { + logger.error("file not available for request : " + request); + response.setError(5000, "file not available, please contact administrator"); + return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(response.toString()); } - return response.toString(); + return ResponseEntity.ok(response.toString()); } @Operation(summary = "Get beneficiary physical history") @PostMapping(value = { "/getBenPhysicalHistory" }) - public String getBenPhysicalHistory(@Param(value = "{\"benRegID\":\"Long\"}") @RequestBody String comingRequest) { + public ResponseEntity getBenPhysicalHistory( + @Param(value = "{\"benRegID\":\"Long\"}") @RequestBody String comingRequest) throws Exception { OutputResponse response = new OutputResponse(); - logger.info("getBenPhysicalHistory request:" + comingRequest); - try { - JSONObject obj = new JSONObject(comingRequest); - if (obj.has("benRegID")) { - Long benRegID = obj.getLong("benRegID"); - String s = commonServiceImpl.getBenPhysicalHistory(benRegID); - response.setResponse(s); - - } else { - logger.info("Invalid Request Data."); - response.setError(5000, "Invalid request"); - } - logger.info("getBenPhysicalHistory response:" + response); - } catch (Exception e) { - response.setError(5000, "Error while getting Physical history"); - logger.error("Error in getBenPhysicalHistory:" + e); + JSONObject obj = new JSONObject(comingRequest); + if (obj.has("benRegID") && !obj.isNull("benRegID")) { + Long benRegID = obj.getLong("benRegID"); + String s = commonServiceImpl.getBenPhysicalHistory(benRegID); + response.setResponse(s); + } else { + logger.info("Invalid Request Data."); + response.setError(5000, "Invalid request"); + return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(response.toString()); } - return response.toString(); + logger.info("getBenPhysicalHistory response:" + response); + return ResponseEntity.ok(response.toString()); } @Operation(summary = "Get beneficiary symptomatic questionnaire answer details") @PostMapping(value = { "/getBenSymptomaticQuestionnaireDetails" }) - public String getBenSymptomaticQuestionnaireDetails( - @Param(value = "{\"benRegID\":\"Long\"}") @RequestBody String comingRequest) { + public ResponseEntity getBenSymptomaticQuestionnaireDetails( + @Param(value = "{\"benRegID\":\"Long\"}") @RequestBody String comingRequest) throws Exception { OutputResponse response = new OutputResponse(); - logger.info("Get Beneficiary Symptomatic questionnaire answer details request:" + comingRequest); - try { - JSONObject obj = new JSONObject(comingRequest); - if (obj.has("benRegID")) { - Long benRegID = obj.getLong("benRegID"); - String s = commonServiceImpl.getBenSymptomaticQuestionnaireDetailsData(benRegID); - response.setResponse(s); - - } else { - logger.info("Invalid Request Data."); - response.setError(5000, "Invalid request"); - } - logger.info("Get Beneficiary Symptomatic questionnaire answer details response:" + response); - } catch (Exception e) { - response.setError(5000, "Error while getting details"); - logger.error("Error in Get Beneficiary Symptomatic questionnaire answer details:" + e); + JSONObject obj = new JSONObject(comingRequest); + if (obj.has("benRegID") && !obj.isNull("benRegID")) { + Long benRegID = obj.getLong("benRegID"); + String s = commonServiceImpl.getBenSymptomaticQuestionnaireDetailsData(benRegID); + response.setResponse(s); + } else { + logger.info("Invalid Request Data."); + response.setError(5000, "Invalid request"); + return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(response.toString()); } - return response.toString(); + logger.info("Get Beneficiary Symptomatic questionnaire answer details response:" + response); + return ResponseEntity.ok(response.toString()); } @Operation(summary = "Get beneficiary previous biabetes history") @PostMapping(value = { "/getBenPreviousDiabetesHistoryDetails" }) - public String getBenPreviousDiabetesHistoryDetails( - @Param(value = "{\"benRegID\":\"Long\"}") @RequestBody String comingRequest) { + public ResponseEntity getBenPreviousDiabetesHistoryDetails( + @Param(value = "{\"benRegID\":\"Long\"}") @RequestBody String comingRequest) throws Exception { OutputResponse response = new OutputResponse(); logger.info("Get Beneficiary previous Diabetes history request:" + comingRequest); - try { - JSONObject obj = new JSONObject(comingRequest); - if (obj.has("benRegID")) { - Long benRegID = obj.getLong("benRegID"); - String s = commonServiceImpl.getBenPreviousDiabetesData(benRegID); - response.setResponse(s); - - } else { - logger.info("Invalid Request Data."); - response.setError(5000, "Invalid request"); - } - logger.info("Get Beneficiary previous Diabetes history response:" + response); - } catch (Exception e) { - response.setError(5000, "Error while getting details"); - logger.error("Error in Get Beneficiary previous Diabetes history:" + e); + JSONObject obj = new JSONObject(comingRequest); + if (obj.has("benRegID") && !obj.isNull("benRegID")) { + Long benRegID = obj.getLong("benRegID"); + String s = commonServiceImpl.getBenPreviousDiabetesData(benRegID); + response.setResponse(s); + } else { + logger.info("Invalid Request Data."); + response.setError(5000, "Invalid request"); + return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(response.toString()); } - return response.toString(); + logger.info("Get Beneficiary previous Diabetes history response:" + response); + return ResponseEntity.ok(response.toString()); } // nurse worklist coming from MMU application @Operation(summary = "Get mmu nurse worklist") - @GetMapping(value = { "/getMmuNurseWorklistNew/{providerServiceMapID}/{serviceID}/{vanID}" }) - public String getMmuNurseWorklistNew(@PathVariable("providerServiceMapID") Integer providerServiceMapID, - @PathVariable("vanID") Integer vanID) { + @GetMapping(value = { "/getMmuNurseWorklistNew/{providerServiceMapID}/{vanID}" }) + public ResponseEntity getMmuNurseWorklistNew( + @PathVariable("providerServiceMapID") Integer providerServiceMapID, + @PathVariable("vanID") Integer vanID) throws Exception { OutputResponse response = new OutputResponse(); - try { - String s = commonNurseServiceImpl.getMmuNurseWorkListNew(providerServiceMapID, vanID); - if (s != null) - response.setResponse(s); - else - response.setError(5000, "Error while getting MMU Nurse Worklist"); - } catch (Exception e) { - // e.printStackTrace(); - logger.error("Error in getNurseWorklist:" + e); + String s = commonNurseServiceImpl.getMmuNurseWorkListNew(providerServiceMapID, vanID); + if (s != null) + response.setResponse(s); + else { response.setError(5000, "Error while getting MMU Nurse Worklist"); + return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(response.toString()); } - return response.toString(); + return ResponseEntity.ok(response.toString()); } @Operation(summary = "Get beneficiary previous Referral history") @PostMapping(value = { "/getBenPreviousReferralHistoryDetails" }) - public String getBenPreviousReferralHistoryDetails( - @Param(value = "{\"benRegID\":\"Long\"}") @RequestBody String comingRequest) { + public ResponseEntity getBenPreviousReferralHistoryDetails( + @Param(value = "{\"benRegID\":\"Long\"}") @RequestBody String comingRequest) throws Exception { OutputResponse response = new OutputResponse(); logger.info("Get Beneficiary previous Referral history request:" + comingRequest); - try { - JSONObject obj = new JSONObject(comingRequest); - if (obj.has("benRegID")) { - Long benRegID = obj.getLong("benRegID"); - String s = commonServiceImpl.getBenPreviousReferralData(benRegID); - response.setResponse(s); - - } else { - logger.info("Invalid Request Data."); - response.setError(5000, "Invalid request"); - } - logger.info("Get Beneficiary previous Referral history response:" + response); - } catch (Exception e) { - response.setError(5000, "Error while getting details"); - logger.error("Error in Get Beneficiary previous Referral history:" + e); + JSONObject obj = new JSONObject(comingRequest); + if (obj.has("benRegID") && !obj.isNull("benRegID")) { + Long benRegID = obj.getLong("benRegID"); + String s = commonServiceImpl.getBenPreviousReferralData(benRegID); + response.setResponse(s); + } else { + logger.info("Invalid Request Data."); + response.setError(5000, "Invalid request"); + return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(response.toString()); } - return response.toString(); + logger.info("Get Beneficiary previous Referral history response:" + response); + return ResponseEntity.ok(response.toString()); } /** @@ -921,20 +783,15 @@ public String getBenPreviousReferralHistoryDetails( */ @Operation(summary = "Get provider specific data") @PostMapping(value = { "/getProviderSpecificData" }) - public String getProviderSpecificData( - @Param(value = "{\"benvisitID\":\"Long\",\"benvisitCode\":\"Long\",\"fetchMMUDataFor\":\"String\"}") @RequestBody String comingRequest) { + public ResponseEntity getProviderSpecificData( + @Param(value = "{\"benvisitID\":\"Long\",\"benvisitCode\":\"Long\",\"fetchMMUDataFor\":\"String\"}") @RequestBody String comingRequest) + throws Exception { OutputResponse response = new OutputResponse(); - logger.info("getProviderSpecificData request:" + comingRequest); - try { - String s = commonServiceImpl.getProviderSpecificData(comingRequest); - response.setResponse(s); - logger.info("getProviderSpecificData response:" + response); - } catch (Exception e) { - response.setError(5000, e.getMessage()); - logger.error("Error in getProviderSpecificData:" + e); - } - return response.toString(); + String s = commonServiceImpl.getProviderSpecificData(comingRequest); + response.setResponse(s); + logger.info("getProviderSpecificData response:" + response); + return ResponseEntity.ok(response.toString()); } /** @@ -945,20 +802,15 @@ public String getProviderSpecificData( */ @Operation(summary = "Calculate beneficiary BMI status") @PostMapping(value = { "/calculateBMIStatus" }) - public String calculateBMIStatus( - @Param(value = "{\"bmi\":\"double\",\"yearMonth\":\"String\",\"gender\":\"String\"}") @RequestBody String comingRequest) { + public ResponseEntity calculateBMIStatus( + @Param(value = "{\"bmi\":\"double\",\"yearMonth\":\"String\",\"gender\":\"String\"}") @RequestBody String comingRequest) + throws Exception { OutputResponse response = new OutputResponse(); - logger.info("calculateBMIStatus request:" + comingRequest); - try { - String s = commonNurseServiceImpl.calculateBMIStatus(comingRequest); - response.setResponse(s); - logger.info("calculateBMIStatus response:" + response); - } catch (Exception e) { - response.setError(5000, e.getMessage()); - logger.error("Error in calculateBMIStatus:" + e.getMessage()); - } - return response.toString(); + String s = commonNurseServiceImpl.calculateBMIStatus(comingRequest); + response.setResponse(s); + logger.info("calculateBMIStatus response:" + response); + return ResponseEntity.ok(response.toString()); } /** @@ -968,96 +820,80 @@ public String calculateBMIStatus( */ @Operation(summary = "Get beneficiary immunization history ") @PostMapping(value = { "/getBenImmunizationServiceHistory" }) - - public String getBenImmunizationServiceHistory( - @Param(value = "{\"benRegID\":\"Long\"}") @RequestBody CommonUtilityClass commonUtilityClass) { + public ResponseEntity getBenImmunizationServiceHistory( + @Param(value = "{\"benRegID\":\"Long\"}") @RequestBody CommonUtilityClass commonUtilityClass) + throws Exception { OutputResponse response = new OutputResponse(); - logger.info("getBenImmunizationServiceDetails history request:" + commonUtilityClass.toString()); - try { - - if (commonUtilityClass.getBenRegID() != null) { - - String s = commonServiceImpl.getBenImmunizationServiceHistory(commonUtilityClass.getBenRegID()); - response.setResponse(s); - } else { - response.setError(5000, "Invalid request : missing ben information"); - } - logger.info("getBenImmunizationServiceDetails history response:" + response); - } catch (Exception e) { - response.setError(5000, - "Error while getting beneficiary immunization service hostory data : " + e.getLocalizedMessage()); - logger.error("Error in getBenImmunizationServiceDetails history:" + e); + if (commonUtilityClass.getBenRegID() != null) { + String s = commonServiceImpl.getBenImmunizationServiceHistory(commonUtilityClass.getBenRegID()); + response.setResponse(s); + } else { + response.setError(5000, "Invalid request : missing ben information"); + return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(response.toString()); } - return response.toString(); + logger.info("getBenImmunizationServiceDetails history response:" + response); + return ResponseEntity.ok(response.toString()); } // this functionality are moved to registrar update controller. // 16-04-2018, Neeraj kumar @Operation(summary = "Update beneficiary status flag") @PostMapping(value = { "/update/benDetailsAndSubmitToNurse" }) - public String saveBeneficiaryVisitDetail( - @Param(value = "{\"beneficiaryRegID\": \"Long\"}") @RequestBody String comingRequest) { + public ResponseEntity saveBeneficiaryVisitDetail( + @Param(value = "{\"beneficiaryRegID\": \"Long\"}") @RequestBody String comingRequest) throws Exception { OutputResponse response = new OutputResponse(); logger.info("benDetailsAndSubmitToNurse request:" + comingRequest); - try { - JSONObject obj = new JSONObject(comingRequest); - if (obj.has("beneficiaryRegID")) { - if (obj.getLong("beneficiaryRegID") > 0) { + JSONObject obj = new JSONObject(comingRequest); + if (obj.has("beneficiaryRegID") && !obj.isNull("beneficiaryRegID")) { + if (obj.getLong("beneficiaryRegID") > 0) { - Integer i = commonNurseServiceImpl.updateBeneficiaryStatus('R', obj.getLong("beneficiaryRegID")); - if (i != null && i > 0) { - response.setResponse("Beneficiary Successfully Submitted to Nurse Work-List."); - } else { - response.setError(500, "Something went Wrong please try after Some Time !!!"); - } + Integer i = commonNurseServiceImpl.updateBeneficiaryStatus('R', obj.getLong("beneficiaryRegID")); + if (i != null && i > 0) { + response.setResponse("Beneficiary Successfully Submitted to Nurse Work-List."); } else { - response.setError(500, "Beneficiary Registration ID is Not valid !!!"); + response.setError(500, "Something went Wrong please try after Some Time !!!"); + return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(response.toString()); } } else { - response.setError(500, "Beneficiary Registration ID is Not valid !!!"); + response.setError(400, "Beneficiary Registration ID is Not valid !!!"); + return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(response.toString()); } - logger.info("benDetailsAndSubmitToNurse response:" + response); - } catch (Exception e) { - response.setError(e); - logger.error("Error in benDetailsAndSubmitToNurse:" + e); + } else { + response.setError(400, "Beneficiary Registration ID is Not valid !!!"); + return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(response.toString()); } - return response.toString(); + logger.info("benDetailsAndSubmitToNurse response:" + response); + return ResponseEntity.ok(response.toString()); } @Operation(summary = "Extend redis session for 30 mins") @PostMapping(value = { "/extend/redisSession" }) - public String extendRedisSession() { + public ResponseEntity extendRedisSession() { OutputResponse response = new OutputResponse(); - try { - // temp code later have to validate the user also. - response.setResponse("Session extended for 30 mins"); - } catch (Exception e) { - logger.error("Error while extending running session"); - } - return response.toString(); + // temp code later have to validate the user also. + response.setResponse("Session extended for 30 mins"); + return ResponseEntity.ok(response.toString()); } @Operation(summary = "Soft delete prescribed medicine") @PostMapping(value = { "/doctor/delete/prescribedMedicine" }) - public String deletePrescribedMedicine(@RequestBody String requestOBJ) { + public ResponseEntity deletePrescribedMedicine(@RequestBody String requestOBJ) throws Exception { OutputResponse response = new OutputResponse(); - try { - if (requestOBJ != null) { - JSONObject obj = new JSONObject(requestOBJ); - String s = commonDoctorServiceImpl.deletePrescribedMedicine(obj); - if (s != null) - response.setResponse(s); - else - response.setError(5000, "error while deleting record"); - } else { - + if (requestOBJ != null) { + JSONObject obj = new JSONObject(requestOBJ); + String s = commonDoctorServiceImpl.deletePrescribedMedicine(obj); + if (s != null) + response.setResponse(s); + else { + response.setError(5000, "error while deleting record"); + return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(response.toString()); } - } catch (Exception e) { - logger.error("Error while deleting prescribed medicine"); - response.setError(e); + } else { + response.setError(400, "Invalid request"); + return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(response.toString()); } - return response.toString(); + return ResponseEntity.ok(response.toString()); } } diff --git a/src/main/java/com/iemr/hwc/controller/common/master/CommonMasterController.java b/src/main/java/com/iemr/hwc/controller/common/master/CommonMasterController.java index 39c2af8e..9d5879ed 100644 --- a/src/main/java/com/iemr/hwc/controller/common/master/CommonMasterController.java +++ b/src/main/java/com/iemr/hwc/controller/common/master/CommonMasterController.java @@ -31,11 +31,12 @@ import org.springframework.web.bind.annotation.RestController; import com.iemr.hwc.service.common.master.CommonMasterServiceImpl; -import com.iemr.hwc.utils.exception.IEMRException; import com.iemr.hwc.utils.response.OutputResponse; +import org.springframework.http.HttpStatus; +import org.springframework.http.MediaType; +import org.springframework.http.ResponseEntity; import io.swagger.v3.oas.annotations.Operation; -import jakarta.ws.rs.core.MediaType; @RestController @RequestMapping(value = "/master", headers = "Authorization", consumes = "application/json", produces = "application/json") @@ -56,13 +57,13 @@ public void setCommonMasterServiceImpl(CommonMasterServiceImpl commonMasterServi * @return list of visit reasons and visit categories */ @Operation(summary = "Get visit reasons and categories") - @GetMapping(value = "/get/visitReasonAndCategories", produces = MediaType.APPLICATION_JSON) - public String getVisitReasonAndCategories() { + @GetMapping(value = "/get/visitReasonAndCategories", produces = MediaType.APPLICATION_JSON_VALUE) + public ResponseEntity getVisitReasonAndCategories() throws Exception { logger.info("getVisitReasonAndCategories ..."); OutputResponse response = new OutputResponse(); response.setResponse(commonMasterServiceImpl.getVisitReasonAndCategories()); logger.info("visitReasonAndCategories" + response.toString()); - return response.toString(); + return ResponseEntity.ok(response.toString()); } /** @@ -71,23 +72,17 @@ public String getVisitReasonAndCategories() { * @return nurse master data for the provided visitCategoryID */ @Operation(summary = "Get master data for selected beneficiary for nurse") - @GetMapping(value = "/nurse/masterData/{visitCategoryID}/{providerServiceMapID}/{gender}", produces = MediaType.APPLICATION_JSON) - public String NurseMasterData(@PathVariable("visitCategoryID") Integer visitCategoryID, - @PathVariable("providerServiceMapID") Integer providerServiceMapID, @PathVariable("gender") String gender) { - + @GetMapping(value = "/nurse/masterData/{visitCategoryID}/{providerServiceMapID}/{gender}", produces = MediaType.APPLICATION_JSON_VALUE) + public ResponseEntity NurseMasterData(@PathVariable("visitCategoryID") Integer visitCategoryID, + @PathVariable("providerServiceMapID") Integer providerServiceMapID, @PathVariable("gender") String gender) + throws Exception { logger.info("Nurse master Data for categoryID:" + visitCategoryID + " and providerServiceMapID:" + providerServiceMapID); OutputResponse response = new OutputResponse(); - - try { - response.setResponse( - commonMasterServiceImpl.getMasterDataForNurse(visitCategoryID, providerServiceMapID, gender)); - logger.info("Nurse master Data for categoryID:" + response.toString()); - } catch (Exception e) { - logger.error(e.getLocalizedMessage()); - response.setError(5000, "error in getting nurse master data : " + e.getLocalizedMessage()); - } - return response.toString(); + response.setResponse( + commonMasterServiceImpl.getMasterDataForNurse(visitCategoryID, providerServiceMapID, gender)); + logger.info("Nurse master Data for categoryID:" + response.toString()); + return ResponseEntity.ok(response.toString()); } /** @@ -96,17 +91,17 @@ public String NurseMasterData(@PathVariable("visitCategoryID") Integer visitCate * @return doctor master data for the provided visitCategoryID */ @Operation(summary = "Get master data for selected beneficiary for doctor") - @GetMapping(value = "/doctor/masterData/{visitCategoryID}/{providerServiceMapID}/{gender}/{facilityID}/{vanID}", produces = MediaType.APPLICATION_JSON) - public String DoctorMasterData(@PathVariable("visitCategoryID") Integer visitCategoryID, + @GetMapping(value = "/doctor/masterData/{visitCategoryID}/{providerServiceMapID}/{gender}/{facilityID}/{vanID}", produces = MediaType.APPLICATION_JSON_VALUE) + public ResponseEntity DoctorMasterData(@PathVariable("visitCategoryID") Integer visitCategoryID, @PathVariable("providerServiceMapID") Integer providerServiceMapID, @PathVariable("gender") String gender, - @PathVariable("facilityID") Integer facilityID, @PathVariable("vanID") Integer vanID) { + @PathVariable("facilityID") Integer facilityID, @PathVariable("vanID") Integer vanID) throws Exception { logger.info("Doctor master Data for categoryID:" + visitCategoryID + " and providerServiceMapID:" + providerServiceMapID); OutputResponse response = new OutputResponse(); response.setResponse(commonMasterServiceImpl.getMasterDataForDoctor(visitCategoryID, providerServiceMapID, gender, facilityID, vanID)); logger.info("Doctor master Data for categoryID:" + response.toString()); - return response.toString(); + return ResponseEntity.ok(response.toString()); } /** @@ -116,25 +111,21 @@ public String DoctorMasterData(@PathVariable("visitCategoryID") Integer visitCat * cisId */ @Operation(summary = "Get current immunization data for selected beneficiary for doctor") - @GetMapping(value = "/common/masterData/getVaccine/{currentImmunizationServiceID}/{visitCategoryID}", produces = MediaType.APPLICATION_JSON) - public String getVaccineDetailsForCISID( + @GetMapping(value = "/common/masterData/getVaccine/{currentImmunizationServiceID}/{visitCategoryID}", produces = MediaType.APPLICATION_JSON_VALUE) + public ResponseEntity getVaccineDetailsForCISID( @PathVariable("currentImmunizationServiceID") Integer currentImmunizationServiceID, - @PathVariable("visitCategoryID") Integer visitCategoryID) { + @PathVariable("visitCategoryID") Integer visitCategoryID) throws Exception { OutputResponse response = new OutputResponse(); - try { - if (currentImmunizationServiceID == null) - throw new IEMRException("invalid request / NULL"); - logger.info("current-immunization-service-id:" + currentImmunizationServiceID); - - response.setResponse( - commonMasterServiceImpl.getVaccineDetailsForCISID(currentImmunizationServiceID, visitCategoryID)); - logger.info("response data for : " + currentImmunizationServiceID + response.toString()); - - } catch (IEMRException e) { - logger.error(e.getLocalizedMessage()); - response.setError(5000, e.getLocalizedMessage()); + if (currentImmunizationServiceID == null) { + response.setError(5000, "invalid request / NULL"); + return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(response.toString()); } - return response.toString(); + logger.info("current-immunization-service-id:" + currentImmunizationServiceID); + + response.setResponse( + commonMasterServiceImpl.getVaccineDetailsForCISID(currentImmunizationServiceID, visitCategoryID)); + logger.info("response data for : " + currentImmunizationServiceID + response.toString()); + return ResponseEntity.ok(response.toString()); } } diff --git a/src/main/java/com/iemr/hwc/controller/covid19/CovidController.java b/src/main/java/com/iemr/hwc/controller/covid19/CovidController.java index 05c041a3..d5c66a26 100644 --- a/src/main/java/com/iemr/hwc/controller/covid19/CovidController.java +++ b/src/main/java/com/iemr/hwc/controller/covid19/CovidController.java @@ -21,9 +21,6 @@ */ package com.iemr.hwc.controller.covid19; -import java.util.HashMap; -import java.util.Map; - import org.json.JSONObject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -37,11 +34,12 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import com.google.gson.JsonElement; import com.google.gson.JsonObject; import com.google.gson.JsonParser; import com.iemr.hwc.service.covid19.Covid19ServiceImpl; import com.iemr.hwc.utils.response.OutputResponse; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; import io.swagger.v3.oas.annotations.Operation; @@ -59,69 +57,45 @@ public class CovidController { @Operation(summary = "Save COVID nurse data") @PostMapping(value = { "/save/nurseData" }) - public String saveBenNCDCareNurseData(@RequestBody String requestObj, + public ResponseEntity saveBenNCDCareNurseData(@RequestBody String requestObj, @RequestHeader(value = "Authorization") String Authorization) throws Exception { OutputResponse response = new OutputResponse(); - - if (null != requestObj) { - JsonObject jsnOBJ = new JsonObject(); - JsonParser jsnParser = new JsonParser(); - JsonElement jsnElmnt = jsnParser.parse(requestObj); - jsnOBJ = jsnElmnt.getAsJsonObject(); - - try { - logger.info("Request object for COVID 19 nurse data saving :" + requestObj); - - if (jsnOBJ != null) { - String ncdCareRes = covid19ServiceImpl.saveCovid19NurseData(jsnOBJ, Authorization); - response.setResponse(ncdCareRes); - } else { - response.setError(5000, "Invalid Request !!!"); - } - - } catch (Exception e) { - logger.error("Error while saving Pandemic nurse data :" + e.getMessage()); - covid19ServiceImpl.deleteVisitDetails(jsnOBJ); - response.setError(5000, e.getMessage()); - } + if (null == requestObj || requestObj.isEmpty()) { + response.setError(5000, "Invalid Request !!!"); + return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(response.toString()); + } + JsonObject jsnOBJ = JsonParser.parseString(requestObj).getAsJsonObject(); + try { + logger.info("Request object for COVID 19 nurse data saving :" + requestObj); + String ncdCareRes = covid19ServiceImpl.saveCovid19NurseData(jsnOBJ, Authorization); + response.setResponse(ncdCareRes); + } catch (Exception e) { + logger.error("Error while saving Pandemic nurse data :" + e.getMessage()); + covid19ServiceImpl.deleteVisitDetails(jsnOBJ); + throw e; } - return response.toString(); + return ResponseEntity.ok(response.toString()); } - /** - * @Objective Save Covid data for doctor. - * @param JSON requestObj - * @return success or failure response - */ @Operation(summary = "Save COVID doctor data") @PostMapping(value = { "/save/doctorData" }) - public String saveBenCovidDoctorData(@RequestBody String requestObj, - @RequestHeader(value = "Authorization") String Authorization) { + public ResponseEntity saveBenCovidDoctorData(@RequestBody String requestObj, + @RequestHeader(value = "Authorization") String Authorization) throws Exception { OutputResponse response = new OutputResponse(); - try { - logger.info("Request object for Covid doctor data saving :" + requestObj); - - JsonObject jsnOBJ = new JsonObject(); - JsonParser jsnParser = new JsonParser(); - JsonElement jsnElmnt = jsnParser.parse(requestObj); - jsnOBJ = jsnElmnt.getAsJsonObject(); - - if (jsnOBJ != null) { - Long ncdCareRes = covid19ServiceImpl.saveDoctorData(jsnOBJ, Authorization); - if (null != ncdCareRes && ncdCareRes > 0) { - response.setResponse("Data saved successfully"); - } else { - response.setResponse("Unable to save data"); - } - - } else { - response.setResponse("Invalid request"); - } - } catch (Exception e) { - logger.error("Error while saving Covid doctor data :" + e.getMessage()); - response.setError(5000, e.getMessage()); + logger.info("Request object for Covid doctor data saving :" + requestObj); + if (null == requestObj || requestObj.isEmpty()) { + response.setResponse("Invalid request"); + return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(response.toString()); + } + JsonObject jsnOBJ = JsonParser.parseString(requestObj).getAsJsonObject(); + Long ncdCareRes = covid19ServiceImpl.saveDoctorData(jsnOBJ, Authorization); + if (null != ncdCareRes && ncdCareRes > 0) { + response.setResponse("Data saved successfully"); + } else { + response.setResponse("Unable to save data"); + return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(response.toString()); } - return response.toString(); + return ResponseEntity.ok(response.toString()); } /** @@ -132,29 +106,26 @@ public String saveBenCovidDoctorData(@RequestBody String requestObj, @Operation(summary = "Get COVID beneficiary visit details") @PostMapping(value = { "/getBenVisitDetailsFrmNurseCovid" }) @Transactional(rollbackFor = Exception.class) - public String getBenVisitDetailsFrmNurseCovid19( - @Param(value = "{\"benRegID\":\"Long\",\"visitCode\":\"Long\"}") @RequestBody String comingRequest) { + public ResponseEntity getBenVisitDetailsFrmNurseCovid19( + @Param(value = "{\"benRegID\":\"Long\",\"visitCode\":\"Long\"}") @RequestBody String comingRequest) + throws Exception { OutputResponse response = new OutputResponse(); logger.info("Request object for Covid 19 visit data fetching :" + comingRequest); - try { - JSONObject obj = new JSONObject(comingRequest); - if (obj.length() > 1) { - Long benRegID = obj.getLong("benRegID"); - Long visitCode = obj.getLong("visitCode"); - - String res = covid19ServiceImpl.getBenVisitDetailsFrmNurseCovid19(benRegID, visitCode); - response.setResponse(res); - } else { - logger.info("Invalid request"); - response.setError(5000, "Invalid request"); - } - logger.info("Covid 19 visit data fetching Response:" + response); - } catch (Exception e) { - response.setError(5000, "Error while getting beneficiary visit data"); - logger.error("Error while getting beneficiary visit data :" + e); + JSONObject obj = new JSONObject(comingRequest); + if (obj.length() > 1) { + Long benRegID = obj.getLong("benRegID"); + Long visitCode = obj.getLong("visitCode"); + + String res = covid19ServiceImpl.getBenVisitDetailsFrmNurseCovid19(benRegID, visitCode); + response.setResponse(res); + } else { + logger.info("Invalid request"); + response.setError(5000, "Invalid request"); + return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(response.toString()); } - return response.toString(); + logger.info("Covid 19 visit data fetching Response:" + response); + return ResponseEntity.ok(response.toString()); } /** @@ -164,29 +135,25 @@ public String getBenVisitDetailsFrmNurseCovid19( */ @Operation(summary = "Get COVID beneficiary history") @PostMapping(value = { "/getBenCovid19HistoryDetails" }) - - public String getBenCovid19HistoryDetails( - @Param(value = "{\"benRegID\":\"Long\",\"visitCode\":\"Long\"}") @RequestBody String comingRequest) { + public ResponseEntity getBenCovid19HistoryDetails( + @Param(value = "{\"benRegID\":\"Long\",\"visitCode\":\"Long\"}") @RequestBody String comingRequest) + throws Exception { OutputResponse response = new OutputResponse(); logger.info("Request object for NCD Care history data fetching :" + comingRequest); - try { - JSONObject obj = new JSONObject(comingRequest); - if (obj.has("benRegID") && obj.has("visitCode")) { - Long benRegID = obj.getLong("benRegID"); - Long visitCode = obj.getLong("visitCode"); - - String s = covid19ServiceImpl.getBenCovid19HistoryDetails(benRegID, visitCode); - response.setResponse(s); - } else { - response.setError(5000, "Invalid request"); - } - logger.info("NCD Care history data fetching Response:" + response); - } catch (Exception e) { - response.setError(5000, "Error while getting beneficiary history data"); - logger.error("Error while getting beneficiary history data :" + e); + JSONObject obj = new JSONObject(comingRequest); + if (obj.has("benRegID") && obj.has("visitCode")) { + Long benRegID = obj.getLong("benRegID"); + Long visitCode = obj.getLong("visitCode"); + + String s = covid19ServiceImpl.getBenCovid19HistoryDetails(benRegID, visitCode); + response.setResponse(s); + } else { + response.setError(5000, "Invalid request"); + return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(response.toString()); } - return response.toString(); + logger.info("NCD Care history data fetching Response:" + response); + return ResponseEntity.ok(response.toString()); } /** @@ -196,62 +163,51 @@ public String getBenCovid19HistoryDetails( */ @Operation(summary = "Get COVID beneficiary vitals") @PostMapping(value = { "/getBenVitalDetailsFrmNurseCovid" }) - public String getBenVitalDetailsFrmNurseNCDCare( - @Param(value = "{\"benRegID\":\"Long\",\"visitCode\":\"Long\"}") @RequestBody String comingRequest) { + public ResponseEntity getBenVitalDetailsFrmNurseNCDCare( + @Param(value = "{\"benRegID\":\"Long\",\"visitCode\":\"Long\"}") @RequestBody String comingRequest) + throws Exception { OutputResponse response = new OutputResponse(); logger.info("Request object for Covid 19 vital data fetching :" + comingRequest); - try { - JSONObject obj = new JSONObject(comingRequest); - if (obj.has("benRegID") && obj.has("visitCode")) { - Long benRegID = obj.getLong("benRegID"); - Long visitCode = obj.getLong("visitCode"); - - String res = covid19ServiceImpl.getBeneficiaryVitalDetails(benRegID, visitCode); - response.setResponse(res); - } else { - logger.info("Invalid request"); - response.setError(5000, "Invalid request"); - } - logger.info("Covid 19 vital data fetching Response:" + response); - } catch (Exception e) { - response.setError(5000, "Error while getting beneficiary vital data"); - logger.error("Error while getting beneficiary vital data :" + e); + JSONObject obj = new JSONObject(comingRequest); + if (obj.has("benRegID") && obj.has("visitCode")) { + Long benRegID = obj.getLong("benRegID"); + Long visitCode = obj.getLong("visitCode"); + + String res = covid19ServiceImpl.getBeneficiaryVitalDetails(benRegID, visitCode); + response.setResponse(res); + } else { + logger.info("Invalid request"); + response.setError(5000, "Invalid request"); + return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(response.toString()); } - return response.toString(); + logger.info("Covid 19 vital data fetching Response:" + response); + return ResponseEntity.ok(response.toString()); } - /** - * @Objective Fetching beneficiary doctor details. - * @param comingRequest - * @return visit details in JSON format - */ @Operation(summary = "Get COVID beneficiary case-record and referral details") @PostMapping(value = { "/getBenCaseRecordFromDoctorCovid" }) @Transactional(rollbackFor = Exception.class) - public String getBenCaseRecordFromDoctorCovid19( - @Param(value = "{\"benRegID\":\"Long\",\"visitCode\":\"Long\"}") @RequestBody String comingRequest) { + public ResponseEntity getBenCaseRecordFromDoctorCovid19( + @Param(value = "{\"benRegID\":\"Long\",\"visitCode\":\"Long\"}") @RequestBody String comingRequest) + throws Exception { OutputResponse response = new OutputResponse(); logger.info("Request object for Covid 19 doctor data fetching :" + comingRequest); - try { - JSONObject obj = new JSONObject(comingRequest); - if (null != obj && obj.length() > 1 && obj.has("benRegID") && obj.has("visitCode")) { - Long benRegID = obj.getLong("benRegID"); - Long visitCode = obj.getLong("visitCode"); - - String res = covid19ServiceImpl.getBenCaseRecordFromDoctorCovid19(benRegID, visitCode); - response.setResponse(res); - } else { - logger.info("Invalid request"); - response.setError(5000, "Invalid request"); - } - logger.info("Covid 19 doctor data fetching Response:" + response); - } catch (Exception e) { - response.setError(5000, "Error while getting beneficiary doctor data"); - logger.error("Error while getting beneficiary doctor data :" + e); + JSONObject obj = new JSONObject(comingRequest); + if (null != obj && obj.length() > 1 && obj.has("benRegID") && obj.has("visitCode")) { + Long benRegID = obj.getLong("benRegID"); + Long visitCode = obj.getLong("visitCode"); + + String res = covid19ServiceImpl.getBenCaseRecordFromDoctorCovid19(benRegID, visitCode); + response.setResponse(res); + } else { + logger.info("Invalid request"); + response.setError(5000, "Invalid request"); + return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(response.toString()); } - return response.toString(); + logger.info("Covid 19 doctor data fetching Response:" + response); + return ResponseEntity.ok(response.toString()); } /** @@ -263,32 +219,19 @@ public String getBenCaseRecordFromDoctorCovid19( */ @Operation(summary = "Update COVID beneficiary history") @PostMapping(value = { "/update/historyScreen" }) - public String updateHistoryNurse(@RequestBody String requestObj) { - + public ResponseEntity updateHistoryNurse(@RequestBody String requestObj) throws Exception { OutputResponse response = new OutputResponse(); logger.info("Request object for history data updating :" + requestObj); - - JsonObject jsnOBJ = new JsonObject(); - JsonParser jsnParser = new JsonParser(); - JsonElement jsnElmnt = jsnParser.parse(requestObj); - jsnOBJ = jsnElmnt.getAsJsonObject(); - - try { - int result = covid19ServiceImpl.updateBenHistoryDetails(jsnOBJ); - if (result > 0) { - Map resMap = new HashMap(); - resMap.put("result", result); - response.setResponse("Data updated successfully"); - } else { - response.setError(500, "Unable to modify data"); - } - logger.info("History data update Response:" + response); - } catch (Exception e) { - response.setError(5000, "Unable to modify data"); - logger.error("Error while updating history data :" + e); + JsonObject jsnOBJ = JsonParser.parseString(requestObj).getAsJsonObject(); + int result = covid19ServiceImpl.updateBenHistoryDetails(jsnOBJ); + if (result > 0) { + response.setResponse("Data updated successfully"); + } else { + response.setError(500, "Unable to modify data"); + return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(response.toString()); } - - return response.toString(); + logger.info("History data update Response:" + response); + return ResponseEntity.ok(response.toString()); } /** @@ -300,30 +243,19 @@ public String updateHistoryNurse(@RequestBody String requestObj) { */ @Operation(summary = "Update COVID beneficiary vitals") @PostMapping(value = { "/update/vitalScreen" }) - public String updateVitalNurse(@RequestBody String requestObj) { - + public ResponseEntity updateVitalNurse(@RequestBody String requestObj) throws Exception { OutputResponse response = new OutputResponse(); logger.info("Request object for vital data updating :" + requestObj); - - JsonObject jsnOBJ = new JsonObject(); - JsonParser jsnParser = new JsonParser(); - JsonElement jsnElmnt = jsnParser.parse(requestObj); - jsnOBJ = jsnElmnt.getAsJsonObject(); - - try { - int result = covid19ServiceImpl.updateBenVitalDetails(jsnOBJ); - if (result > 0) { - response.setResponse("Data updated successfully"); - } else { - response.setError(500, "Unable to modify data"); - } - logger.info("Vital data update Response:" + response); - } catch (Exception e) { - response.setError(5000, "Unable to modify data"); - logger.error("Error while updating vital data :" + e); + JsonObject jsnOBJ = JsonParser.parseString(requestObj).getAsJsonObject(); + int result = covid19ServiceImpl.updateBenVitalDetails(jsnOBJ); + if (result > 0) { + response.setResponse("Data updated successfully"); + } else { + response.setError(500, "Unable to modify data"); + return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(response.toString()); } - - return response.toString(); + logger.info("Vital data update Response:" + response); + return ResponseEntity.ok(response.toString()); } /** @@ -334,30 +266,19 @@ public String updateVitalNurse(@RequestBody String requestObj) { */ @Operation(summary = "Update COVID beneficiary case-record and referral details") @PostMapping(value = { "/update/doctorData" }) - public String updateCovid19DoctorData(@RequestBody String requestObj, - @RequestHeader(value = "Authorization") String Authorization) { - + public ResponseEntity updateCovid19DoctorData(@RequestBody String requestObj, + @RequestHeader(value = "Authorization") String Authorization) throws Exception { OutputResponse response = new OutputResponse(); logger.info("Request object for doctor data updating :" + requestObj); - - JsonObject jsnOBJ = new JsonObject(); - JsonParser jsnParser = new JsonParser(); - JsonElement jsnElmnt = jsnParser.parse(requestObj); - jsnOBJ = jsnElmnt.getAsJsonObject(); - - try { - Long result = covid19ServiceImpl.updateCovid19DoctorData(jsnOBJ, Authorization); - if (null != result && result > 0) { - response.setResponse("Data updated successfully"); - } else { - response.setError(500, "Unable to modify data"); - } - logger.info("Doctor data update Response:" + response); - } catch (Exception e) { - logger.error("Unable to modify data. " + e.getMessage()); - response.setError(5000, e.getMessage()); + JsonObject jsnOBJ = JsonParser.parseString(requestObj).getAsJsonObject(); + Long result = covid19ServiceImpl.updateCovid19DoctorData(jsnOBJ, Authorization); + if (null != result && result > 0) { + response.setResponse("Data updated successfully"); + } else { + response.setError(500, "Unable to modify data"); + return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(response.toString()); } - - return response.toString(); + logger.info("Doctor data update Response:" + response); + return ResponseEntity.ok(response.toString()); } } 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 85facea3..dd4119d4 100644 --- a/src/main/java/com/iemr/hwc/controller/generalOPD/GeneralOPDController.java +++ b/src/main/java/com/iemr/hwc/controller/generalOPD/GeneralOPDController.java @@ -35,13 +35,14 @@ import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RestController; -import com.google.gson.JsonElement; import com.google.gson.JsonObject; import com.google.gson.JsonParser; import com.iemr.hwc.service.generalOPD.GeneralOPDServiceImpl; import com.iemr.hwc.utils.response.OutputResponse; import io.swagger.v3.oas.annotations.Operation; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; /*** * @@ -69,32 +70,19 @@ public void setGeneralOPDServiceImpl(GeneralOPDServiceImpl generalOPDServiceImpl */ @Operation(summary = "Save general OPD data collected by nurse") @PostMapping(value = { "/save/nurseData" }) - public String saveBenGenOPDNurseData(@RequestBody String requestObj, + public ResponseEntity saveBenGenOPDNurseData(@RequestBody String requestObj, @RequestHeader(value = "Authorization") String Authorization) throws Exception { OutputResponse response = new OutputResponse(); - if (null != requestObj) { - JsonObject jsnOBJ = new JsonObject(); - JsonParser jsnParser = new JsonParser(); - JsonElement jsnElmnt = jsnParser.parse(requestObj); - jsnOBJ = jsnElmnt.getAsJsonObject(); - - try { - logger.info("Request object for GeneralOPD nurse data saving :" + requestObj); - - if (jsnOBJ != null) { - String genOPDRes = generalOPDServiceImpl.saveNurseData(jsnOBJ, Authorization); - response.setResponse(genOPDRes); - } else { - response.setResponse("Invalid request"); - } - } catch (Exception e) { - logger.error("Error in nurse data saving :" + e.getMessage()); - generalOPDServiceImpl.deleteVisitDetails(jsnOBJ); - response.setError(5000, e.getMessage()); - } + JsonObject jsnOBJ = JsonParser.parseString(requestObj).getAsJsonObject(); + logger.info("Request object for GeneralOPD nurse data saving :" + requestObj); + String genOPDRes = generalOPDServiceImpl.saveNurseData(jsnOBJ, Authorization); + response.setResponse(genOPDRes); + } else { + response.setResponse("Invalid request"); + return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(response.toString()); } - return response.toString(); + return ResponseEntity.ok(response.toString()); } /** @@ -104,33 +92,24 @@ public String saveBenGenOPDNurseData(@RequestBody String requestObj, */ @Operation(summary = "Save general OPD data collected by doctor") @PostMapping(value = { "/save/doctorData" }) - public String saveBenGenOPDDoctorData(@RequestBody String requestObj, - @RequestHeader(value = "Authorization") String Authorization) { + public ResponseEntity saveBenGenOPDDoctorData(@RequestBody String requestObj, + @RequestHeader(value = "Authorization") String Authorization) throws Exception { OutputResponse response = new OutputResponse(); - try { - logger.info("Request object for GeneralOPD doctor data saving :" + requestObj); - - JsonObject jsnOBJ = new JsonObject(); - JsonParser jsnParser = new JsonParser(); - JsonElement jsnElmnt = jsnParser.parse(requestObj); - jsnOBJ = jsnElmnt.getAsJsonObject(); - - if (jsnOBJ != null) { - Long genOPDRes = generalOPDServiceImpl.saveDoctorData(jsnOBJ, Authorization); - if (null != genOPDRes && genOPDRes > 0) { - response.setResponse("Data saved successfully"); - } else { - response.setResponse("Unable to save data"); - } - + logger.info("Request object for GeneralOPD doctor data saving :" + requestObj); + JsonObject jsnOBJ = JsonParser.parseString(requestObj).getAsJsonObject(); + if (jsnOBJ != null) { + Long genOPDRes = generalOPDServiceImpl.saveDoctorData(jsnOBJ, Authorization); + if (null != genOPDRes && genOPDRes > 0) { + response.setResponse("Data saved successfully"); } else { - response.setResponse("Invalid request"); + response.setResponse("Unable to save data"); + return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(response.toString()); } - } catch (Exception e) { - logger.error("Error in doctor data saving :" + e.getMessage()); - response.setError(5000, e.getMessage()); + } else { + response.setResponse("Invalid request"); + return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(response.toString()); } - return response.toString(); + return ResponseEntity.ok(response.toString()); } /** @@ -141,29 +120,24 @@ public String saveBenGenOPDDoctorData(@RequestBody String requestObj, @Operation(summary = "Get general OPD beneficiary visit details") @PostMapping(value = { "/getBenVisitDetailsFrmNurseGOPD" }) @Transactional(rollbackFor = Exception.class) - public String getBenVisitDetailsFrmNurseGOPD( - @Param(value = "{\"benRegID\":\"Long\",\"visitCode\":\"Long\"}") @RequestBody String comingRequest) { + public ResponseEntity getBenVisitDetailsFrmNurseGOPD( + @Param(value = "{\"benRegID\":\"Long\",\"visitCode\":\"Long\"}") @RequestBody String comingRequest) + throws Exception { OutputResponse response = new OutputResponse(); - logger.info("Request obj to fetch General OPD visit details :" + comingRequest); - try { - JSONObject obj = new JSONObject(comingRequest); - if (obj.length() > 1) { - Long benRegID = obj.getLong("benRegID"); - Long visitCode = obj.getLong("visitCode"); - - String res = generalOPDServiceImpl.getBenVisitDetailsFrmNurseGOPD(benRegID, visitCode); - response.setResponse(res); - } else { - logger.info("Invalid Request Data."); - response.setError(5000, "Invalid request"); - } - logger.info("getBenDataFrmNurseScrnToDocScrnVisitDetails response:" + response); - } catch (Exception e) { - response.setError(5000, "Error while getting beneficiary visit data"); - logger.error("Error in getBenDataFrmNurseScrnToDocScrnVisitDetails:" + e); + JSONObject obj = new JSONObject(comingRequest); + if (obj.length() > 1 && obj.has("benRegID") && obj.has("visitCode")) { + Long benRegID = obj.getLong("benRegID"); + Long visitCode = obj.getLong("visitCode"); + String res = generalOPDServiceImpl.getBenVisitDetailsFrmNurseGOPD(benRegID, visitCode); + response.setResponse(res); + } else { + logger.info("Invalid Request Data."); + response.setError(5000, "Invalid request"); + return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(response.toString()); } - return response.toString(); + logger.info("getBenDataFrmNurseScrnToDocScrnVisitDetails response:" + response); + return ResponseEntity.ok(response.toString()); } /** @@ -173,29 +147,23 @@ public String getBenVisitDetailsFrmNurseGOPD( */ @Operation(summary = "Get general OPD beneficiary history") @PostMapping(value = { "/getBenHistoryDetails" }) - - public String getBenHistoryDetails( - @Param(value = "{\"benRegID\":\"Long\",\"visitCode\":\"Long\"}") @RequestBody String comingRequest) { + public ResponseEntity getBenHistoryDetails( + @Param(value = "{\"benRegID\":\"Long\",\"visitCode\":\"Long\"}") @RequestBody String comingRequest) + throws Exception { OutputResponse response = new OutputResponse(); - logger.info("getBenHistoryDetails request:" + comingRequest); - try { - JSONObject obj = new JSONObject(comingRequest); - if (obj.has("benRegID") && obj.has("visitCode")) { - Long benRegID = obj.getLong("benRegID"); - Long visitCode = obj.getLong("visitCode"); - - String s = generalOPDServiceImpl.getBenHistoryDetails(benRegID, visitCode); - response.setResponse(s); - } else { - response.setError(5000, "Invalid request"); - } - logger.info("getBenHistoryDetails response:" + response); - } catch (Exception e) { - response.setError(5000, "Error while getting beneficiary history data"); - logger.error("Error in getBenHistoryDetails:" + e); + JSONObject obj = new JSONObject(comingRequest); + if (obj.has("benRegID") && obj.has("visitCode")) { + Long benRegID = obj.getLong("benRegID"); + Long visitCode = obj.getLong("visitCode"); + String s = generalOPDServiceImpl.getBenHistoryDetails(benRegID, visitCode); + response.setResponse(s); + } else { + response.setError(5000, "Invalid request"); + return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(response.toString()); } - return response.toString(); + logger.info("getBenHistoryDetails response:" + response); + return ResponseEntity.ok(response.toString()); } /** @@ -205,29 +173,24 @@ public String getBenHistoryDetails( */ @Operation(summary = "Get general OPD beneficiary vitals") @PostMapping(value = { "/getBenVitalDetailsFrmNurse" }) - public String getBenVitalDetailsFrmNurse( - @Param(value = "{\"benRegID\":\"Long\",\"visitCode\":\"Long\"}") @RequestBody String comingRequest) { + public ResponseEntity getBenVitalDetailsFrmNurse( + @Param(value = "{\"benRegID\":\"Long\",\"visitCode\":\"Long\"}") @RequestBody String comingRequest) + throws Exception { OutputResponse response = new OutputResponse(); - logger.info("getBenVitalDetailsFrmNurse request:" + comingRequest); - try { - JSONObject obj = new JSONObject(comingRequest); - if (obj.has("benRegID") && obj.has("visitCode")) { - Long benRegID = obj.getLong("benRegID"); - Long visitCode = obj.getLong("visitCode"); - - String res = generalOPDServiceImpl.getBeneficiaryVitalDetails(benRegID, visitCode); - response.setResponse(res); - } else { - logger.info("Invalid Request Data."); - response.setError(5000, "Invalid request"); - } - logger.info("getBenVitalDetailsFrmNurse response:" + response); - } catch (Exception e) { - response.setError(5000, "Error while getting beneficiary vital data"); - logger.error("Error in getBenVitalDetailsFrmNurse:" + e); + JSONObject obj = new JSONObject(comingRequest); + if (obj.has("benRegID") && obj.has("visitCode")) { + Long benRegID = obj.getLong("benRegID"); + Long visitCode = obj.getLong("visitCode"); + String res = generalOPDServiceImpl.getBeneficiaryVitalDetails(benRegID, visitCode); + response.setResponse(res); + } else { + logger.info("Invalid Request Data."); + response.setError(5000, "Invalid request"); + return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(response.toString()); } - return response.toString(); + logger.info("getBenVitalDetailsFrmNurse response:" + response); + return ResponseEntity.ok(response.toString()); } /** @@ -237,29 +200,23 @@ public String getBenVitalDetailsFrmNurse( */ @Operation(summary = "Get general OPD beneficiary examination details") @PostMapping(value = { "/getBenExaminationDetails" }) - - public String getBenExaminationDetails( - @Param(value = "{\"benRegID\":\"Long\",\"visitCode\":\"Long\"}") @RequestBody String comingRequest) { + public ResponseEntity getBenExaminationDetails( + @Param(value = "{\"benRegID\":\"Long\",\"visitCode\":\"Long\"}") @RequestBody String comingRequest) + throws Exception { OutputResponse response = new OutputResponse(); - logger.info("getBenExaminationDetails request:" + comingRequest); - try { - JSONObject obj = new JSONObject(comingRequest); - if (obj.has("benRegID") && obj.has("visitCode")) { - Long benRegID = obj.getLong("benRegID"); - Long visitCode = obj.getLong("visitCode"); - - String s = generalOPDServiceImpl.getExaminationDetailsData(benRegID, visitCode); - response.setResponse(s); - } else { - response.setError(5000, "Invalid request"); - } - logger.info("getBenExaminationDetails response:" + response); - } catch (Exception e) { - response.setError(5000, "Error while getting beneficiary examination data"); - logger.error("Error in getBenExaminationDetails:" + e); + JSONObject obj = new JSONObject(comingRequest); + if (obj.has("benRegID") && obj.has("visitCode")) { + Long benRegID = obj.getLong("benRegID"); + Long visitCode = obj.getLong("visitCode"); + String s = generalOPDServiceImpl.getExaminationDetailsData(benRegID, visitCode); + response.setResponse(s); + } else { + response.setError(5000, "Invalid request"); + return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(response.toString()); } - return response.toString(); + logger.info("getBenExaminationDetails response:" + response); + return ResponseEntity.ok(response.toString()); } /** @@ -270,29 +227,24 @@ public String getBenExaminationDetails( @Operation(summary = "Get general OPD beneficiary case record and referral") @PostMapping(value = { "/getBenCaseRecordFromDoctorGeneralOPD" }) @Transactional(rollbackFor = Exception.class) - public String getBenCaseRecordFromDoctorGeneralOPD( - @Param(value = "{\"benRegID\":\"Long\",\"visitCode\":\"Long\"}") @RequestBody String comingRequest) { + public ResponseEntity getBenCaseRecordFromDoctorGeneralOPD( + @Param(value = "{\"benRegID\":\"Long\",\"visitCode\":\"Long\"}") @RequestBody String comingRequest) + throws Exception { OutputResponse response = new OutputResponse(); - logger.info("getBenCaseRecordFromDoctorGeneralOPD request:" + comingRequest); - try { - JSONObject obj = new JSONObject(comingRequest); - if (null != obj && obj.length() > 1 && obj.has("benRegID") && obj.has("visitCode")) { - Long benRegID = obj.getLong("benRegID"); - Long visitCode = obj.getLong("visitCode"); - - String res = generalOPDServiceImpl.getBenCaseRecordFromDoctorGeneralOPD(benRegID, visitCode); - response.setResponse(res); - } else { - logger.info("Invalid Request Data."); - response.setError(5000, "Invalid request"); - } - logger.info("getBenCaseRecordFromDoctorGeneralOPD response:" + response); - } catch (Exception e) { - response.setError(5000, "Error while getting beneficiary doctor data"); - logger.error("Error in getBenCaseRecordFromDoctorGeneralOPD:" + e); + JSONObject obj = new JSONObject(comingRequest); + if (null != obj && obj.length() > 1 && obj.has("benRegID") && obj.has("visitCode")) { + Long benRegID = obj.getLong("benRegID"); + Long visitCode = obj.getLong("visitCode"); + String res = generalOPDServiceImpl.getBenCaseRecordFromDoctorGeneralOPD(benRegID, visitCode); + response.setResponse(res); + } else { + logger.info("Invalid Request Data."); + response.setError(5000, "Invalid request"); + return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(response.toString()); } - return response.toString(); + logger.info("getBenCaseRecordFromDoctorGeneralOPD response:" + response); + return ResponseEntity.ok(response.toString()); } /** @@ -304,30 +256,19 @@ public String getBenCaseRecordFromDoctorGeneralOPD( */ @Operation(summary = "Update beneficiary history") @PostMapping(value = { "/update/historyScreen" }) - public String updateHistoryNurse(@RequestBody String requestObj) { - + public ResponseEntity updateHistoryNurse(@RequestBody String requestObj) throws Exception { OutputResponse response = new OutputResponse(); logger.info("Request object for history data updating :" + requestObj); - - JsonObject jsnOBJ = new JsonObject(); - JsonParser jsnParser = new JsonParser(); - JsonElement jsnElmnt = jsnParser.parse(requestObj); - jsnOBJ = jsnElmnt.getAsJsonObject(); - - try { - int result = generalOPDServiceImpl.updateBenHistoryDetails(jsnOBJ); - if (result > 0) { - response.setResponse("Data updated successfully"); - } else { - response.setError(500, "Unable to modify data"); - } - logger.info("History data update response:" + response); - } catch (Exception e) { - response.setError(5000, "Unable to modify data"); - logger.error("Error while updating history data :" + e); + JsonObject jsnOBJ = JsonParser.parseString(requestObj).getAsJsonObject(); + int result = generalOPDServiceImpl.updateBenHistoryDetails(jsnOBJ); + if (result > 0) { + response.setResponse("Data updated successfully"); + } else { + response.setError(500, "Unable to modify data"); + return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(response.toString()); } - - return response.toString(); + logger.info("History data update response:" + response); + return ResponseEntity.ok(response.toString()); } /** @@ -339,30 +280,19 @@ public String updateHistoryNurse(@RequestBody String requestObj) { */ @Operation(summary = "Update general OPD beneficiary vitals") @PostMapping(value = { "/update/vitalScreen" }) - public String updateVitalNurse(@RequestBody String requestObj) { - + public ResponseEntity updateVitalNurse(@RequestBody String requestObj) throws Exception { OutputResponse response = new OutputResponse(); logger.info("Request object for vital data updating :" + requestObj); - - JsonObject jsnOBJ = new JsonObject(); - JsonParser jsnParser = new JsonParser(); - JsonElement jsnElmnt = jsnParser.parse(requestObj); - jsnOBJ = jsnElmnt.getAsJsonObject(); - - try { - int result = generalOPDServiceImpl.updateBenVitalDetails(jsnOBJ); - if (result > 0) { - response.setResponse("Data updated successfully"); - } else { - response.setError(500, "Unable to modify data"); - } - logger.info("Vital data update response:" + response); - } catch (Exception e) { - response.setError(5000, "Unable to modify data"); - logger.error("Error while updating vital data :" + e); + JsonObject jsnOBJ = JsonParser.parseString(requestObj).getAsJsonObject(); + int result = generalOPDServiceImpl.updateBenVitalDetails(jsnOBJ); + if (result > 0) { + response.setResponse("Data updated successfully"); + } else { + response.setError(500, "Unable to modify data"); + return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(response.toString()); } - - return response.toString(); + logger.info("Vital data update response:" + response); + return ResponseEntity.ok(response.toString()); } /** @@ -374,30 +304,19 @@ public String updateVitalNurse(@RequestBody String requestObj) { */ @Operation(summary = "Update general OPD beneficiary examination data") @PostMapping(value = { "/update/examinationScreen" }) - public String updateGeneralOPDExaminationNurse(@RequestBody String requestObj) { - + public ResponseEntity updateGeneralOPDExaminationNurse(@RequestBody String requestObj) throws Exception { OutputResponse response = new OutputResponse(); logger.info("Request object for examination data updating :" + requestObj); - - JsonObject jsnOBJ = new JsonObject(); - JsonParser jsnParser = new JsonParser(); - JsonElement jsnElmnt = jsnParser.parse(requestObj); - jsnOBJ = jsnElmnt.getAsJsonObject(); - - try { - int result = generalOPDServiceImpl.updateBenExaminationDetails(jsnOBJ); - if (result > 0) { - response.setResponse("Data updated successfully"); - } else { - response.setError(500, "Unable to modify data"); - } - logger.info("Examination data update response:" + response); - } catch (Exception e) { - response.setError(5000, "Unable to modify data"); - logger.error("Error while updating examination data :" + e); + JsonObject jsnOBJ = JsonParser.parseString(requestObj).getAsJsonObject(); + int result = generalOPDServiceImpl.updateBenExaminationDetails(jsnOBJ); + if (result > 0) { + response.setResponse("Data updated successfully"); + } else { + response.setError(500, "Unable to modify data"); + return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(response.toString()); } - - return response.toString(); + logger.info("Examination data update response:" + response); + return ResponseEntity.ok(response.toString()); } /** @@ -408,31 +327,20 @@ public String updateGeneralOPDExaminationNurse(@RequestBody String requestObj) { */ @Operation(summary = "Update general OPD beneficiary case record and referral") @PostMapping(value = { "/update/doctorData" }) - public String updateGeneralOPDDoctorData(@RequestBody String requestObj, - @RequestHeader(value = "Authorization") String Authorization) { - + public ResponseEntity updateGeneralOPDDoctorData(@RequestBody String requestObj, + @RequestHeader(value = "Authorization") String Authorization) throws Exception { OutputResponse response = new OutputResponse(); logger.info("Request object for doctor data updating :" + requestObj); - - JsonObject jsnOBJ = new JsonObject(); - JsonParser jsnParser = new JsonParser(); - JsonElement jsnElmnt = jsnParser.parse(requestObj); - jsnOBJ = jsnElmnt.getAsJsonObject(); - - try { - Long result = generalOPDServiceImpl.updateGeneralOPDDoctorData(jsnOBJ, Authorization); - if (null != result && result > 0) { - response.setResponse("Data updated successfully"); - } else { - response.setError(500, "Unable to modify data"); - } - logger.info("Doctor data update response:" + response); - } catch (Exception e) { - logger.error("Unable to modify data. " + e.getMessage()); - response.setError(5000, e.getMessage()); + JsonObject jsnOBJ = JsonParser.parseString(requestObj).getAsJsonObject(); + Long result = generalOPDServiceImpl.updateGeneralOPDDoctorData(jsnOBJ, Authorization); + if (null != result && result > 0) { + response.setResponse("Data updated successfully"); + } else { + response.setError(500, "Unable to modify data"); + return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(response.toString()); } - - return response.toString(); + logger.info("Doctor data update response:" + response); + return ResponseEntity.ok(response.toString()); } } diff --git a/src/main/java/com/iemr/hwc/controller/labtechnician/LabTechnicianController.java b/src/main/java/com/iemr/hwc/controller/labtechnician/LabTechnicianController.java index f3505acf..634aa232 100644 --- a/src/main/java/com/iemr/hwc/controller/labtechnician/LabTechnicianController.java +++ b/src/main/java/com/iemr/hwc/controller/labtechnician/LabTechnicianController.java @@ -25,6 +25,8 @@ import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -65,32 +67,29 @@ public void setLabTechnicianServiceImpl(LabTechnicianServiceImpl labTechnicianSe */ @Operation(summary = "Save lab test result") @PostMapping(value = { "/save/LabTestResult" }) - public String saveLabTestResult(@RequestBody String requestObj) { + public ResponseEntity saveLabTestResult(@RequestBody String requestObj) throws Exception { OutputResponse response = new OutputResponse(); - try { - logger.info("Request object for Lab Test Result saving :" + requestObj); - - JsonObject jsnOBJ = new JsonObject(); - JsonParser jsnParser = new JsonParser(); - JsonElement jsnElmnt = jsnParser.parse(requestObj); - jsnOBJ = jsnElmnt.getAsJsonObject(); - - if (jsnOBJ != null) { - Integer labResultSaveRes = labTechnicianServiceImpl.saveLabTestResult(jsnOBJ); - if (null != labResultSaveRes && labResultSaveRes > 0) { - response.setResponse("Data saved successfully"); - } else { - response.setResponse("Unable to save data"); - } + logger.info("Request object for Lab Test Result saving :" + requestObj); + JsonObject jsnOBJ = new JsonObject(); + JsonParser jsnParser = new JsonParser(); + JsonElement jsnElmnt = jsnParser.parse(requestObj); + jsnOBJ = jsnElmnt.getAsJsonObject(); + + if (jsnOBJ != null) { + Integer labResultSaveRes = labTechnicianServiceImpl.saveLabTestResult(jsnOBJ); + if (null != labResultSaveRes && labResultSaveRes > 0) { + response.setResponse("Data saved successfully"); } else { - response.setResponse("Invalid request"); + response.setError(500, "Unable to save data"); + return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(response.toString()); } - } catch (Exception e) { - logger.error("Error while saving lab test results :" + e); - response.setError(5000, "Unable to save data"); + + } else { + response.setError(400, "Invalid request"); + return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(response.toString()); } - return response.toString(); + return ResponseEntity.ok(response.toString()); } /** @@ -100,87 +99,83 @@ public String saveLabTestResult(@RequestBody String requestObj) { */ @Operation(summary = "Get beneficiary lab test prescription") @PostMapping(value = { "/get/prescribedProceduresList" }) - public String getBeneficiaryPrescribedProcedure(@RequestBody String requestOBJ) { + public ResponseEntity getBeneficiaryPrescribedProcedure(@RequestBody String requestOBJ) throws Exception { OutputResponse response = new OutputResponse(); - try { - logger.info("Request obj to fetch lab tests :" + requestOBJ); - JsonObject jsnOBJ = new JsonObject(); - JsonParser jsnParser = new JsonParser(); - JsonElement jsnElmnt = jsnParser.parse(requestOBJ); - jsnOBJ = jsnElmnt.getAsJsonObject(); - - if (jsnOBJ != null && !jsnOBJ.isJsonNull() && jsnOBJ.has("beneficiaryRegID") && jsnOBJ.has("visitCode")) { - - String s = labTechnicianServiceImpl.getBenePrescribedProcedureDetails( - jsnOBJ.get("beneficiaryRegID").getAsLong(), jsnOBJ.get("visitCode").getAsLong()); - if (s != null) - response.setResponse(s); - else - response.setError(5000, "Error in prescribed procedure details"); - } else { - response.setError(5000, "Invalid request"); + logger.info("Request obj to fetch lab tests :" + requestOBJ); + JsonObject jsnOBJ = new JsonObject(); + JsonParser jsnParser = new JsonParser(); + JsonElement jsnElmnt = jsnParser.parse(requestOBJ); + jsnOBJ = jsnElmnt.getAsJsonObject(); + + if (jsnOBJ != null && !jsnOBJ.isJsonNull() && jsnOBJ.has("beneficiaryRegID") && jsnOBJ.has("visitCode")) { + + String s = labTechnicianServiceImpl.getBenePrescribedProcedureDetails( + jsnOBJ.get("beneficiaryRegID").getAsLong(), jsnOBJ.get("visitCode").getAsLong()); + if (s != null) + response.setResponse(s); + else { + response.setError(5000, "Error in prescribed procedure details"); + return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(response.toString()); } - } catch (Exception e) { - logger.error("Error while getting prescribed procedure data:" + e); - response.setError(5000, "Error while getting prescribed procedure data"); + } else { + response.setError(400, "Invalid request"); + return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(response.toString()); } - return response.toString(); + return ResponseEntity.ok(response.toString()); } // API for getting lab result based on beneficiaryRegID and visitCode @Operation(summary = "Get lab test result for a beneficiary visit") @PostMapping(value = { "/get/labResultForVisitcode" }) - public String getLabResultForVisitCode(@RequestBody String requestOBJ) { + public ResponseEntity getLabResultForVisitCode(@RequestBody String requestOBJ) throws Exception { OutputResponse response = new OutputResponse(); - try { - JsonObject jsnOBJ = new JsonObject(); - JsonParser jsnParser = new JsonParser(); - JsonElement jsnElmnt = jsnParser.parse(requestOBJ); - jsnOBJ = jsnElmnt.getAsJsonObject(); - - if (jsnOBJ != null && !jsnOBJ.isJsonNull() && jsnOBJ.has("beneficiaryRegID") && jsnOBJ.has("visitCode")) { - String s = labTechnicianServiceImpl.getLabResultForVisitcode(jsnOBJ.get("beneficiaryRegID").getAsLong(), - jsnOBJ.get("visitCode").getAsLong()); - - if (s != null) - response.setResponse(s); - else - response.setError(5000, "Error while getting lab report"); - } else - response.setError(5000, "Invalid request"); - } catch (Exception e) { - logger.error("Error while getting lab result for requested data:" + requestOBJ); - response.setError(5000, "Error while getting lab report"); + JsonObject jsnOBJ = new JsonObject(); + JsonParser jsnParser = new JsonParser(); + JsonElement jsnElmnt = jsnParser.parse(requestOBJ); + jsnOBJ = jsnElmnt.getAsJsonObject(); + + if (jsnOBJ != null && !jsnOBJ.isJsonNull() && jsnOBJ.has("beneficiaryRegID") && jsnOBJ.has("visitCode")) { + String s = labTechnicianServiceImpl.getLabResultForVisitcode(jsnOBJ.get("beneficiaryRegID").getAsLong(), + jsnOBJ.get("visitCode").getAsLong()); + + if (s != null) + response.setResponse(s); + else { + response.setError(5000, "Error while getting lab report"); + return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(response.toString()); + } + } else { + response.setError(400, "Invalid request"); + return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(response.toString()); } - return response.toString(); + return ResponseEntity.ok(response.toString()); } @Operation(summary = "Get procedure component mapped master data") @PostMapping(value = { "/get/fetchProcCompMapMasterData" }) - public String getProcedureComponentMappedMasterData(@RequestBody String requestOBJ) { + public ResponseEntity getProcedureComponentMappedMasterData(@RequestBody String requestOBJ) + throws Exception { OutputResponse response = new OutputResponse(); - try { - logger.info("Request obj to fetch procedure component mapped master data "); - JsonObject jsnOBJ = new JsonObject(); - JsonElement jsnElement = JsonParser.parseString(requestOBJ); - jsnOBJ = jsnElement.getAsJsonObject(); - - if (jsnOBJ != null && !jsnOBJ.isJsonNull() && jsnOBJ.has("providerServiceMapID")) { - - String s = labTechnicianServiceImpl.getProcedureComponentMappedMasterData( - jsnOBJ.get("providerServiceMapID").getAsLong()); - if (s != null) - response.setResponse(s); - else - response.setError(5000, "Error in fetching procedure component mapped master data"); - } else { - response.setError(5000, "Invalid request"); + logger.info("Request obj to fetch procedure component mapped master data "); + JsonObject jsnOBJ = new JsonObject(); + JsonElement jsnElement = JsonParser.parseString(requestOBJ); + jsnOBJ = jsnElement.getAsJsonObject(); + + if (jsnOBJ != null && !jsnOBJ.isJsonNull() && jsnOBJ.has("providerServiceMapID")) { + + String s = labTechnicianServiceImpl.getProcedureComponentMappedMasterData( + jsnOBJ.get("providerServiceMapID").getAsLong()); + if (s != null) + response.setResponse(s); + else { + response.setError(5000, "Error in fetching procedure component mapped master data"); + return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(response.toString()); } - } catch (Exception e) { - logger.error("Error while fetching procedure component mapped master data:" + e); - response.setError(5000, "Error while fetching procedure component mapped master data"); + } else { + response.setError(400, "Invalid request"); + return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(response.toString()); } - return response.toString(); + return ResponseEntity.ok(response.toString()); } } diff --git a/src/main/java/com/iemr/hwc/controller/ncdCare/NCDCareController.java b/src/main/java/com/iemr/hwc/controller/ncdCare/NCDCareController.java index 774e034a..1784efab 100644 --- a/src/main/java/com/iemr/hwc/controller/ncdCare/NCDCareController.java +++ b/src/main/java/com/iemr/hwc/controller/ncdCare/NCDCareController.java @@ -21,9 +21,6 @@ */ package com.iemr.hwc.controller.ncdCare; -import java.util.HashMap; -import java.util.Map; - import org.json.JSONObject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -37,9 +34,10 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import com.google.gson.JsonElement; import com.google.gson.JsonObject; import com.google.gson.JsonParser; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; import com.iemr.hwc.service.ncdCare.NCDCareServiceImpl; import com.iemr.hwc.utils.response.OutputResponse; @@ -65,32 +63,19 @@ public class NCDCareController { */ @Operation(summary = "Save NCD care data collected by nurse") @PostMapping(value = { "/save/nurseData" }) - public String saveBenNCDCareNurseData(@RequestBody String requestObj, + public ResponseEntity saveBenNCDCareNurseData(@RequestBody String requestObj, @RequestHeader(value = "Authorization") String Authorization) throws Exception { OutputResponse response = new OutputResponse(); if (null != requestObj) { - JsonObject jsnOBJ = new JsonObject(); - JsonParser jsnParser = new JsonParser(); - JsonElement jsnElmnt = jsnParser.parse(requestObj); - jsnOBJ = jsnElmnt.getAsJsonObject(); - - try { - logger.info("Request object for NCD Care nurse data saving :" + requestObj); - - if (jsnOBJ != null) { - String ncdCareRes = ncdCareServiceImpl.saveNCDCareNurseData(jsnOBJ, Authorization); - response.setResponse(ncdCareRes); - } else { - response.setError(5000, "Invalid Request !!!"); - } - - } catch (Exception e) { - logger.error("Error while saving NCD Care nurse data :" + e.getMessage()); - ncdCareServiceImpl.deleteVisitDetails(jsnOBJ); - response.setError(5000, e.getMessage()); - } + JsonObject jsnOBJ = JsonParser.parseString(requestObj).getAsJsonObject(); + logger.info("Request object for NCD Care nurse data saving :" + requestObj); + String ncdCareRes = ncdCareServiceImpl.saveNCDCareNurseData(jsnOBJ, Authorization); + response.setResponse(ncdCareRes); + } else { + response.setError(5000, "Invalid Request !!!"); + return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(response.toString()); } - return response.toString(); + return ResponseEntity.ok(response.toString()); } /** @@ -100,33 +85,24 @@ public String saveBenNCDCareNurseData(@RequestBody String requestObj, */ @Operation(summary = "Save NCD care beneficiary case record and referral") @PostMapping(value = { "/save/doctorData" }) - public String saveBenNCDCareDoctorData(@RequestBody String requestObj, - @RequestHeader(value = "Authorization") String Authorization) { + public ResponseEntity saveBenNCDCareDoctorData(@RequestBody String requestObj, + @RequestHeader(value = "Authorization") String Authorization) throws Exception { OutputResponse response = new OutputResponse(); - try { - logger.info("Request object for NCD Care doctor data saving :" + requestObj); - - JsonObject jsnOBJ = new JsonObject(); - JsonParser jsnParser = new JsonParser(); - JsonElement jsnElmnt = jsnParser.parse(requestObj); - jsnOBJ = jsnElmnt.getAsJsonObject(); - - if (jsnOBJ != null) { - Long ncdCareRes = ncdCareServiceImpl.saveDoctorData(jsnOBJ, Authorization); - if (null != ncdCareRes && ncdCareRes > 0) { - response.setResponse("Data saved successfully"); - } else { - response.setResponse("Unable to save data"); - } - + logger.info("Request object for NCD Care doctor data saving :" + requestObj); + JsonObject jsnOBJ = JsonParser.parseString(requestObj).getAsJsonObject(); + if (jsnOBJ != null) { + Long ncdCareRes = ncdCareServiceImpl.saveDoctorData(jsnOBJ, Authorization); + if (null != ncdCareRes && ncdCareRes > 0) { + response.setResponse("Data saved successfully"); } else { - response.setResponse("Invalid request"); + response.setResponse("Unable to save data"); + return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(response.toString()); } - } catch (Exception e) { - logger.error("Error while saving NCD Care doctor data :" + e.getMessage()); - response.setError(5000, e.getMessage()); + } else { + response.setResponse("Invalid request"); + return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(response.toString()); } - return response.toString(); + return ResponseEntity.ok(response.toString()); } /** @@ -137,29 +113,24 @@ public String saveBenNCDCareDoctorData(@RequestBody String requestObj, @Operation(summary = "Get NCD care beneficiary visit details") @PostMapping(value = { "/getBenVisitDetailsFrmNurseNCDCare" }) @Transactional(rollbackFor = Exception.class) - public String getBenVisitDetailsFrmNurseNCDCare( - @Param(value = "{\"benRegID\":\"Long\",\"visitCode\":\"Long\"}") @RequestBody String comingRequest) { + public ResponseEntity getBenVisitDetailsFrmNurseNCDCare( + @Param(value = "{\"benRegID\":\"Long\",\"visitCode\":\"Long\"}") @RequestBody String comingRequest) + throws Exception { OutputResponse response = new OutputResponse(); - logger.info("Request object for NCD Care visit data fetching :" + comingRequest); - try { - JSONObject obj = new JSONObject(comingRequest); - if (obj.length() > 1) { - Long benRegID = obj.getLong("benRegID"); - Long visitCode = obj.getLong("visitCode"); - - String res = ncdCareServiceImpl.getBenVisitDetailsFrmNurseNCDCare(benRegID, visitCode); - response.setResponse(res); - } else { - logger.info("Invalid request"); - response.setError(5000, "Invalid request"); - } - logger.info("NCD Care visit data fetching Response:" + response); - } catch (Exception e) { - response.setError(5000, "Error while getting beneficiary visit data"); - logger.error("Error while getting beneficiary visit data :" + e); + JSONObject obj = new JSONObject(comingRequest); + if (obj.length() > 1 && obj.has("benRegID") && obj.has("visitCode")) { + Long benRegID = obj.getLong("benRegID"); + Long visitCode = obj.getLong("visitCode"); + String res = ncdCareServiceImpl.getBenVisitDetailsFrmNurseNCDCare(benRegID, visitCode); + response.setResponse(res); + } else { + logger.info("Invalid request"); + response.setError(5000, "Invalid request"); + return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(response.toString()); } - return response.toString(); + logger.info("NCD Care visit data fetching Response:" + response); + return ResponseEntity.ok(response.toString()); } /** @@ -169,29 +140,23 @@ public String getBenVisitDetailsFrmNurseNCDCare( */ @Operation(summary = "Get NCD Care beneficiary history") @PostMapping(value = { "/getBenNCDCareHistoryDetails" }) - - public String getBenNCDCareHistoryDetails( - @Param(value = "{\"benRegID\":\"Long\",\"visitCode\":\"Long\"}") @RequestBody String comingRequest) { + public ResponseEntity getBenNCDCareHistoryDetails( + @Param(value = "{\"benRegID\":\"Long\",\"visitCode\":\"Long\"}") @RequestBody String comingRequest) + throws Exception { OutputResponse response = new OutputResponse(); - logger.info("Request object for NCD Care history data fetching :" + comingRequest); - try { - JSONObject obj = new JSONObject(comingRequest); - if (obj.has("benRegID") && obj.has("visitCode")) { - Long benRegID = obj.getLong("benRegID"); - Long visitCode = obj.getLong("visitCode"); - - String s = ncdCareServiceImpl.getBenNCDCareHistoryDetails(benRegID, visitCode); - response.setResponse(s); - } else { - response.setError(5000, "Invalid request"); - } - logger.info("NCD Care history data fetching Response:" + response); - } catch (Exception e) { - response.setError(5000, "Error while getting beneficiary history data"); - logger.error("Error while getting beneficiary history data :" + e); + JSONObject obj = new JSONObject(comingRequest); + if (obj.has("benRegID") && obj.has("visitCode")) { + Long benRegID = obj.getLong("benRegID"); + Long visitCode = obj.getLong("visitCode"); + String s = ncdCareServiceImpl.getBenNCDCareHistoryDetails(benRegID, visitCode); + response.setResponse(s); + } else { + response.setError(5000, "Invalid request"); + return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(response.toString()); } - return response.toString(); + logger.info("NCD Care history data fetching Response:" + response); + return ResponseEntity.ok(response.toString()); } /** @@ -201,29 +166,24 @@ public String getBenNCDCareHistoryDetails( */ @Operation(summary = "Get NCD Care beneficiary vitals") @PostMapping(value = { "/getBenVitalDetailsFrmNurseNCDCare" }) - public String getBenVitalDetailsFrmNurseNCDCare( - @Param(value = "{\"benRegID\":\"Long\",\"visitCode\":\"Long\"}") @RequestBody String comingRequest) { + public ResponseEntity getBenVitalDetailsFrmNurseNCDCare( + @Param(value = "{\"benRegID\":\"Long\",\"visitCode\":\"Long\"}") @RequestBody String comingRequest) + throws Exception { OutputResponse response = new OutputResponse(); - logger.info("Request object for NCD Care vital data fetching :" + comingRequest); - try { - JSONObject obj = new JSONObject(comingRequest); - if (obj.has("benRegID") && obj.has("visitCode")) { - Long benRegID = obj.getLong("benRegID"); - Long visitCode = obj.getLong("visitCode"); - - String res = ncdCareServiceImpl.getBeneficiaryVitalDetails(benRegID, visitCode); - response.setResponse(res); - } else { - logger.info("Invalid request"); - response.setError(5000, "Invalid request"); - } - logger.info("NCD Care vital data fetching Response:" + response); - } catch (Exception e) { - response.setError(5000, "Error while getting beneficiary vital data"); - logger.error("Error while getting beneficiary vital data :" + e); + JSONObject obj = new JSONObject(comingRequest); + if (obj.has("benRegID") && obj.has("visitCode")) { + Long benRegID = obj.getLong("benRegID"); + Long visitCode = obj.getLong("visitCode"); + String res = ncdCareServiceImpl.getBeneficiaryVitalDetails(benRegID, visitCode); + response.setResponse(res); + } else { + logger.info("Invalid request"); + response.setError(5000, "Invalid request"); + return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(response.toString()); } - return response.toString(); + logger.info("NCD Care vital data fetching Response:" + response); + return ResponseEntity.ok(response.toString()); } /** @@ -234,29 +194,24 @@ public String getBenVitalDetailsFrmNurseNCDCare( @Operation(summary = "Get NCD care beneficiary case record and referral") @PostMapping(value = { "/getBenCaseRecordFromDoctorNCDCare" }) @Transactional(rollbackFor = Exception.class) - public String getBenCaseRecordFromDoctorNCDCare( - @Param(value = "{\"benRegID\":\"Long\",\"visitCode\":\"Long\"}") @RequestBody String comingRequest) { + public ResponseEntity getBenCaseRecordFromDoctorNCDCare( + @Param(value = "{\"benRegID\":\"Long\",\"visitCode\":\"Long\"}") @RequestBody String comingRequest) + throws Exception { OutputResponse response = new OutputResponse(); - logger.info("Request object for NCD Care doctor data fetching :" + comingRequest); - try { - JSONObject obj = new JSONObject(comingRequest); - if (null != obj && obj.length() > 1 && obj.has("benRegID") && obj.has("visitCode")) { - Long benRegID = obj.getLong("benRegID"); - Long visitCode = obj.getLong("visitCode"); - - String res = ncdCareServiceImpl.getBenCaseRecordFromDoctorNCDCare(benRegID, visitCode); - response.setResponse(res); - } else { - logger.info("Invalid request"); - response.setError(5000, "Invalid request"); - } - logger.info("NCD Care doctor data fetching Response:" + response); - } catch (Exception e) { - response.setError(5000, "Error while getting beneficiary doctor data"); - logger.error("Error while getting beneficiary doctor data :" + e); + JSONObject obj = new JSONObject(comingRequest); + if (null != obj && obj.length() > 1 && obj.has("benRegID") && obj.has("visitCode")) { + Long benRegID = obj.getLong("benRegID"); + Long visitCode = obj.getLong("visitCode"); + String res = ncdCareServiceImpl.getBenCaseRecordFromDoctorNCDCare(benRegID, visitCode); + response.setResponse(res); + } else { + logger.info("Invalid request"); + response.setError(5000, "Invalid request"); + return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(response.toString()); } - return response.toString(); + logger.info("NCD Care doctor data fetching Response:" + response); + return ResponseEntity.ok(response.toString()); } /** @@ -268,32 +223,19 @@ public String getBenCaseRecordFromDoctorNCDCare( */ @Operation(summary = "Update NCD care beneficiary history") @PostMapping(value = { "/update/historyScreen" }) - public String updateHistoryNurse(@RequestBody String requestObj) { - + public ResponseEntity updateHistoryNurse(@RequestBody String requestObj) throws Exception { OutputResponse response = new OutputResponse(); logger.info("Request object for history data updating :" + requestObj); - - JsonObject jsnOBJ = new JsonObject(); - JsonParser jsnParser = new JsonParser(); - JsonElement jsnElmnt = jsnParser.parse(requestObj); - jsnOBJ = jsnElmnt.getAsJsonObject(); - - try { - int result = ncdCareServiceImpl.updateBenHistoryDetails(jsnOBJ); - if (result > 0) { - Map resMap = new HashMap(); - resMap.put("result", result); - response.setResponse("Data updated successfully"); - } else { - response.setError(500, "Unable to modify data"); - } - logger.info("History data update Response:" + response); - } catch (Exception e) { - response.setError(5000, "Unable to modify data"); - logger.error("Error while updating history data :" + e); + JsonObject jsnOBJ = JsonParser.parseString(requestObj).getAsJsonObject(); + int result = ncdCareServiceImpl.updateBenHistoryDetails(jsnOBJ); + if (result > 0) { + response.setResponse("Data updated successfully"); + } else { + response.setError(500, "Unable to modify data"); + return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(response.toString()); } - - return response.toString(); + logger.info("History data update Response:" + response); + return ResponseEntity.ok(response.toString()); } /** @@ -305,30 +247,19 @@ public String updateHistoryNurse(@RequestBody String requestObj) { */ @Operation(summary = "Update NCD care beneficiary vitals") @PostMapping(value = { "/update/vitalScreen" }) - public String updateVitalNurse(@RequestBody String requestObj) { - + public ResponseEntity updateVitalNurse(@RequestBody String requestObj) throws Exception { OutputResponse response = new OutputResponse(); logger.info("Request object for vital data updating :" + requestObj); - - JsonObject jsnOBJ = new JsonObject(); - JsonParser jsnParser = new JsonParser(); - JsonElement jsnElmnt = jsnParser.parse(requestObj); - jsnOBJ = jsnElmnt.getAsJsonObject(); - - try { - int result = ncdCareServiceImpl.updateBenVitalDetails(jsnOBJ); - if (result > 0) { - response.setResponse("Data updated successfully"); - } else { - response.setError(500, "Unable to modify data"); - } - logger.info("Vital data update Response:" + response); - } catch (Exception e) { - response.setError(5000, "Unable to modify data"); - logger.error("Error while updating vital data :" + e); + JsonObject jsnOBJ = JsonParser.parseString(requestObj).getAsJsonObject(); + int result = ncdCareServiceImpl.updateBenVitalDetails(jsnOBJ); + if (result > 0) { + response.setResponse("Data updated successfully"); + } else { + response.setError(500, "Unable to modify data"); + return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(response.toString()); } - - return response.toString(); + logger.info("Vital data update Response:" + response); + return ResponseEntity.ok(response.toString()); } /** @@ -339,31 +270,20 @@ public String updateVitalNurse(@RequestBody String requestObj) { */ @Operation(summary = "Update NCD care beneficiary case record and referral") @PostMapping(value = { "/update/doctorData" }) - public String updateNCDCareDoctorData(@RequestBody String requestObj, - @RequestHeader(value = "Authorization") String Authorization) { - + public ResponseEntity updateNCDCareDoctorData(@RequestBody String requestObj, + @RequestHeader(value = "Authorization") String Authorization) throws Exception { OutputResponse response = new OutputResponse(); logger.info("Request object for doctor data updating :" + requestObj); - - JsonObject jsnOBJ = new JsonObject(); - JsonParser jsnParser = new JsonParser(); - JsonElement jsnElmnt = jsnParser.parse(requestObj); - jsnOBJ = jsnElmnt.getAsJsonObject(); - - try { - Long result = ncdCareServiceImpl.updateNCDCareDoctorData(jsnOBJ, Authorization); - if (null != result && result > 0) { - response.setResponse("Data updated successfully"); - } else { - response.setError(500, "Unable to modify data"); - } - logger.info("Doctor data update Response:" + response); - } catch (Exception e) { - logger.error("Unable to modify data. " + e.getMessage()); - response.setError(5000, e.getMessage()); + JsonObject jsnOBJ = JsonParser.parseString(requestObj).getAsJsonObject(); + Long result = ncdCareServiceImpl.updateNCDCareDoctorData(jsnOBJ, Authorization); + if (null != result && result > 0) { + response.setResponse("Data updated successfully"); + } else { + response.setError(500, "Unable to modify data"); + return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(response.toString()); } - - return response.toString(); + logger.info("Doctor data update Response:" + response); + return ResponseEntity.ok(response.toString()); } } diff --git a/src/main/java/com/iemr/hwc/controller/pnc/PostnatalCareController.java b/src/main/java/com/iemr/hwc/controller/pnc/PostnatalCareController.java index a6fc2ed4..e90dcfc7 100644 --- a/src/main/java/com/iemr/hwc/controller/pnc/PostnatalCareController.java +++ b/src/main/java/com/iemr/hwc/controller/pnc/PostnatalCareController.java @@ -32,14 +32,14 @@ import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestHeader; import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RestController; -import com.google.gson.JsonElement; import com.google.gson.JsonObject; import com.google.gson.JsonParser; import com.iemr.hwc.service.pnc.PNCServiceImpl; import com.iemr.hwc.utils.response.OutputResponse; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; import io.swagger.v3.oas.annotations.Operation; @@ -67,33 +67,19 @@ public void setPncServiceImpl(PNCServiceImpl pncServiceImpl) { */ @Operation(summary = "Save PNC nurse data") @PostMapping(value = { "/save/nurseData" }) - public String saveBenPNCNurseData(@RequestBody String requestObj, + public ResponseEntity saveBenPNCNurseData(@RequestBody String requestObj, @RequestHeader(value = "Authorization") String Authorization) throws Exception { OutputResponse response = new OutputResponse(); - if (null != requestObj) { - JsonObject jsnOBJ = new JsonObject(); - JsonParser jsnParser = new JsonParser(); - JsonElement jsnElmnt = jsnParser.parse(requestObj); - jsnOBJ = jsnElmnt.getAsJsonObject(); - - try { - logger.info("Request object for PNC nurse data saving :" + requestObj); - - if (jsnOBJ != null) { - String ancRes = pncServiceImpl.savePNCNurseData(jsnOBJ, Authorization); - response.setResponse(ancRes); - } else { - response.setError(5000, "Invalid request"); - } - - } catch (Exception e) { - logger.error("Error while saving nurse data :" + e.getMessage()); - pncServiceImpl.deleteVisitDetails(jsnOBJ); - response.setError(5000, e.getMessage()); - } + JsonObject jsnOBJ = JsonParser.parseString(requestObj).getAsJsonObject(); + logger.info("Request object for PNC nurse data saving :" + requestObj); + String ancRes = pncServiceImpl.savePNCNurseData(jsnOBJ, Authorization); + response.setResponse(ancRes); + } else { + response.setError(5000, "Invalid request"); + return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(response.toString()); } - return response.toString(); + return ResponseEntity.ok(response.toString()); } /** @@ -103,32 +89,24 @@ public String saveBenPNCNurseData(@RequestBody String requestObj, */ @Operation(summary = "Save PNC doctor data") @PostMapping(value = { "/save/doctorData" }) - public String saveBenPNCDoctorData(@RequestBody String requestObj, - @RequestHeader(value = "Authorization") String Authorization) { + public ResponseEntity saveBenPNCDoctorData(@RequestBody String requestObj, + @RequestHeader(value = "Authorization") String Authorization) throws Exception { OutputResponse response = new OutputResponse(); - try { - logger.info("Request object for PNC doctor data saving :" + requestObj); - - JsonObject jsnOBJ = new JsonObject(); - JsonParser jsnParser = new JsonParser(); - JsonElement jsnElmnt = jsnParser.parse(requestObj); - jsnOBJ = jsnElmnt.getAsJsonObject(); - if (jsnOBJ != null) { - Long r = pncServiceImpl.savePNCDoctorData(jsnOBJ, Authorization); - if (r != null && r > 0) { - response.setResponse("Data saved successfully"); - } else { - response.setError(5000, "Unable to save data"); - } + logger.info("Request object for PNC doctor data saving :" + requestObj); + JsonObject jsnOBJ = JsonParser.parseString(requestObj).getAsJsonObject(); + if (jsnOBJ != null) { + Long r = pncServiceImpl.savePNCDoctorData(jsnOBJ, Authorization); + if (r != null && r > 0) { + response.setResponse("Data saved successfully"); } else { - response.setError(5000, "Invalid request"); + response.setError(5000, "Unable to save data"); + return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(response.toString()); } - - } catch (Exception e) { - logger.error("Error while saving doctor data :" + e.getMessage()); - response.setError(5000, e.getMessage()); + } else { + response.setError(5000, "Invalid request"); + return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(response.toString()); } - return response.toString(); + return ResponseEntity.ok(response.toString()); } /** @@ -139,29 +117,24 @@ public String saveBenPNCDoctorData(@RequestBody String requestObj, @Operation(summary = "Get PNC beneficiary visit details from nurse") @PostMapping(value = { "/getBenVisitDetailsFrmNursePNC" }) @Transactional(rollbackFor = Exception.class) - public String getBenVisitDetailsFrmNursePNC( - @Param(value = "{\"benRegID\":\"Long\",\"visitCode\":\"Long\"}") @RequestBody String comingRequest) { + public ResponseEntity getBenVisitDetailsFrmNursePNC( + @Param(value = "{\"benRegID\":\"Long\",\"visitCode\":\"Long\"}") @RequestBody String comingRequest) + throws Exception { OutputResponse response = new OutputResponse(); - logger.info("PNC visit data fetch request:" + comingRequest); - try { - JSONObject obj = new JSONObject(comingRequest); - if (obj.length() > 1) { - Long benRegID = obj.getLong("benRegID"); - Long visitCode = obj.getLong("visitCode"); - - String res = pncServiceImpl.getBenVisitDetailsFrmNursePNC(benRegID, visitCode); - response.setResponse(res); - } else { - logger.info("Invalid request"); - response.setError(5000, "Invalid request"); - } - logger.info("PNC visit data fetch response:" + response); - } catch (Exception e) { - response.setError(5000, "Error while getting beneficiary visit data"); - logger.error("Error while getting beneficiary visit data :" + e); + JSONObject obj = new JSONObject(comingRequest); + if (obj.length() > 1 && obj.has("benRegID") && obj.has("visitCode")) { + Long benRegID = obj.getLong("benRegID"); + Long visitCode = obj.getLong("visitCode"); + String res = pncServiceImpl.getBenVisitDetailsFrmNursePNC(benRegID, visitCode); + response.setResponse(res); + } else { + logger.info("Invalid request"); + response.setError(5000, "Invalid request"); + return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(response.toString()); } - return response.toString(); + logger.info("PNC visit data fetch response:" + response); + return ResponseEntity.ok(response.toString()); } /** @@ -172,32 +145,26 @@ public String getBenVisitDetailsFrmNursePNC( @Operation(summary = "Get PNC beneficiary details from nurse") @PostMapping(value = { "/getBenPNCDetailsFrmNursePNC" }) @Transactional(rollbackFor = Exception.class) - public String getBenPNCDetailsFrmNursePNC( - @Param(value = "{\"benRegID\":\"Long\",\"visitCode\":\"Long\"}") @RequestBody String comingRequest) { + public ResponseEntity getBenPNCDetailsFrmNursePNC( + @Param(value = "{\"benRegID\":\"Long\",\"visitCode\":\"Long\"}") @RequestBody String comingRequest) + throws Exception { OutputResponse response = new OutputResponse(); - logger.info("PNC Care data fetch request:" + comingRequest); - try { - JSONObject obj = new JSONObject(comingRequest); - Long visitCode = null; - if (obj.has("benRegID")) { - Long benRegID = obj.getLong("benRegID"); - - if (obj.has("visitCode") && !obj.isNull("visitCode") && obj.get("visitCode") != null) - visitCode = obj.getLong("visitCode"); - - String res = pncServiceImpl.getBenPNCDetailsFrmNursePNC(benRegID, visitCode); - response.setResponse(res); - } else { - logger.info("Invalid request"); - response.setError(5000, "Invalid request"); - } - logger.info("PNC Care data fetch response:" + response); - } catch (Exception e) { - response.setError(5000, "Error while getting beneficiary PNC Care data"); - logger.error("Error while getting beneficiary PNC Care data :" + e); + JSONObject obj = new JSONObject(comingRequest); + Long visitCode = null; + if (obj.has("benRegID")) { + Long benRegID = obj.getLong("benRegID"); + if (obj.has("visitCode") && !obj.isNull("visitCode") && obj.get("visitCode") != null) + visitCode = obj.getLong("visitCode"); + String res = pncServiceImpl.getBenPNCDetailsFrmNursePNC(benRegID, visitCode); + response.setResponse(res); + } else { + logger.info("Invalid request"); + response.setError(5000, "Invalid request"); + return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(response.toString()); } - return response.toString(); + logger.info("PNC Care data fetch response:" + response); + return ResponseEntity.ok(response.toString()); } /** @@ -207,29 +174,23 @@ public String getBenPNCDetailsFrmNursePNC( */ @Operation(summary = "Get PNC bneficiary history from nurse") @PostMapping(value = { "/getBenHistoryDetails" }) - - public String getBenHistoryDetails( - @Param(value = "{\"benRegID\":\"Long\",\"visitCode\":\"Long\"}") @RequestBody String comingRequest) { + public ResponseEntity getBenHistoryDetails( + @Param(value = "{\"benRegID\":\"Long\",\"visitCode\":\"Long\"}") @RequestBody String comingRequest) + throws Exception { OutputResponse response = new OutputResponse(); - logger.info("History data fetch request:" + comingRequest); - try { - JSONObject obj = new JSONObject(comingRequest); - if (obj.has("benRegID") && obj.has("visitCode")) { - Long benRegID = obj.getLong("benRegID"); - Long visitCode = obj.getLong("visitCode"); - - String s = pncServiceImpl.getBenHistoryDetails(benRegID, visitCode); - response.setResponse(s); - } else { - response.setError(5000, "Invalid request"); - } - logger.info("History data fetch response :" + response); - } catch (Exception e) { - response.setError(5000, "Error while getting beneficiary history data"); - logger.error("Error while getting beneficiary history data :" + e); + JSONObject obj = new JSONObject(comingRequest); + if (obj.has("benRegID") && obj.has("visitCode")) { + Long benRegID = obj.getLong("benRegID"); + Long visitCode = obj.getLong("visitCode"); + String s = pncServiceImpl.getBenHistoryDetails(benRegID, visitCode); + response.setResponse(s); + } else { + response.setError(5000, "Invalid request"); + return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(response.toString()); } - return response.toString(); + logger.info("History data fetch response :" + response); + return ResponseEntity.ok(response.toString()); } /** @@ -239,29 +200,24 @@ public String getBenHistoryDetails( */ @Operation(summary = "Get PNC beneficiary vitals from nurse") @PostMapping(value = { "/getBenVitalDetailsFrmNurse" }) - public String getBenVitalDetailsFrmNurse( - @Param(value = "{\"benRegID\":\"Long\",\"visitCode\":\"Long\"}") @RequestBody String comingRequest) { + public ResponseEntity getBenVitalDetailsFrmNurse( + @Param(value = "{\"benRegID\":\"Long\",\"visitCode\":\"Long\"}") @RequestBody String comingRequest) + throws Exception { OutputResponse response = new OutputResponse(); - logger.info("vital data fetch request:" + comingRequest); - try { - JSONObject obj = new JSONObject(comingRequest); - if (obj.has("benRegID") && obj.has("visitCode")) { - Long benRegID = obj.getLong("benRegID"); - Long visitCode = obj.getLong("visitCode"); - - String res = pncServiceImpl.getBeneficiaryVitalDetails(benRegID, visitCode); - response.setResponse(res); - } else { - logger.info("Invalid request"); - response.setError(5000, "Invalid request"); - } - logger.info("Vital data fetch response:" + response); - } catch (Exception e) { - response.setError(5000, "Error while getting beneficiary vital data"); - logger.error("Error while getting beneficiary vital data :" + e); + JSONObject obj = new JSONObject(comingRequest); + if (obj.has("benRegID") && obj.has("visitCode")) { + Long benRegID = obj.getLong("benRegID"); + Long visitCode = obj.getLong("visitCode"); + String res = pncServiceImpl.getBeneficiaryVitalDetails(benRegID, visitCode); + response.setResponse(res); + } else { + logger.info("Invalid request"); + response.setError(5000, "Invalid request"); + return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(response.toString()); } - return response.toString(); + logger.info("Vital data fetch response:" + response); + return ResponseEntity.ok(response.toString()); } /** @@ -271,29 +227,23 @@ public String getBenVitalDetailsFrmNurse( */ @Operation(summary = "Get PNC beneficiary examination details from nurse") @PostMapping(value = { "/getBenExaminationDetailsPNC" }) - - public String getBenExaminationDetailsPNC( - @Param(value = "{\"benRegID\":\"Long\",\"visitCode\":\"Long\"}") @RequestBody String comingRequest) { + public ResponseEntity getBenExaminationDetailsPNC( + @Param(value = "{\"benRegID\":\"Long\",\"visitCode\":\"Long\"}") @RequestBody String comingRequest) + throws Exception { OutputResponse response = new OutputResponse(); - logger.info("PNC examination data fetch request:" + comingRequest); - try { - JSONObject obj = new JSONObject(comingRequest); - if (obj.has("benRegID") && obj.has("visitCode")) { - Long benRegID = obj.getLong("benRegID"); - Long visitCode = obj.getLong("visitCode"); - - String s = pncServiceImpl.getPNCExaminationDetailsData(benRegID, visitCode); - response.setResponse(s); - } else { - response.setError(5000, "Invalid request"); - } - logger.info("Examination data fetch response :" + response); - } catch (Exception e) { - response.setError(5000, "Error while getting beneficiary examination data"); - logger.error("Error while getting beneficiary examination data :" + e); + JSONObject obj = new JSONObject(comingRequest); + if (obj.has("benRegID") && obj.has("visitCode")) { + Long benRegID = obj.getLong("benRegID"); + Long visitCode = obj.getLong("visitCode"); + String s = pncServiceImpl.getPNCExaminationDetailsData(benRegID, visitCode); + response.setResponse(s); + } else { + response.setError(5000, "Invalid request"); + return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(response.toString()); } - return response.toString(); + logger.info("Examination data fetch response :" + response); + return ResponseEntity.ok(response.toString()); } /** @@ -304,29 +254,24 @@ public String getBenExaminationDetailsPNC( @Operation(summary = "Get PNC beneficiary case record") @PostMapping(value = { "/getBenCaseRecordFromDoctorPNC" }) @Transactional(rollbackFor = Exception.class) - public String getBenCaseRecordFromDoctorPNC( - @Param(value = "{\"benRegID\":\"Long\",\"visitCode\":\"Long\"}") @RequestBody String comingRequest) { + public ResponseEntity getBenCaseRecordFromDoctorPNC( + @Param(value = "{\"benRegID\":\"Long\",\"visitCode\":\"Long\"}") @RequestBody String comingRequest) + throws Exception { OutputResponse response = new OutputResponse(); - logger.info("PNC doctor data fetch request:" + comingRequest); - try { - JSONObject obj = new JSONObject(comingRequest); - if (null != obj && obj.length() > 1 && obj.has("benRegID") && obj.has("visitCode")) { - Long benRegID = obj.getLong("benRegID"); - Long visitCode = obj.getLong("visitCode"); - - String res = pncServiceImpl.getBenCaseRecordFromDoctorPNC(benRegID, visitCode); - response.setResponse(res); - } else { - logger.info("Invalid request"); - response.setError(5000, "Invalid request"); - } - logger.info("Doctor data fetch response:" + response); - } catch (Exception e) { - response.setError(5000, "Error while getting beneficiary doctor data"); - logger.error("Error while getting beneficiary doctor data:" + e); + JSONObject obj = new JSONObject(comingRequest); + if (null != obj && obj.length() > 1 && obj.has("benRegID") && obj.has("visitCode")) { + Long benRegID = obj.getLong("benRegID"); + Long visitCode = obj.getLong("visitCode"); + String res = pncServiceImpl.getBenCaseRecordFromDoctorPNC(benRegID, visitCode); + response.setResponse(res); + } else { + logger.info("Invalid request"); + response.setError(5000, "Invalid request"); + return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(response.toString()); } - return response.toString(); + logger.info("Doctor data fetch response:" + response); + return ResponseEntity.ok(response.toString()); } /** @@ -338,30 +283,19 @@ public String getBenCaseRecordFromDoctorPNC( */ @Operation(summary = "Update PNC doctor data") @PostMapping(value = { "/update/PNCScreen" }) - public String updatePNCCareNurse(@RequestBody String requestObj) { - + public ResponseEntity updatePNCCareNurse(@RequestBody String requestObj) throws Exception { OutputResponse response = new OutputResponse(); logger.info("PNC Care data update request:" + requestObj); - - JsonObject jsnOBJ = new JsonObject(); - JsonParser jsnParser = new JsonParser(); - JsonElement jsnElmnt = jsnParser.parse(requestObj); - jsnOBJ = jsnElmnt.getAsJsonObject(); - - try { - int result = pncServiceImpl.updateBenPNCDetails(jsnOBJ); - if (result > 0) { - response.setResponse("Data updated successfully"); - } else { - response.setError(500, "Unable to modify data"); - } - logger.info("PNC Care data update response:" + response); - } catch (Exception e) { - response.setError(5000, "Unable to modify data"); - logger.error("Error while updating PNC Care :" + e); + JsonObject jsnOBJ = JsonParser.parseString(requestObj).getAsJsonObject(); + int result = pncServiceImpl.updateBenPNCDetails(jsnOBJ); + if (result > 0) { + response.setResponse("Data updated successfully"); + } else { + response.setError(500, "Unable to modify data"); + return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(response.toString()); } - - return response.toString(); + logger.info("PNC Care data update response:" + response); + return ResponseEntity.ok(response.toString()); } /** @@ -373,30 +307,19 @@ public String updatePNCCareNurse(@RequestBody String requestObj) { */ @Operation(summary = "Update PNC beneficiary history") @PostMapping(value = { "/update/historyScreen" }) - public String updateHistoryNurse(@RequestBody String requestObj) { - + public ResponseEntity updateHistoryNurse(@RequestBody String requestObj) throws Exception { OutputResponse response = new OutputResponse(); logger.info("History data update request:" + requestObj); - - JsonObject jsnOBJ = new JsonObject(); - JsonParser jsnParser = new JsonParser(); - JsonElement jsnElmnt = jsnParser.parse(requestObj); - jsnOBJ = jsnElmnt.getAsJsonObject(); - - try { - int result = pncServiceImpl.updateBenHistoryDetails(jsnOBJ); - if (result > 0) { - response.setResponse("Data updated successfully"); - } else { - response.setError(500, "Unable to modify data"); - } - logger.info("History data update response:" + response); - } catch (Exception e) { - response.setError(5000, "Unable to modify data"); - logger.error("Error while updating history data :" + e); + JsonObject jsnOBJ = JsonParser.parseString(requestObj).getAsJsonObject(); + int result = pncServiceImpl.updateBenHistoryDetails(jsnOBJ); + if (result > 0) { + response.setResponse("Data updated successfully"); + } else { + response.setError(500, "Unable to modify data"); + return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(response.toString()); } - - return response.toString(); + logger.info("History data update response:" + response); + return ResponseEntity.ok(response.toString()); } /** @@ -408,30 +331,19 @@ public String updateHistoryNurse(@RequestBody String requestObj) { */ @Operation(summary = "Update PNC beneficiary vitals") @PostMapping(value = { "/update/vitalScreen" }) - public String updateVitalNurse(@RequestBody String requestObj) { - + public ResponseEntity updateVitalNurse(@RequestBody String requestObj) throws Exception { OutputResponse response = new OutputResponse(); logger.info("Vital data update request:" + requestObj); - - JsonObject jsnOBJ = new JsonObject(); - JsonParser jsnParser = new JsonParser(); - JsonElement jsnElmnt = jsnParser.parse(requestObj); - jsnOBJ = jsnElmnt.getAsJsonObject(); - - try { - int result = pncServiceImpl.updateBenVitalDetails(jsnOBJ); - if (result > 0) { - response.setResponse("Data updated successfully"); - } else { - response.setError(500, "Unable to modify data"); - } - logger.info("Vital data update response:" + response); - } catch (Exception e) { - response.setError(5000, "Unable to modify data"); - logger.error("Error while updating vital data :" + e); + JsonObject jsnOBJ = JsonParser.parseString(requestObj).getAsJsonObject(); + int result = pncServiceImpl.updateBenVitalDetails(jsnOBJ); + if (result > 0) { + response.setResponse("Data updated successfully"); + } else { + response.setError(500, "Unable to modify data"); + return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(response.toString()); } - - return response.toString(); + logger.info("Vital data update response:" + response); + return ResponseEntity.ok(response.toString()); } /** @@ -443,58 +355,36 @@ public String updateVitalNurse(@RequestBody String requestObj) { */ @Operation(summary = "Update PNC examination data") @PostMapping(value = { "/update/examinationScreen" }) - public String updateGeneralOPDExaminationNurse(@RequestBody String requestObj) { - + public ResponseEntity updateGeneralOPDExaminationNurse(@RequestBody String requestObj) throws Exception { OutputResponse response = new OutputResponse(); logger.info("Examination data update request:" + requestObj); - - JsonObject jsnOBJ = new JsonObject(); - JsonParser jsnParser = new JsonParser(); - JsonElement jsnElmnt = jsnParser.parse(requestObj); - jsnOBJ = jsnElmnt.getAsJsonObject(); - - try { - int result = pncServiceImpl.updateBenExaminationDetails(jsnOBJ); - if (result > 0) { - response.setResponse("Data updated successfully"); - } else { - response.setError(500, "Unable to modify data"); - } - logger.info("Examination data update response:" + response); - } catch (Exception e) { - response.setError(5000, "Unable to modify data"); - logger.error("Error while updating examination data :" + e); + JsonObject jsnOBJ = JsonParser.parseString(requestObj).getAsJsonObject(); + int result = pncServiceImpl.updateBenExaminationDetails(jsnOBJ); + if (result > 0) { + response.setResponse("Data updated successfully"); + } else { + response.setError(500, "Unable to modify data"); + return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(response.toString()); } - - return response.toString(); + logger.info("Examination data update response:" + response); + return ResponseEntity.ok(response.toString()); } @Operation(summary = "Update PNC doctor data") @PostMapping(value = { "/update/doctorData" }) - public String updatePNCDoctorData(@RequestBody String requestObj, - @RequestHeader(value = "Authorization") String Authorization) { - + public ResponseEntity updatePNCDoctorData(@RequestBody String requestObj, + @RequestHeader(value = "Authorization") String Authorization) throws Exception { OutputResponse response = new OutputResponse(); logger.info("Doctor data update request:" + requestObj); - - JsonObject jsnOBJ = new JsonObject(); - JsonParser jsnParser = new JsonParser(); - JsonElement jsnElmnt = jsnParser.parse(requestObj); - jsnOBJ = jsnElmnt.getAsJsonObject(); - - try { - Long result = pncServiceImpl.updatePNCDoctorData(jsnOBJ, Authorization); - if (null != result && result > 0) { - response.setResponse("Data updated successfully"); - } else { - response.setError(500, "Unable to modify data"); - } - logger.info("Doctor data update response:" + response); - } catch (Exception e) { - logger.error("Unable to modify data. " + e.getMessage()); - response.setError(5000, e.getMessage()); + JsonObject jsnOBJ = JsonParser.parseString(requestObj).getAsJsonObject(); + Long result = pncServiceImpl.updatePNCDoctorData(jsnOBJ, Authorization); + if (null != result && result > 0) { + response.setResponse("Data updated successfully"); + } else { + response.setError(500, "Unable to modify data"); + return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(response.toString()); } - - return response.toString(); + logger.info("Doctor data update response:" + response); + return ResponseEntity.ok(response.toString()); } } diff --git a/src/main/java/com/iemr/hwc/controller/registrar/main/RegistrarController.java b/src/main/java/com/iemr/hwc/controller/registrar/main/RegistrarController.java index 43e84b0b..7a45f6d1 100644 --- a/src/main/java/com/iemr/hwc/controller/registrar/main/RegistrarController.java +++ b/src/main/java/com/iemr/hwc/controller/registrar/main/RegistrarController.java @@ -30,7 +30,8 @@ import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.repository.query.Param; - +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestHeader; @@ -84,174 +85,139 @@ public void setNurseServiceImpl(NurseServiceImpl nurseServiceImpl) { // Registrar Work List API ..... @Operation(summary = "Get registrar worklist data") @PostMapping(value = { "/registrarWorkListData" }) - public String getRegistrarWorkList(@Param(value = "{\"spID\": \"Integer\"}") @RequestBody String comingRequest) + public ResponseEntity getRegistrarWorkList( + @Param(value = "{\"spID\": \"Integer\"}") @RequestBody String comingRequest) throws JSONException { OutputResponse response = new OutputResponse(); logger.info("getRegistrarWorkList request:" + comingRequest); - try { - - JSONObject obj = new JSONObject(comingRequest); - response.setResponse(this.registrarServiceImpl.getRegWorkList(obj.getInt("spID"))); - logger.info("getRegistrarWorkList response:" + response); - } catch (Exception e) { - response.setError(e); - logger.error("Error in getRegistrarWorkList:" + e); - } - return response.toString(); + JSONObject obj = new JSONObject(comingRequest); + response.setResponse(this.registrarServiceImpl.getRegWorkList(obj.getInt("spID"))); + logger.info("getRegistrarWorkList response:" + response); + return ResponseEntity.ok(response.toString()); } // Registrar Quick search ..... @Operation(summary = "Search for beneficiary based on beneficiary id") @PostMapping(value = { "/quickSearch" }) - public String quickSearchBeneficiary( + public ResponseEntity quickSearchBeneficiary( @Param(value = "{\"benID\": \"String\"}") @RequestBody String comingRequest) { OutputResponse response = new OutputResponse(); logger.info("quickSearchBeneficiary request:" + comingRequest); - try { - - JSONObject obj = new JSONObject(comingRequest); - response.setResponse(registrarServiceImpl.getQuickSearchBenData(obj.getString("benID"))); - logger.info("quickSearchBeneficiary response:" + response); - } catch (Exception e) { - logger.error("Error in quickSearchBeneficiary :" + e); - response.setError(e); - } - return response.toString(); + JSONObject obj = new JSONObject(comingRequest); + response.setResponse(registrarServiceImpl.getQuickSearchBenData(obj.getString("benID"))); + logger.info("quickSearchBeneficiary response:" + response); + return ResponseEntity.ok(response.toString()); } // Registrar Advance search ..... @Operation(summary = "Search for beneficiary based on provided data") @PostMapping(value = { "/advanceSearch" }) - public String advanceSearch( + public ResponseEntity advanceSearch( @Param(value = "{\"firstName\": \"String\", \"lastName\": \"String\", \"phoneNo\": \"String\"," + "\"beneficiaryID\": \"String\", \"stateID\": \"Integer\", \"districtID\": \"Integer\", \"aadharNo\": \"String\"}," + " \"govtIdentityNo\": \"String\"}") @RequestBody String comingRequest) { OutputResponse response = new OutputResponse(); logger.info("advanceSearch request :" + comingRequest); - try { - V_BenAdvanceSearch v_BenAdvanceSearch = inputMapper.gson().fromJson(comingRequest, - V_BenAdvanceSearch.class); - response.setResponse(registrarServiceImpl.getAdvanceSearchBenData(v_BenAdvanceSearch)); - logger.info("advanceSearch response:" + response); - } catch (Exception e) { - logger.error("Error in advanceSearch :" + e); - response.setError(e); - } + V_BenAdvanceSearch v_BenAdvanceSearch = inputMapper.gson().fromJson(comingRequest, + V_BenAdvanceSearch.class); + response.setResponse(registrarServiceImpl.getAdvanceSearchBenData(v_BenAdvanceSearch)); + logger.info("advanceSearch response:" + response); - return response.toString(); + return ResponseEntity.ok(response.toString()); } // API for left side ben data @Operation(summary = "Get beneficiary details based on beneficiary register id") @PostMapping(value = { "/get/benDetailsByRegID" }) - public String getBenDetailsByRegID( + public ResponseEntity getBenDetailsByRegID( @Param(value = "{\"beneficiaryRegID\": \"Long\"}") @RequestBody String comingRequest) { OutputResponse response = new OutputResponse(); logger.info("getBenDetailsByRegID request :" + comingRequest); - try { - JSONObject obj = new JSONObject(comingRequest); - if (obj.has("beneficiaryRegID")) { - if (obj.getLong("beneficiaryRegID") > 0) { + JSONObject obj = new JSONObject(comingRequest); + if (obj.has("beneficiaryRegID")) { + if (obj.getLong("beneficiaryRegID") > 0) { - String beneficiaryData = registrarServiceMasterDataImpl - .getBenDetailsByRegID(obj.getLong("beneficiaryRegID")); + String beneficiaryData = registrarServiceMasterDataImpl + .getBenDetailsByRegID(obj.getLong("beneficiaryRegID")); - response.setResponse(beneficiaryData); - } else { - response.setError(500, "Please pass beneficiaryRegID"); - } + response.setResponse(beneficiaryData); } else { - response.setError(500, "Bad Request... beneficiaryRegID is not there in request"); + throw new IllegalArgumentException("Please pass beneficiaryRegID"); } - logger.info("getBenDetailsByRegID response :" + response); - } catch (Exception e) { - logger.error("Error in getBenDetailsByRegID :" + e); - response.setError(e); + } else { + throw new IllegalArgumentException("Bad Request... beneficiaryRegID is not there in request"); } - return response.toString(); + logger.info("getBenDetailsByRegID response :" + response); + return ResponseEntity.ok(response.toString()); } @Operation(summary = "Get beneficiary details") @PostMapping(value = { "/get/beneficiaryDetails" }) - public String getBeneficiaryDetails( + public ResponseEntity getBeneficiaryDetails( @Param(value = "{\"beneficiaryRegID\": \"Long\"}") @RequestBody String requestObj) { OutputResponse response = new OutputResponse(); logger.info("getBeneficiaryDetails request :" + requestObj); - try { - JSONObject obj = new JSONObject(requestObj); - if (obj.has("beneficiaryRegID")) { - if (obj.getLong("beneficiaryRegID") > 0) { - - String beneficiaryData = registrarServiceImpl - .getBeneficiaryDetails(obj.getLong("beneficiaryRegID")); - if (beneficiaryData != null) { - response.setResponse(beneficiaryData); - } else { - Map noDataMap = new HashMap<>(); - response.setResponse(new Gson().toJson(noDataMap)); - } + JSONObject obj = new JSONObject(requestObj); + if (obj.has("beneficiaryRegID")) { + if (obj.getLong("beneficiaryRegID") > 0) { + String beneficiaryData = registrarServiceImpl + .getBeneficiaryDetails(obj.getLong("beneficiaryRegID")); + if (beneficiaryData != null) { + response.setResponse(beneficiaryData); } else { - response.setError(500, "Please pass beneficiaryRegID"); + Map noDataMap = new HashMap<>(); + response.setResponse(new Gson().toJson(noDataMap)); } + } else { - response.setError(500, "Bad Request... beneficiaryRegID is not there in request"); + throw new IllegalArgumentException("Please pass beneficiaryRegID"); } - logger.info("getBeneficiaryDetails response :" + response); - } catch (Exception e) { - logger.error("Error in getBeneficiaryDetails :" + e); - response.setError(e); + } else { + throw new IllegalArgumentException("Bad Request... beneficiaryRegID is not there in request"); } - return response.toString(); + logger.info("getBeneficiaryDetails response :" + response); + return ResponseEntity.ok(response.toString()); } @Operation(summary = "Get beneficiary image") @PostMapping(value = { "/get/beneficiaryImage" }) - public String getBeneficiaryImage( + public ResponseEntity getBeneficiaryImage( @Param(value = "{\"beneficiaryRegID\": \"Long\"}") @RequestBody String requestObj) { OutputResponse response = new OutputResponse(); logger.info("getBeneficiaryImage request :" + requestObj); - try { - JSONObject obj = new JSONObject(requestObj); - if (obj.has("beneficiaryRegID")) { - if (obj.getLong("beneficiaryRegID") > 0) { - String beneficiaryData = registrarServiceImpl.getBenImage(obj.getLong("beneficiaryRegID")); - response.setResponse(beneficiaryData); - } else { - response.setError(500, "Please pass beneficiaryRegID"); - } + JSONObject obj = new JSONObject(requestObj); + if (obj.has("beneficiaryRegID")) { + if (obj.getLong("beneficiaryRegID") > 0) { + String beneficiaryData = registrarServiceImpl.getBenImage(obj.getLong("beneficiaryRegID")); + + response.setResponse(beneficiaryData); } else { - response.setError(500, "Bad Request... beneficiaryRegID is not there in request"); + throw new IllegalArgumentException("Please pass beneficiaryRegID"); } - logger.info("getBeneficiaryDetails response :" + response); - } catch (Exception e) { - + } else { + throw new IllegalArgumentException("Bad Request... beneficiaryRegID is not there in request"); } - return response.toString(); + logger.info("getBeneficiaryDetails response :" + response); + return ResponseEntity.ok(response.toString()); } // beneficiary quick search new integrated with common and identity @Operation(summary = "Search beneficiary based on beneficiary id or beneficiary phone number") @PostMapping(value = { "/quickSearchNew" }) - public String quickSearchNew(@RequestBody String requestObj, + public ResponseEntity quickSearchNew(@RequestBody String requestObj, @RequestHeader(value = "Authorization") String Authorization) { String searchList = null; OutputResponse response = new OutputResponse(); - try { - searchList = registrarServiceImpl.beneficiaryQuickSearch(requestObj, Authorization); - if (searchList == null) { - response.setError(5000, "Invalid request"); - return response.toString(); - } else { - return searchList; - } - } catch (Exception e) { - logger.error("Error in Quick Search" + e); - response.setError(5000, "Error while searching beneficiary"); - return response.toString(); + searchList = registrarServiceImpl.beneficiaryQuickSearch(requestObj, Authorization); + if (searchList == null) { + response.setError(5000, "Invalid request"); + return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(response.toString()); + } else { + return ResponseEntity.ok(searchList); } } @@ -259,101 +225,73 @@ public String quickSearchNew(@RequestBody String requestObj, // beneficiary Advance search new integrated with common and identity @Operation(summary = "Beneficiary advance search integrated with common and identity API") @PostMapping(value = { "/advanceSearchNew" }) - public String advanceSearchNew(@RequestBody String requestObj, + public ResponseEntity advanceSearchNew(@RequestBody String requestObj, @RequestHeader(value = "Authorization") String Authorization) { String searchList = null; OutputResponse response = new OutputResponse(); - try { - searchList = registrarServiceImpl.beneficiaryAdvanceSearch(requestObj, Authorization); - if (searchList == null) { - response.setError(5000, "Invalid request"); - return response.toString(); - } else { - return searchList; - } - } catch (Exception e) { - logger.error("Error in Quick Search" + e); - response.setError(5000, "Error while searching beneficiary"); - return response.toString(); + searchList = registrarServiceImpl.beneficiaryAdvanceSearch(requestObj, Authorization); + if (searchList == null) { + response.setError(5000, "Invalid request"); + return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(response.toString()); + } else { + return ResponseEntity.ok(searchList); } } @Operation(summary = "Beneficiary advance search") @PostMapping(value = { "/benAdvanceSearchNew" }) - public String benAdvanceSearchNew(@RequestBody String requestObj, - @RequestHeader(value = "Authorization") String Authorization) { - String searchList = null; + public ResponseEntity benAdvanceSearchNew(@RequestBody String requestObj, + @RequestHeader(value = "Authorization") String Authorization) throws Exception { OutputResponse response = new OutputResponse(); - try { - searchList = registrarServiceImpl.beneficiaryAdvanceSearch(requestObj, Authorization); - if (searchList == null) { - response.setError(5000, "Invalid request"); - return response.toString(); - } else { - return searchList; - } - } catch (Exception e) { - logger.error("Error in Quick Search" + e); - response.setError(5000, "Error while searching beneficiary"); - return response.toString(); + String searchList = registrarServiceImpl.beneficiaryAdvanceSearch(requestObj, Authorization); + if (searchList == null) { + response.setError(5000, "Invalid request"); + return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(response.toString()); + } else { + return ResponseEntity.ok(searchList); } - } // Get Beneficiary Details for left side panel of given beneficiaryRegID new @Operation(summary = "Get beneficiary details for side panel") @PostMapping(value = { "/get/benDetailsByRegIDForLeftPanelNew" }) - public String getBenDetailsForLeftSidePanelByRegID( + public ResponseEntity getBenDetailsForLeftSidePanelByRegID( @Param(value = "{\"beneficiaryRegID\": \"Long\"}") @RequestBody String comingRequest, - @RequestHeader(value = "Authorization") String Authorization) { + @RequestHeader(value = "Authorization") String Authorization) throws Exception { OutputResponse response = new OutputResponse(); logger.info("getBenDetailsByRegID request :" + comingRequest); - try { - - JSONObject obj = new JSONObject(comingRequest); - if (obj.has("beneficiaryRegID") && obj.has("benFlowID")) { - if (obj.getLong("beneficiaryRegID") > 0 && obj.getLong("benFlowID") > 0) { - - String beneficiaryData = registrarServiceMasterDataImpl.getBenDetailsForLeftSideByRegIDNew( - obj.getLong("beneficiaryRegID"), obj.getLong("benFlowID"), Authorization, comingRequest); - - response.setResponse(beneficiaryData); - } else { - response.setError(500, "Invalid Beneficiary ID"); - } + JSONObject obj = new JSONObject(comingRequest); + if (obj.has("beneficiaryRegID") && obj.has("benFlowID")) { + if (obj.getLong("beneficiaryRegID") > 0 && obj.getLong("benFlowID") > 0) { + String beneficiaryData = registrarServiceMasterDataImpl.getBenDetailsForLeftSideByRegIDNew( + obj.getLong("beneficiaryRegID"), obj.getLong("benFlowID"), Authorization, comingRequest); + response.setResponse(beneficiaryData); } else { - response.setError(500, "Invalid request"); + response.setError(500, "Invalid Beneficiary ID"); + return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(response.toString()); } - logger.info("getBenDetailsByRegID response :" + response); - } catch (Exception e) { - logger.error("Error in getBenDetailsByRegID :" + e); - response.setError(5000, "Error while getting beneficiary details"); + } else { + response.setError(500, "Invalid request"); + return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(response.toString()); } - return response.toString(); + logger.info("getBenDetailsByRegID response :" + response); + return ResponseEntity.ok(response.toString()); } // new api for ben image @Operation(summary = "Get beneficiary image") @PostMapping(value = { "/getBenImage" }) - public String getBenImage(@RequestBody String requestObj, - @RequestHeader(value = "Authorization") String Authorization) { - OutputResponse response = new OutputResponse(); - try { - String returnOBJ = registrarServiceMasterDataImpl.getBenImageFromIdentityAPI(Authorization, requestObj); - return returnOBJ; - } catch (Exception e) { - logger.error("Error ben image fetch" + e); - response.setError(5000, "Error while getting beneficiary image"); - return response.toString(); - } - + public ResponseEntity getBenImage(@RequestBody String requestObj, + @RequestHeader(value = "Authorization") String Authorization) throws Exception { + String returnOBJ = registrarServiceMasterDataImpl.getBenImageFromIdentityAPI(Authorization, requestObj); + return ResponseEntity.ok(returnOBJ); } // Registrar Beneficiary Registration API ..... @Operation(summary = "Register a new beneficiary") @PostMapping(value = { "/registrarBeneficaryRegistration" }) - public String createBeneficiary( + public ResponseEntity createBeneficiary( @Param(value = "{\"benD\":{\"firstName\": \"String\", \"lastName\": \"String\", \"gender\": \"Short\"," + "\"dob\": \"Timestamp\", \"maritalStatus\": \"Short\", \"fatherName\": \"String\", \"motherName\": \"String\"," + "\"husbandName\": \"String\", \"image\": \"String\", \"aadharNo\": \"String\", \"income\": \"Short\", " @@ -364,76 +302,65 @@ public String createBeneficiary( + "\"districtName\": \"String\", \"stateID\": \"Integer\", \"stateName\": \"String\", \"countryID\": \"Integer\"," + "\"govID\": [{\"type\": \"String\",\"value\": \"String\"}], \"ageAtMarriage\": \"Integer\", \"createdBy\": \"String\", " + "\"servicePointID\": \"Integer\"}}") @RequestBody String comingRequest, - @RequestHeader(value = "Authorization") String Authorization) { + @RequestHeader(value = "Authorization") String Authorization) throws Exception { OutputResponse response = new OutputResponse(); - try { - WrapperBeneficiaryRegistration wrapperBeneficiaryRegistrationOBJ = InputMapper.gson() - .fromJson(comingRequest, WrapperBeneficiaryRegistration.class); - logger.info("createBeneficiary request:" + comingRequest); - JsonObject benD = wrapperBeneficiaryRegistrationOBJ.getBenD(); - - if (benD == null || benD.isJsonNull()) { - response.setError(0, "Invalid input data"); - } else { - BeneficiaryData benData = registrarServiceImpl.createBeneficiary(benD); + WrapperBeneficiaryRegistration wrapperBeneficiaryRegistrationOBJ = InputMapper.gson() + .fromJson(comingRequest, WrapperBeneficiaryRegistration.class); + logger.info("createBeneficiary request:" + comingRequest); + JsonObject benD = wrapperBeneficiaryRegistrationOBJ.getBenD(); - if (benData != null) { - Long benRegID = benData.getBeneficiaryRegID(); - Long benDemoID = registrarServiceImpl.createBeneficiaryDemographic(benD, benRegID); - Long benPhonMapID = registrarServiceImpl.createBeneficiaryPhoneMapping(benD, benRegID); + if (benD == null || benD.isJsonNull()) { + response.setError(0, "Invalid input data"); + return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(response.toString()); + } else { + BeneficiaryData benData = registrarServiceImpl.createBeneficiary(benD); - int benGovIdMapID = registrarServiceImpl.createBenGovIdMapping(benD, benRegID); + if (benData != null) { + Long benRegID = benData.getBeneficiaryRegID(); + Long benDemoID = registrarServiceImpl.createBeneficiaryDemographic(benD, benRegID); + Long benPhonMapID = registrarServiceImpl.createBeneficiaryPhoneMapping(benD, benRegID); - Long benbenDemoOtherID = registrarServiceImpl.createBeneficiaryDemographicAdditional(benD, - benRegID); + int benGovIdMapID = registrarServiceImpl.createBenGovIdMapping(benD, benRegID); - Long benImageID = registrarServiceImpl.createBeneficiaryImage(benD, benRegID); + Long benbenDemoOtherID = registrarServiceImpl.createBeneficiaryDemographicAdditional(benD, + benRegID); - if (benRegID > 0 && benDemoID > 0 && benPhonMapID > 0 && benbenDemoOtherID > 0 && benImageID > 0) { - Integer i = commonNurseServiceImpl.updateBeneficiaryStatus('R', benRegID); - if (benData.getBeneficiaryID() != null) { - response.setResponse(benData.getBeneficiaryID()); - } else { - response.setResponse("Registration Done. Beneficiary ID is : " + benRegID); - } + Long benImageID = registrarServiceImpl.createBeneficiaryImage(benD, benRegID); + + if (benRegID > 0 && benDemoID > 0 && benPhonMapID > 0 && benbenDemoOtherID > 0 && benImageID > 0) { + Integer i = commonNurseServiceImpl.updateBeneficiaryStatus('R', benRegID); + if (benData.getBeneficiaryID() != null) { + response.setResponse(benData.getBeneficiaryID()); } else { - response.setError(500, "Something Went-Wrong"); + response.setResponse("Registration Done. Beneficiary ID is : " + benRegID); } } else { response.setError(500, "Something Went-Wrong"); + return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(response.toString()); } + } else { + response.setError(500, "Something Went-Wrong"); + return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(response.toString()); } - logger.info("createBeneficiary response:" + response); - } catch (Exception e) { - logger.error("Error in createBeneficiary :" + e); - response.setError(e); } - return response.toString(); + logger.info("createBeneficiary response:" + response); + return ResponseEntity.ok(response.toString()); } // beneficiary registration with common and identity new @Operation(summary = "Register a new beneficiary new API") @PostMapping(value = { "/registrarBeneficaryRegistrationNew" }) - public String registrarBeneficaryRegistrationNew(@RequestBody String comingReq, - @RequestHeader(value = "Authorization") String Authorization) { - String s; - OutputResponse response = new OutputResponse(); - try { - s = registrarServiceImpl.registerBeneficiary(comingReq, Authorization); - return s; - } catch (Exception e) { - logger.error("Error in registration" + e); - response.setError(5000, "Error in registration; please contact administrator"); - return response.toString(); - } - + public ResponseEntity registrarBeneficaryRegistrationNew(@RequestBody String comingReq, + @RequestHeader(value = "Authorization") String Authorization) throws Exception { + String s = registrarServiceImpl.registerBeneficiary(comingReq, Authorization); + return ResponseEntity.ok(s); } // Registrar Beneficiary Registration API ..... @Operation(summary = "Update registered beneficiary data") @PostMapping(value = { "/update/BeneficiaryDetails" }) - public String updateBeneficiary( + public ResponseEntity updateBeneficiary( @Param(value = "{\"benD\": {\"beneficiaryRegID\": \"Long\", \"firstName\": \"String\", \"lastName\": \"String\", \"gender\": \"Short\"," + "\"dob\": \"Timestamp\", \"maritalStatus\": \"Short\", \"fatherName\": \"String\", \"motherName\": \"String\"," + "\"husbandName\": \"String\", \"image\": \"String\", \"aadharNo\": \"String\", \"income\": \"Short\", " @@ -443,94 +370,85 @@ public String updateBeneficiary( + "\"villageID\": \"Integer\", \"villageName\": \"String\", \"districtID\": \"Integer\", \"districtName\": \"String\", \"stateID\": \"Integer\", " + "\"stateName\": \"String\", \"govID\": [{\"benGovMapID\": \"Long\", \"type\": \"String\",\"value\": \"String\"}," + "{\"type\": \"String\",\"value\": \"String\"}], \"ageAtMarriage\": \"Integer\", \"createdBy\": \"String\", " - + "\"servicePointID\": \"Integer\", \"govtIdentityNo\": \"Integer\", \"govtIdentityTypeID\": \"Integer\", \"modifiedBy\": \"String\"}}") @RequestBody String comingRequest) { + + "\"servicePointID\": \"Integer\", \"govtIdentityNo\": \"Integer\", \"govtIdentityTypeID\": \"Integer\", \"modifiedBy\": \"String\"}}") @RequestBody String comingRequest) + throws Exception { OutputResponse response = new OutputResponse(); - try { - WrapperBeneficiaryRegistration wrapperBeneficiaryRegistrationOBJ = InputMapper.gson() - .fromJson(comingRequest, WrapperBeneficiaryRegistration.class); - logger.info("updateBeneficiary request:" + comingRequest); - JsonObject benD = wrapperBeneficiaryRegistrationOBJ.getBenD(); - - if (benD == null || benD.isJsonNull() || !benD.has("beneficiaryRegID")) { - response.setError(0, "Data Not Sufficient..."); - } else { - int benData = registrarServiceImpl.updateBeneficiary(benD); - if (benData != 0 && !benD.get("beneficiaryRegID").isJsonNull()) { - Long benRegID = benD.get("beneficiaryRegID").getAsLong(); - int benDemoUpdateRes = registrarServiceImpl.updateBeneficiaryDemographic(benD, benRegID); - int benPhonMapUpdateRes = registrarServiceImpl.updateBeneficiaryPhoneMapping(benD, benRegID); + WrapperBeneficiaryRegistration wrapperBeneficiaryRegistrationOBJ = InputMapper.gson() + .fromJson(comingRequest, WrapperBeneficiaryRegistration.class); + logger.info("updateBeneficiary request:" + comingRequest); + JsonObject benD = wrapperBeneficiaryRegistrationOBJ.getBenD(); - int benGovIdMapUpdateRes = registrarServiceImpl.updateBenGovIdMapping(benD, benRegID); + if (benD == null || benD.isJsonNull() || !benD.has("beneficiaryRegID")) { + response.setError(0, "Data Not Sufficient..."); + return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(response.toString()); + } else { + int benData = registrarServiceImpl.updateBeneficiary(benD); + if (benData != 0 && !benD.get("beneficiaryRegID").isJsonNull()) { + Long benRegID = benD.get("beneficiaryRegID").getAsLong(); + int benDemoUpdateRes = registrarServiceImpl.updateBeneficiaryDemographic(benD, benRegID); + int benPhonMapUpdateRes = registrarServiceImpl.updateBeneficiaryPhoneMapping(benD, benRegID); - int benbenDemoOtherUpdateRes = registrarServiceImpl.updateBeneficiaryDemographicAdditional(benD, - benRegID); + int benGovIdMapUpdateRes = registrarServiceImpl.updateBenGovIdMapping(benD, benRegID); - int benImageUpdateRes = registrarServiceImpl.updateBeneficiaryImage(benD, benRegID); + int benbenDemoOtherUpdateRes = registrarServiceImpl.updateBeneficiaryDemographicAdditional(benD, + benRegID); - if (benRegID >= 0 && benDemoUpdateRes >= 0 && benPhonMapUpdateRes >= 0 - && benbenDemoOtherUpdateRes >= 0 && benImageUpdateRes >= 0) { - Integer i = commonNurseServiceImpl.updateBeneficiaryStatus('R', benRegID); - response.setResponse("Beneficiary Details updated successfully!!!"); + int benImageUpdateRes = registrarServiceImpl.updateBeneficiaryImage(benD, benRegID); + + if (benRegID >= 0 && benDemoUpdateRes >= 0 && benPhonMapUpdateRes >= 0 + && benbenDemoOtherUpdateRes >= 0 && benImageUpdateRes >= 0) { + Integer i = commonNurseServiceImpl.updateBeneficiaryStatus('R', benRegID); + response.setResponse("Beneficiary Details updated successfully!!!"); - } else { - response.setError(500, "Something Went-Wrong"); - } } else { response.setError(500, "Something Went-Wrong"); + return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(response.toString()); } + } else { + response.setError(500, "Something Went-Wrong"); + return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(response.toString()); } - logger.info("updateBeneficiary response:" + response); - } catch (Exception e) { - logger.error("Error in updateBeneficiary :" + e); - response.setError(e); } - return response.toString(); + logger.info("updateBeneficiary response:" + response); + return ResponseEntity.ok(response.toString()); } // revisit to nurse by searching and submitting new @Operation(summary = "Search and submit beneficiary to nurse for revisit") @PostMapping(value = { "/create/BenReVisitToNurse" }) - public String createReVisitForBenToNurse(@RequestBody String requestOBJ) { + public ResponseEntity createReVisitForBenToNurse(@RequestBody String requestOBJ) throws Exception { OutputResponse response = new OutputResponse(); - try { - int i = registrarServiceImpl.searchAndSubmitBeneficiaryToNurse(requestOBJ); - if (i > 0) { - if (i == 1) - response.setResponse("Beneficiary moved to nurse worklist"); - else - response.setError(5000, "Beneficiary already present in nurse worklist"); - } else { - response.setError(5000, "Error while moving beneficiary to nurse worklist"); - } - } catch (Exception e) { - logger.error("Error while creating re-visit " + e); + int i = registrarServiceImpl.searchAndSubmitBeneficiaryToNurse(requestOBJ); + if (i > 0) { + if (i == 1) + response.setResponse("Beneficiary moved to nurse worklist"); + else + response.setError(5000, "Beneficiary already present in nurse worklist"); + } else { response.setError(5000, "Error while moving beneficiary to nurse worklist"); + return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(response.toString()); } - return response.toString(); + return ResponseEntity.ok(response.toString()); } @Operation(summary = "Update registered beneficiary details") @PostMapping(value = { "/update/BeneficiaryUpdate" }) - public String beneficiaryUpdate(@RequestBody String requestOBJ, - @RequestHeader(value = "Authorization") String Authorization) { + public ResponseEntity beneficiaryUpdate(@RequestBody String requestOBJ, + @RequestHeader(value = "Authorization") String Authorization) throws Exception { OutputResponse response = new OutputResponse(); - Integer s = null; - try { - s = registrarServiceImpl.updateBeneficiary(requestOBJ, Authorization); - if (s != null) { - if (s == 1) - response.setResponse("Beneficiary details updated successfully"); - else - response.setResponse( - "Beneficiary details updated successfully but already present in nurse work list"); - } else { - response.setError(5000, "Error while updating beneficiary details"); - } - } catch (Exception e) { - response.setError(5000, "Error in beneficiary details update"); + Integer s = registrarServiceImpl.updateBeneficiary(requestOBJ, Authorization); + if (s != null) { + if (s == 1) + response.setResponse("Beneficiary details updated successfully"); + else + response.setResponse( + "Beneficiary details updated successfully but already present in nurse work list"); + } else { + response.setError(5000, "Error while updating beneficiary details"); + return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(response.toString()); } - return response.toString(); + return ResponseEntity.ok(response.toString()); } } diff --git a/src/main/java/com/iemr/hwc/utils/exception/GlobalExceptionHandler.java b/src/main/java/com/iemr/hwc/utils/exception/GlobalExceptionHandler.java new file mode 100644 index 00000000..855c87cf --- /dev/null +++ b/src/main/java/com/iemr/hwc/utils/exception/GlobalExceptionHandler.java @@ -0,0 +1,50 @@ +package com.iemr.hwc.utils.exception; + +import com.iemr.hwc.utils.response.OutputResponse; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.ControllerAdvice; +import org.springframework.web.bind.annotation.ExceptionHandler; +import org.springframework.web.context.request.WebRequest; + +import java.util.Calendar; + +@ControllerAdvice +public class GlobalExceptionHandler { + private static final Logger logger = LoggerFactory.getLogger(GlobalExceptionHandler.class); + + @ExceptionHandler(IEMRException.class) + public ResponseEntity handleIEMRException(IEMRException ex, WebRequest request) { + logger.error("IEMRException: {}", ex.getMessage()); + OutputResponse response = new OutputResponse(); + response.setError(ex.getStatusCode(), ex.getMessage(), "FAILURE"); + return new ResponseEntity<>(response, ex.getHttpStatus()); + } + + @ExceptionHandler(IllegalArgumentException.class) + public ResponseEntity handleIllegalArgumentException(IllegalArgumentException ex, + WebRequest request) { + logger.error("IllegalArgumentException: {}", ex.getMessage()); + OutputResponse response = new OutputResponse(); + response.setError(HttpStatus.BAD_REQUEST.value(), ex.getMessage(), "BAD_REQUEST"); + return new ResponseEntity<>(response, HttpStatus.BAD_REQUEST); + } + + @ExceptionHandler(Exception.class) + public ResponseEntity handleGlobalException(Exception ex, WebRequest request) { + logger.error("Unhandled Exception: ", ex); + OutputResponse response = new OutputResponse(); + response.setError(ex); + + HttpStatus status = HttpStatus.INTERNAL_SERVER_ERROR; + if (response.getStatusCode() == 404) { + status = HttpStatus.NOT_FOUND; + } else if (response.getStatusCode() == 400) { + status = HttpStatus.BAD_REQUEST; + } + + return new ResponseEntity<>(response, status); + } +} diff --git a/src/main/java/com/iemr/hwc/utils/exception/IEMRException.java b/src/main/java/com/iemr/hwc/utils/exception/IEMRException.java index 34c1d75c..03496fdd 100644 --- a/src/main/java/com/iemr/hwc/utils/exception/IEMRException.java +++ b/src/main/java/com/iemr/hwc/utils/exception/IEMRException.java @@ -1,46 +1,28 @@ -/* -* AMRIT – Accessible Medical Records via Integrated Technology -* Integrated EHR (Electronic Health Records) Solution -* -* Copyright (C) "Piramal Swasthya Management and Research Institute" -* -* This file is part of AMRIT. -* -* This program is free software: you can redistribute it and/or modify -* it under the terms of the GNU General Public License as published by -* the Free Software Foundation, either version 3 of the License, or -* (at your option) any later version. -* -* This program is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -* GNU General Public License for more details. -* -* You should have received a copy of the GNU General Public License -* along with this program. If not, see https://www.gnu.org/licenses/. -*/ package com.iemr.hwc.utils.exception; -public class IEMRException extends Exception { - private static final long serialVersionUID = 1L; - private String message = null; +import org.springframework.http.HttpStatus; +import lombok.Getter; - public IEMRException(String message, Throwable cause) { - super(message); - this.message = message; - super.setStackTrace(cause.getStackTrace()); - } +@Getter +public class IEMRException extends RuntimeException { + private final int statusCode; + private final HttpStatus httpStatus; public IEMRException(String message) { super(message); - this.message = message; + this.statusCode = 5000; + this.httpStatus = HttpStatus.INTERNAL_SERVER_ERROR; } - public String toString() { - return this.message; + public IEMRException(String message, int statusCode, HttpStatus httpStatus) { + super(message); + this.statusCode = statusCode; + this.httpStatus = httpStatus; } - public String getMessage() { - return this.message; + public IEMRException(String message, Throwable cause) { + super(message, cause); + this.statusCode = 5000; + this.httpStatus = HttpStatus.INTERNAL_SERVER_ERROR; } } diff --git a/src/main/java/com/iemr/hwc/utils/http/HTTPRequestInterceptor.java b/src/main/java/com/iemr/hwc/utils/http/HTTPRequestInterceptor.java index 58d1e297..562dc7b8 100644 --- a/src/main/java/com/iemr/hwc/utils/http/HTTPRequestInterceptor.java +++ b/src/main/java/com/iemr/hwc/utils/http/HTTPRequestInterceptor.java @@ -47,7 +47,7 @@ public class HTTPRequestInterceptor implements HandlerInterceptor { @Value("${cors.allowed-origins}") private String allowedOrigins; - + @Autowired private SessionObject sessionObject; @@ -61,52 +61,54 @@ public boolean preHandle(HttpServletRequest request, HttpServletResponse respons String authorization = null; String preAuth = request.getHeader("Authorization"); - if(null != preAuth && preAuth.contains("Bearer ")) - authorization=preAuth.replace("Bearer ", ""); + if (null != preAuth && preAuth.contains("Bearer ")) + authorization = preAuth.replace("Bearer ", ""); else authorization = preAuth; if (authorization == null || authorization.isEmpty()) { - logger.info("Authorization header is null or empty. Skipping HTTPRequestInterceptor."); - return true; // Allow the request to proceed without validation - } + logger.info("Authorization header is null or empty. Skipping HTTPRequestInterceptor."); + return true; // Allow the request to proceed without validation + } if (!request.getMethod().equalsIgnoreCase("OPTIONS")) { try { String[] requestURIParts = request.getRequestURI().split("/"); String requestAPI = requestURIParts[requestURIParts.length - 1]; switch (requestAPI) { - case "swagger-ui.html": - break; - case "index.html": - break; - case "swagger-initializer.js": - break; - case "swagger-config": - break; - case "ui": - break; - case "swagger-resources": - break; - case "api-docs": - break; - - case "error": - status = false; - break; - default: - logger.debug("RequestURI::" + request.getRequestURI() + " || Authorization ::" + authorization); - if (authorization == null) - throw new Exception( - "Authorization key is NULL, please pass valid session key to proceed further. "); - String userRespFromRedis = sessionObject.getSessionObject(authorization); - if (userRespFromRedis == null) - throw new Exception("invalid Authorization key, please pass a valid key to proceed further. "); - break; + case "swagger-ui.html": + break; + case "index.html": + break; + case "swagger-initializer.js": + break; + case "swagger-config": + break; + case "ui": + break; + case "swagger-resources": + break; + case "api-docs": + break; + + case "error": + status = false; + break; + default: + logger.debug("RequestURI::" + request.getRequestURI() + " || Authorization ::" + authorization); + if (authorization == null) + throw new Exception( + "Authorization key is NULL, please pass valid session key to proceed further. "); + String userRespFromRedis = sessionObject.getSessionObject(authorization); + if (userRespFromRedis == null) + throw new Exception( + "invalid Authorization key, please pass a valid key to proceed further. "); + break; } } catch (Exception e) { logger.error(e.getLocalizedMessage()); OutputResponse output = new OutputResponse(); output.setError(e); + response.setStatus(HttpServletResponse.SC_UNAUTHORIZED); response.getOutputStream().print(output.toString()); response.setContentType(MediaType.APPLICATION_JSON); response.setContentLength(output.toString().length()); @@ -131,8 +133,8 @@ public void postHandle(HttpServletRequest request, HttpServletResponse response, logger.debug("In postHandle we are Intercepting the Request"); String authorization = null; String postAuth = request.getHeader("Authorization"); - if(null != postAuth && postAuth.contains("Bearer ")) - authorization=postAuth.replace("Bearer ", ""); + if (null != postAuth && postAuth.contains("Bearer ")) + authorization = postAuth.replace("Bearer ", ""); else authorization = postAuth; logger.debug("RequestURI::" + request.getRequestURI() + " || Authorization ::" + authorization);