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 6d12510a..24b49b45 100644 --- a/src/main/java/com/iemr/hwc/controller/adolescent/ChildhoodAdolescenceController.java +++ b/src/main/java/com/iemr/hwc/controller/adolescent/ChildhoodAdolescenceController.java @@ -59,33 +59,37 @@ public class ChildhoodAdolescenceController { * @Objective Save child-adolescent-care data for nurse. * @param requestObj * @return success or failure response with visit code + * @throws Exception */ @CrossOrigin @ApiOperation(value = "Save child adolescent care (CAC) nurse data", consumes = "application/json", produces = "application/json") @RequestMapping(value = { "/save/nurseData" }, method = { RequestMethod.POST }) public String saveBenNurseDataCAC(@RequestBody String requestObj, - @RequestHeader(value = "Authorization") String Authorization) { + @RequestHeader(value = "Authorization") String Authorization) throws Exception { OutputResponse response = new OutputResponse(); - try { - logger.info("Request object for child-adolescent-care nurse data saving :" + requestObj); - + if (null != requestObj) { + JsonObject jsnOBJ = new JsonObject(); JsonParser jsnParser = new JsonParser(); JsonElement jsnElmnt = jsnParser.parse(requestObj); - JsonObject jsnOBJ = jsnElmnt.getAsJsonObject(); - - if (jsnOBJ != null) { - String genOPDRes = adolescentAndChildCareService.saveNurseData(jsnOBJ, Authorization); - response.setResponse(genOPDRes); - - } else { - response.setResponse("Invalid request"); + 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()); } - } 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); - response.setError(5000, "Unable to save data : " + e.getLocalizedMessage()); } return response.toString(); } @@ -113,8 +117,8 @@ public String saveDoctorDataCAC(@RequestBody String requestObj, } } catch (Exception e) { - logger.error("Error while saving doctor data:" + e); - response.setError(5000, "Unable to save data. " + e.getMessage()); + logger.error("Error while saving doctor data:" + e.getMessage()); + response.setError(5000, e.getMessage()); } return response.toString(); } @@ -424,8 +428,8 @@ public String updateCACDoctorData(@RequestBody String requestObj, logger.info("Doctor data update response:" + response); } catch (Exception e) { - response.setError(5000, "Unable to modify data. " + e.getLocalizedMessage()); - logger.error("Error while updating CAC doctor data:" + e); + logger.error("Unable to modify data. " + e.getLocalizedMessage()); + response.setError(5000, e.getMessage()); } return 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 a2455ca9..3b896d64 100644 --- a/src/main/java/com/iemr/hwc/controller/anc/AntenatalCareController.java +++ b/src/main/java/com/iemr/hwc/controller/anc/AntenatalCareController.java @@ -66,33 +66,38 @@ public class AntenatalCareController { * @Objective Save ANC data for nurse. * @param JSON requestObj * @return success or failure response + * @throws Exception */ @CrossOrigin @ApiOperation(value = "Save ANC nurse data", consumes = "application/json", produces = "application/json") @RequestMapping(value = { "/save/nurseData" }, method = { RequestMethod.POST }) public String saveBenANCNurseData(@RequestBody String requestObj, - @RequestHeader(value = "Authorization") String Authorization) { + @RequestHeader(value = "Authorization") String Authorization) throws Exception { OutputResponse response = new OutputResponse(); - try { - - logger.info("Request object for ANC nurse data saving :" + requestObj); + if (null != requestObj) { JsonObject jsnOBJ = new JsonObject(); JsonParser jsnParser = new JsonParser(); JsonElement jsnElmnt = jsnParser.parse(requestObj); jsnOBJ = jsnElmnt.getAsJsonObject(); - if (jsnOBJ != null) { - String ancRes = ancService.saveANCNurseData(jsnOBJ, Authorization); - response.setResponse(ancRes); - } else { - response.setError(5000, "Invalid request"); - } + try { - } catch (Exception e) { - logger.error("Error while saving nurse data:" + e); - response.setError(5000, "Unable to save data"); + 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()); + } } return response.toString(); } @@ -127,8 +132,8 @@ public String saveBenANCDoctorData(@RequestBody String requestObj, } } catch (Exception e) { - logger.error("Error while saving doctor data:" + e); - response.setError(5000, "Unable to save data. " + e.getMessage()); + logger.error("Error while saving doctor data:" + e.getMessage()); + response.setError(5000, e.getMessage()); } return response.toString(); } @@ -564,8 +569,8 @@ public String updateANCDoctorData(@RequestBody String requestObj, } logger.info("ANC doctor data update Response:" + response); } catch (Exception e) { - response.setError(5000, "Unable to modify data. " + e.getMessage()); - logger.error("Error while updating beneficiary doctor data :" + e); + logger.error("Unable to modify data. " + e.getMessage()); + response.setError(5000, e.getMessage()); } return 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 fb0380d3..b9d59197 100644 --- a/src/main/java/com/iemr/hwc/controller/cancerscreening/CancerScreeningController.java +++ b/src/main/java/com/iemr/hwc/controller/cancerscreening/CancerScreeningController.java @@ -67,31 +67,36 @@ public void setCancerScreeningServiceImpl(CSServiceImpl cSServiceImpl) { * @Objective Save Cancer Screening data for nurse. * @param JSON requestObj * @return success or failure response + * @throws Exception */ @CrossOrigin @ApiOperation(value = "Save cancer screening data collected by nurse", consumes = "application/json", produces = "application/json") @RequestMapping(value = { "/save/nurseData" }, method = { RequestMethod.POST }) public String saveBenCancerScreeningNurseData(@RequestBody String requestObj, - @RequestHeader(value = "Authorization") String Authorization) { + @RequestHeader(value = "Authorization") String Authorization) throws Exception { OutputResponse response = new OutputResponse(); - try { - logger.info("Request object for CS nurse data saving :" + requestObj); + if (null != requestObj) { JsonObject jsnOBJ = new JsonObject(); JsonParser jsnParser = new JsonParser(); JsonElement jsnElmnt = jsnParser.parse(requestObj); jsnOBJ = jsnElmnt.getAsJsonObject(); - if (jsnOBJ != null) { - String nurseDataSaveSuccessFlag = cSServiceImpl.saveCancerScreeningNurseData(jsnOBJ, Authorization); - response.setResponse(nurseDataSaveSuccessFlag); - } else { - response.setError(5000, "Invalid request"); + 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()); } - } catch (Exception e) { - logger.error("Error while saving beneficiary nurse data :" + e); - response.setError(5000, "Unable to save data"); } return response.toString(); } @@ -128,8 +133,8 @@ public String saveBenCancerScreeningDoctorData(@RequestBody String requestObj, } } catch (Exception e) { - logger.error("Error while saving beneficiary doctor data :" + e); - response.setError(5000, "Unable to save data"); + logger.error("Error while saving beneficiary doctor data :" + e.getMessage()); + response.setError(5000, e.getMessage()); } return response.toString(); } @@ -608,8 +613,8 @@ public String updateCancerScreeningDoctorData(@RequestBody String requestObj) { } logger.info("CS doctor data update Response:" + response); } catch (Exception e) { - response.setError(5000, "Error while updating beneficiary data. " + e); - logger.error("Error while updating beneficiary doctor data :" + e); + logger.error("Error while updating beneficiary data. " + e.getMessage()); + response.setError(5000, e.getMessage()); } return 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 1a2cd164..e742bef1 100644 --- a/src/main/java/com/iemr/hwc/controller/covid19/CovidController.java +++ b/src/main/java/com/iemr/hwc/controller/covid19/CovidController.java @@ -62,26 +62,30 @@ public class CovidController { @ApiOperation(value = "Save COVID nurse data", consumes = "application/json", produces = "application/json") @RequestMapping(value = { "/save/nurseData" }, method = { RequestMethod.POST }) public String saveBenNCDCareNurseData(@RequestBody String requestObj, - @RequestHeader(value = "Authorization") String Authorization) { + @RequestHeader(value = "Authorization") String Authorization) throws Exception { OutputResponse response = new OutputResponse(); - try { - logger.info("Request object for COVID 19 nurse data saving :" + requestObj); + if (null != requestObj) { JsonObject jsnOBJ = new JsonObject(); JsonParser jsnParser = new JsonParser(); JsonElement jsnElmnt = jsnParser.parse(requestObj); jsnOBJ = jsnElmnt.getAsJsonObject(); - if (jsnOBJ != null) { - String ncdCareRes = covid19ServiceImpl.saveCovid19NurseData(jsnOBJ, Authorization); - response.setResponse(ncdCareRes); - } else { - response.setError(5000, "Invalid Request !!!"); - } + try { + logger.info("Request object for COVID 19 nurse data saving :" + requestObj); - } catch (Exception e) { - logger.error("Error while saving Pandemic nurse data :" + e); - response.setError(5000, "Unable to save data"); + 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()); + } } return response.toString(); } @@ -117,8 +121,8 @@ public String saveBenCovidDoctorData(@RequestBody String requestObj, response.setResponse("Invalid request"); } } catch (Exception e) { - logger.error("Error while saving Covid doctor data :" + e); - response.setError(5000, "Unable to save data. " + e.getMessage()); + logger.error("Error while saving Covid doctor data :" + e.getMessage()); + response.setError(5000, e.getMessage()); } return response.toString(); } @@ -364,8 +368,8 @@ public String updateCovid19DoctorData(@RequestBody String requestObj, } logger.info("Doctor data update Response:" + response); } catch (Exception e) { - response.setError(500, "Unable to modify data. " + e.getMessage()); - logger.error("Error while updating doctor data :" + e); + logger.error("Unable to modify data. " + e.getMessage()); + response.setError(5000, e.getMessage()); } return response.toString(); diff --git a/src/main/java/com/iemr/hwc/controller/familyPlanning/FamilyPlanningController.java b/src/main/java/com/iemr/hwc/controller/familyPlanning/FamilyPlanningController.java index 552fe2cf..3460ea84 100644 --- a/src/main/java/com/iemr/hwc/controller/familyPlanning/FamilyPlanningController.java +++ b/src/main/java/com/iemr/hwc/controller/familyPlanning/FamilyPlanningController.java @@ -121,26 +121,31 @@ public String saveFamilyPlanningNuseData(@ApiParam(value = "{\r\n" + " \"visitD + " \"parkingPlaceID\": 246,\r\n" + " \"vanID\": 220,\r\n" + " \"serviceID\": \"4\",\r\n" + " \"createdBy\": \"testtm\",\r\n" + " \"tcRequest\": null,\r\n" + " \"beneficiaryRegID\": \"274661\",\r\n" + " \"providerServiceMapID\": \"1261\"\r\n" + "}\r\n" - + "") @RequestBody String requestOBJ, @RequestHeader(value = "Authorization") String Authorization) { + + "") @RequestBody String requestOBJ, @RequestHeader(value = "Authorization") String Authorization) + throws Exception { OutputResponse response = new OutputResponse(); - try { + if (null != requestOBJ) { JsonObject jsnOBJ = new JsonObject(); JsonParser jsnParser = new JsonParser(); JsonElement jsnElmnt = jsnParser.parse(requestOBJ); jsnOBJ = jsnElmnt.getAsJsonObject(); - if (jsnOBJ != null) { + try { - String outcome = familyPlanningService.saveNurseDataFP(jsnOBJ, Authorization); - // set response once data save successfully - response.setResponse(outcome); - } else - throw new IEMRException("Invalid request object / NULL"); - } catch (Exception e) { - logger.error("error in saving family-planning nurse data : " + e.getLocalizedMessage()); - response.setError(5000, "error in saving family-planning nurse data : " + e.getLocalizedMessage()); + if (jsnOBJ != null) { + + String outcome = familyPlanningService.saveNurseDataFP(jsnOBJ, Authorization); + // set response once data save successfully + response.setResponse(outcome); + } else + throw new IEMRException("Invalid request object / NULL"); + } catch (Exception e) { + logger.error("error in saving family-planning nurse data : " + e.getLocalizedMessage()); + familyPlanningService.deleteVisitDetails(jsnOBJ); + response.setError(5000, e.getMessage()); + } } return response.toString(); @@ -169,8 +174,8 @@ public String saveFamilyPlanningDoctorData(@RequestBody String requestObj, } } catch (Exception e) { - logger.error("Error while saving doctor data:" + e); - response.setError(5000, "Unable to save data. " + e.getMessage()); + logger.error("Error while saving doctor data:" + e.getMessage()); + response.setError(5000, e.getMessage()); } return response.toString(); } @@ -388,8 +393,8 @@ public String updateFamilyPlanningDoctorData(@RequestBody String requestObj, logger.info("Doctor data update response:" + response); } catch (Exception e) { - response.setError(5000, "Unable to modify data. " + e.getLocalizedMessage()); - logger.error("Error while updating FamilyPlanning doctor data:" + e); + logger.error("Unable to modify data. " + e.getLocalizedMessage()); + response.setError(5000, e.getMessage()); } return 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 fc1ae298..52379d6a 100644 --- a/src/main/java/com/iemr/hwc/controller/generalOPD/GeneralOPDController.java +++ b/src/main/java/com/iemr/hwc/controller/generalOPD/GeneralOPDController.java @@ -65,21 +65,25 @@ public void setGeneralOPDServiceImpl(GeneralOPDServiceImpl generalOPDServiceImpl * @Objective Save General OPD data for nurse. * @param requestObj * @return success or failure response + * @throws Exception */ @CrossOrigin @ApiOperation(value = "Save general OPD data collected by nurse", consumes = "application/json", produces = "application/json") @RequestMapping(value = { "/save/nurseData" }, method = { RequestMethod.POST }) public String saveBenGenOPDNurseData(@RequestBody String requestObj, - @RequestHeader(value = "Authorization") String Authorization) { + @RequestHeader(value = "Authorization") String Authorization) throws Exception { OutputResponse response = new OutputResponse(); - try { - logger.info("Request object for GeneralOPD nurse data saving :" + requestObj); - + + 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); @@ -87,8 +91,10 @@ public String saveBenGenOPDNurseData(@RequestBody String requestObj, response.setResponse("Invalid request"); } } catch (Exception e) { - logger.error("Error in nurse data saving :" + e); - response.setError(5000, "Unable to save data"); + logger.error("Error in nurse data saving :" + e.getMessage()); + generalOPDServiceImpl.deleteVisitDetails(jsnOBJ); + response.setError(5000, e.getMessage()); + } } return response.toString(); } @@ -124,8 +130,8 @@ public String saveBenGenOPDDoctorData(@RequestBody String requestObj, response.setResponse("Invalid request"); } } catch (Exception e) { - logger.error("Error in doctor data saving :" + e); - response.setError(5000, "Unable to save data. " + e.getMessage()); + logger.error("Error in doctor data saving :" + e.getMessage()); + response.setError(5000, e.getMessage()); } return response.toString(); } @@ -437,8 +443,8 @@ public String updateGeneralOPDDoctorData(@RequestBody String requestObj, } logger.info("Doctor data update response:" + response); } catch (Exception e) { - response.setError(5000, "Unable to modify data. " + e.getMessage()); - logger.error("Error while updating General OPD doctor data:" + e); + logger.error("Unable to modify data. " + e.getMessage()); + response.setError(5000, e.getMessage()); } return 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 17b719c1..8a8a618f 100644 --- a/src/main/java/com/iemr/hwc/controller/ncdCare/NCDCareController.java +++ b/src/main/java/com/iemr/hwc/controller/ncdCare/NCDCareController.java @@ -55,42 +55,42 @@ public class NCDCareController { private Logger logger = LoggerFactory.getLogger(this.getClass().getSimpleName()); - private NCDCareServiceImpl ncdCareServiceImpl; - @Autowired - public void setNcdCareServiceImpl(NCDCareServiceImpl ncdCareServiceImpl) { - this.ncdCareServiceImpl = ncdCareServiceImpl; - } + private NCDCareServiceImpl ncdCareServiceImpl; /** * @Objective Save NCD Care data for nurse. * @param JSON requestObj * @return success or failure response + * @throws Exception */ @CrossOrigin @ApiOperation(value = "Save NCD care data collected by nurse", consumes = "application/json", produces = "application/json") @RequestMapping(value = { "/save/nurseData" }, method = { RequestMethod.POST }) public String saveBenNCDCareNurseData(@RequestBody String requestObj, - @RequestHeader(value = "Authorization") String Authorization) { + @RequestHeader(value = "Authorization") String Authorization) throws Exception { OutputResponse response = new OutputResponse(); - try { - logger.info("Request object for NCD Care nurse data saving :" + requestObj); - + if (null != requestObj) { JsonObject jsnOBJ = new JsonObject(); JsonParser jsnParser = new JsonParser(); JsonElement jsnElmnt = jsnParser.parse(requestObj); jsnOBJ = jsnElmnt.getAsJsonObject(); - if (jsnOBJ != null) { - String ncdCareRes = ncdCareServiceImpl.saveNCDCareNurseData(jsnOBJ, Authorization); - response.setResponse(ncdCareRes); - } else { - response.setError(5000, "Invalid Request !!!"); - } + try { + logger.info("Request object for NCD Care nurse data saving :" + requestObj); - } catch (Exception e) { - logger.error("Error while saving NCD Care nurse data :" + e); - response.setError(5000, "Unable to save data"); + 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()); + } } return response.toString(); } @@ -126,8 +126,8 @@ public String saveBenNCDCareDoctorData(@RequestBody String requestObj, response.setResponse("Invalid request"); } } catch (Exception e) { - logger.error("Error while saving NCD Care doctor data :" + e); - response.setError(5000, "Unable to save data. " + e.getMessage()); + logger.error("Error while saving NCD Care doctor data :" + e.getMessage()); + response.setError(5000, e.getMessage()); } return response.toString(); } @@ -373,8 +373,8 @@ public String updateNCDCareDoctorData(@RequestBody String requestObj, } logger.info("Doctor data update Response:" + response); } catch (Exception e) { - response.setError(500, "Unable to modify data. " + e.getMessage()); - logger.error("Error while updating doctor data :" + e); + logger.error("Unable to modify data. " + e.getMessage()); + response.setError(5000, e.getMessage()); } return response.toString(); diff --git a/src/main/java/com/iemr/hwc/controller/ncdscreening/NCDScreeningController.java b/src/main/java/com/iemr/hwc/controller/ncdscreening/NCDScreeningController.java index f470f1b7..c211015d 100644 --- a/src/main/java/com/iemr/hwc/controller/ncdscreening/NCDScreeningController.java +++ b/src/main/java/com/iemr/hwc/controller/ncdscreening/NCDScreeningController.java @@ -59,45 +59,48 @@ public class NCDScreeningController { @Autowired private NCDScreeningService ncdScreeningService; - + @Autowired private NCDSCreeningDoctorService ncdSCreeningDoctorService; /** * @Objective Save NCD Screening data for nurse. - * @param JSON requestObj + * @param JSON requestObj * @return success or failure response + * @throws Exception */ @CrossOrigin @ApiOperation(value = "Save NCD screening beneficiary data collected by nurse", consumes = "application/json", produces = "application/json") @RequestMapping(value = { "/save/nurseData" }, method = { RequestMethod.POST }) public String saveBeneficiaryNCDScreeningDetails(@RequestBody String requestObj, - @RequestHeader(value = "Authorization") String Authorization) { + @RequestHeader(value = "Authorization") String Authorization) throws Exception { logger.info("Request object for NCD Screening nurse data saving :" + requestObj); OutputResponse response = new OutputResponse(); - JsonObject jsonObject = new JsonObject(); - JsonParser jsonParser = new JsonParser(); - - try { - JsonElement jsonElement = jsonParser.parse(requestObj); - jsonObject = jsonElement.getAsJsonObject(); + if (null != requestObj) { + JsonObject jsonObject = new JsonObject(); + JsonParser jsnParser = new JsonParser(); + JsonElement jsnElmnt = jsnParser.parse(requestObj); + jsonObject = jsnElmnt.getAsJsonObject(); - if (jsonObject != null) { - String r = ncdScreeningService.saveNCDScreeningNurseData(jsonObject,Authorization); - response.setResponse(r); - } else { - response.setError(5000, "Invalid request"); + try { + if (jsonObject != null) { + String r = ncdScreeningService.saveNCDScreeningNurseData(jsonObject, Authorization); + response.setResponse(r); + } else { + response.setError(5000, "Invalid request"); + } + } catch (Exception e) { + logger.error("Error in nurse data saving :" + e.getMessage()); + ncdScreeningService.deleteVisitDetails(jsonObject); + response.setError(5000, e.getMessage()); } - } catch (Exception e) { - response.setError(5000, "Unable to save data"); - logger.error("Error while storing NCD Screening nurse data: " + e); } return response.toString(); } - + @CrossOrigin @ApiOperation(value = "Save NCD screening beneficiary data collected by doctor", consumes = "application/json", produces = "application/json") @RequestMapping(value = { "/save/doctorData" }, method = { RequestMethod.POST }) @@ -124,11 +127,12 @@ public String saveBenNCDScreeningDoctorData(@RequestBody String requestObj, response.setResponse("Invalid request"); } } catch (Exception e) { - logger.error("Error while saving NCD Screening doctor data :" + e); - response.setError(5000, "Unable to save data. " + e.getMessage()); + logger.error("Error while saving NCD Screening doctor data :" + e.getMessage()); + response.setError(5000, e.getMessage()); } return response.toString(); } + /** * @Objective Fetching NCD Screening nurse data. * @param benRegID and benVisitID @@ -392,6 +396,7 @@ public String getCbacDetails( } return response.toStringWithSerializeNulls(); } + /** * * @param requestObj @@ -543,8 +548,8 @@ public String updateDoctorData(@RequestBody String requestObj, else response.setError(5000, "Error in data update"); } catch (Exception e) { - response.setError(5000, "Unable to modify data : " + e.getLocalizedMessage()); - logger.error("Error while updating doctor data : " + e); + logger.error("Unable to modify data : " + e.getLocalizedMessage()); + response.setError(5000, e.getMessage()); } return response.toString(); diff --git a/src/main/java/com/iemr/hwc/controller/neonatal/NeonatalController.java b/src/main/java/com/iemr/hwc/controller/neonatal/NeonatalController.java index f73b671c..f249239f 100644 --- a/src/main/java/com/iemr/hwc/controller/neonatal/NeonatalController.java +++ b/src/main/java/com/iemr/hwc/controller/neonatal/NeonatalController.java @@ -60,34 +60,39 @@ public class NeonatalController { * @Objective Save neonatal infant data for nurse. * @param requestObj * @return success or failure response with visit code + * @throws Exception */ @CrossOrigin @ApiOperation(value = "Save neonatal infant nurse data", consumes = "application/json", produces = "application/json") @RequestMapping(value = { "/save/nurseData" }, method = { RequestMethod.POST }) public String saveBenNeoNatalAndInfantNurseData(@RequestBody String requestObj, - @RequestHeader(value = "Authorization") String Authorization) { + @RequestHeader(value = "Authorization") String Authorization) throws Exception { OutputResponse response = new OutputResponse(); - try { - logger.info("Request object for neonatal infant nurse data saving :" + requestObj); + if (null != requestObj) { JsonObject jsnOBJ = new JsonObject(); JsonParser jsnParser = new JsonParser(); JsonElement jsnElmnt = jsnParser.parse(requestObj); jsnOBJ = jsnElmnt.getAsJsonObject(); - if (jsnOBJ != null) { - String genOPDRes = neonatalService.saveNurseData(jsnOBJ, Authorization); - response.setResponse(genOPDRes); - - } else { - response.setResponse("Invalid request"); + try { + logger.info("Request object for neonatal infant nurse data saving :" + requestObj); + + if (jsnOBJ != null) { + String genOPDRes = neonatalService.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()); + neonatalService.deleteVisitDetails(jsnOBJ); + response.setError(5000, e.getMessage()); } - } 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); - response.setError(5000, "Unable to save data : " + e.getLocalizedMessage()); } return response.toString(); } @@ -115,8 +120,8 @@ public String saveNNIDoctorData(@RequestBody String requestObj, } } catch (Exception e) { - logger.error("Error while saving doctor data:" + e); - response.setError(5000, "Unable to save data. " + e.getMessage()); + logger.error("Error while saving doctor data:" + e.getMessage()); + response.setError(5000, e.getMessage()); } return response.toString(); } @@ -398,8 +403,8 @@ public String updateNNIDoctorData(@RequestBody String requestObj, logger.info("Doctor data update response:" + response); } catch (Exception e) { - response.setError(5000, "Unable to modify data. " + e.getLocalizedMessage()); - logger.error("Error while updating neonatal infant doctor data:" + e); + logger.error("Unable to modify data. " + e.getLocalizedMessage()); + response.setError(5000, e.getMessage()); } return 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 650a4620..9c80d27c 100644 --- a/src/main/java/com/iemr/hwc/controller/pnc/PostnatalCareController.java +++ b/src/main/java/com/iemr/hwc/controller/pnc/PostnatalCareController.java @@ -63,32 +63,37 @@ public void setPncServiceImpl(PNCServiceImpl pncServiceImpl) { * @Objective Saving PNC nurse data * @param requestObj * @return success or failure response + * @throws Exception */ @CrossOrigin @ApiOperation(value = "Save PNC nurse data", consumes = "application/json", produces = "application/json") @RequestMapping(value = { "/save/nurseData" }, method = { RequestMethod.POST }) public String saveBenPNCNurseData(@RequestBody String requestObj, - @RequestHeader(value = "Authorization") String Authorization) { + @RequestHeader(value = "Authorization") String Authorization) throws Exception { OutputResponse response = new OutputResponse(); - try { - logger.info("Request object for PNC nurse data saving :" + requestObj); + if (null != requestObj) { JsonObject jsnOBJ = new JsonObject(); JsonParser jsnParser = new JsonParser(); JsonElement jsnElmnt = jsnParser.parse(requestObj); jsnOBJ = jsnElmnt.getAsJsonObject(); - if (jsnOBJ != null) { - String ancRes = pncServiceImpl.savePNCNurseData(jsnOBJ, Authorization); - response.setResponse(ancRes); - } else { - response.setError(5000, "Invalid request"); - } + try { + logger.info("Request object for PNC nurse data saving :" + requestObj); - } catch (Exception e) { - logger.error("Error while saving nurse data :" + e); - response.setError(5000, "Unable to save data"); + 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()); + } } return response.toString(); } @@ -124,8 +129,8 @@ public String saveBenPNCDoctorData(@RequestBody String requestObj, } } catch (Exception e) { - logger.error("Error while saving doctor data :" + e); - response.setError(5000, "Unable to save data. " + e.getMessage()); + logger.error("Error while saving doctor data :" + e.getMessage()); + response.setError(5000, e.getMessage()); } return response.toString(); } @@ -505,8 +510,8 @@ public String updatePNCDoctorData(@RequestBody String requestObj, } logger.info("Doctor data update response:" + response); } catch (Exception e) { - response.setError(5000, "Unable to modify data. " + e.getMessage()); - logger.error("Error while updating doctor data :" + e); + logger.error("Unable to modify data. " + e.getMessage()); + response.setError(5000, e.getMessage()); } return response.toString(); diff --git a/src/main/java/com/iemr/hwc/controller/quickconsult/QuickConsultController.java b/src/main/java/com/iemr/hwc/controller/quickconsult/QuickConsultController.java index 6fb93c2d..aa9430bc 100644 --- a/src/main/java/com/iemr/hwc/controller/quickconsult/QuickConsultController.java +++ b/src/main/java/com/iemr/hwc/controller/quickconsult/QuickConsultController.java @@ -65,6 +65,7 @@ public void setQuickConsultationServiceImpl(QuickConsultationServiceImpl quickCo * * @param requestObj * @return success or failure response + * @throws Exception * @objective first data will be pushed to BenVisitDetails Table and benVisitID * will be generated and then this benVisitID will be patched with * Beneficiary Vital and Anthropometry Detail Object and pushed to @@ -74,24 +75,28 @@ public void setQuickConsultationServiceImpl(QuickConsultationServiceImpl quickCo @ApiOperation(value = "Save quick consult nurse data", consumes = "application/json", produces = "application/json") @RequestMapping(value = { "/save/nurseData" }, method = { RequestMethod.POST }) public String saveBenQuickConsultDataNurse(@RequestBody String requestObj, - @RequestHeader(value = "Authorization") String Authorization) { + @RequestHeader(value = "Authorization") String Authorization) throws Exception { OutputResponse response = new OutputResponse(); - logger.info("Quick consult nurse data save request : " + requestObj); - try { + + if (null != requestObj) { JsonObject jsnOBJ = new JsonObject(); JsonParser jsnParser = new JsonParser(); JsonElement jsnElmnt = jsnParser.parse(requestObj); jsnOBJ = jsnElmnt.getAsJsonObject(); - if (jsnOBJ != null) { - String r = quickConsultationServiceImpl.quickConsultNurseDataInsert(jsnOBJ, Authorization); - response.setResponse(r); - } else { - response.setError(5000, "Invalid request"); + logger.info("Quick consult nurse data save request : " + requestObj); + try { + if (jsnOBJ != null) { + String r = quickConsultationServiceImpl.quickConsultNurseDataInsert(jsnOBJ, Authorization); + response.setResponse(r); + } else { + response.setError(5000, "Invalid request"); + } + } catch (Exception e) { + logger.error("Error while saving quick consult nurse data: " + e.getMessage()); + quickConsultationServiceImpl.deleteVisitDetails(jsnOBJ); + response.setError(5000, e.getMessage()); } - } catch (Exception e) { - logger.error("Error while saving quick consult nurse data: " + e); - response.setError(5000, "Unable to save data"); } return response.toString(); } @@ -135,8 +140,8 @@ public String saveQuickConsultationDetail( } logger.info("Quick consult doctor data save response:" + response); } catch (Exception e) { - logger.error("Error while saving quick consult doctor data:" + e); - response.setError(5000, "Unable to save data. " + e.getMessage()); + logger.error("Error while saving quick consult doctor data:" + e.getMessage()); + response.setError(5000, e.getMessage()); } return response.toString(); @@ -281,8 +286,8 @@ public String updateGeneralOPDQCDoctorData(@RequestBody String requestObj, } logger.info("Quick consult doctor data update response:" + response); } catch (Exception e) { - response.setError(5000, "Unable to modify data"); - logger.error("Error while updating quick consult doctor data :" + e); + logger.error("Unable to modify data. " + e.getMessage()); + response.setError(5000, e.getMessage()); } return response.toString(); diff --git a/src/main/java/com/iemr/hwc/repo/adolescent/OralVitaminNoOfDoseMasterRepo.java b/src/main/java/com/iemr/hwc/repo/adolescent/OralVitaminNoOfDoseMasterRepo.java index 0393a99b..79d2aee7 100644 --- a/src/main/java/com/iemr/hwc/repo/adolescent/OralVitaminNoOfDoseMasterRepo.java +++ b/src/main/java/com/iemr/hwc/repo/adolescent/OralVitaminNoOfDoseMasterRepo.java @@ -24,11 +24,13 @@ import java.util.List; import org.springframework.data.repository.CrudRepository; +import org.springframework.data.rest.core.annotation.RestResource; import org.springframework.stereotype.Repository; import com.iemr.hwc.data.adolescent.OralVitaminNoOfDoseMaster; @Repository +@RestResource(exported = false) public interface OralVitaminNoOfDoseMasterRepo extends CrudRepository { List findByDeleted(Boolean deleted); diff --git a/src/main/java/com/iemr/hwc/repo/adolescent/T_OralVitaminProphylaxisRepo.java b/src/main/java/com/iemr/hwc/repo/adolescent/T_OralVitaminProphylaxisRepo.java index 3439976d..7dbe0e9c 100644 --- a/src/main/java/com/iemr/hwc/repo/adolescent/T_OralVitaminProphylaxisRepo.java +++ b/src/main/java/com/iemr/hwc/repo/adolescent/T_OralVitaminProphylaxisRepo.java @@ -24,11 +24,13 @@ import java.util.List; import org.springframework.data.repository.CrudRepository; +import org.springframework.data.rest.core.annotation.RestResource; import org.springframework.stereotype.Repository; import com.iemr.hwc.data.adolescent.T_OralVitaminProphylaxis; @Repository +@RestResource(exported = false) public interface T_OralVitaminProphylaxisRepo extends CrudRepository { List findByBeneficiaryRegIDAndVisitCodeAndDeleted(Long regId, Long visitCode, diff --git a/src/main/java/com/iemr/hwc/repo/family_planning/FPDispenseDetailsRepo.java b/src/main/java/com/iemr/hwc/repo/family_planning/FPDispenseDetailsRepo.java index 5fd142ed..cc1a4b0d 100644 --- a/src/main/java/com/iemr/hwc/repo/family_planning/FPDispenseDetailsRepo.java +++ b/src/main/java/com/iemr/hwc/repo/family_planning/FPDispenseDetailsRepo.java @@ -24,11 +24,13 @@ import java.util.List; import org.springframework.data.repository.CrudRepository; +import org.springframework.data.rest.core.annotation.RestResource; import org.springframework.stereotype.Repository; import com.iemr.hwc.data.family_planning.FPDispenseDetails; @Repository +@RestResource(exported = false) public interface FPDispenseDetailsRepo extends CrudRepository { public FPDispenseDetails findOneByBeneficiaryRegIDAndVisitCode(Long regId, Long visitCode); diff --git a/src/main/java/com/iemr/hwc/repo/family_planning/FPIecCounsellingDetailsRepo.java b/src/main/java/com/iemr/hwc/repo/family_planning/FPIecCounsellingDetailsRepo.java index 1a1839a8..b84f6c0b 100644 --- a/src/main/java/com/iemr/hwc/repo/family_planning/FPIecCounsellingDetailsRepo.java +++ b/src/main/java/com/iemr/hwc/repo/family_planning/FPIecCounsellingDetailsRepo.java @@ -24,11 +24,13 @@ import java.util.List; import org.springframework.data.repository.CrudRepository; +import org.springframework.data.rest.core.annotation.RestResource; import org.springframework.stereotype.Repository; import com.iemr.hwc.data.family_planning.FPIecCounsellingDetails; @Repository +@RestResource(exported = false) public interface FPIecCounsellingDetailsRepo extends CrudRepository { public FPIecCounsellingDetails findOneByBeneficiaryRegIDAndVisitCode(Long regId, Long visitCode); diff --git a/src/main/java/com/iemr/hwc/repo/family_planning/FamilyPlanningReproductiveRepo.java b/src/main/java/com/iemr/hwc/repo/family_planning/FamilyPlanningReproductiveRepo.java index 6307d2e9..37aefe2f 100644 --- a/src/main/java/com/iemr/hwc/repo/family_planning/FamilyPlanningReproductiveRepo.java +++ b/src/main/java/com/iemr/hwc/repo/family_planning/FamilyPlanningReproductiveRepo.java @@ -24,11 +24,13 @@ import java.util.List; import org.springframework.data.repository.CrudRepository; +import org.springframework.data.rest.core.annotation.RestResource; import org.springframework.stereotype.Repository; import com.iemr.hwc.data.family_planning.FamilyPlanningReproductive; @Repository +@RestResource(exported = false) public interface FamilyPlanningReproductiveRepo extends CrudRepository { public FamilyPlanningReproductive findOneByBeneficiaryRegIDAndVisitCode(Long regId, Long visitCode); diff --git a/src/main/java/com/iemr/hwc/repo/masterrepo/RelationshipMasterRepo.java b/src/main/java/com/iemr/hwc/repo/masterrepo/RelationshipMasterRepo.java index 0e8b8050..fb074894 100644 --- a/src/main/java/com/iemr/hwc/repo/masterrepo/RelationshipMasterRepo.java +++ b/src/main/java/com/iemr/hwc/repo/masterrepo/RelationshipMasterRepo.java @@ -25,9 +25,12 @@ import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.CrudRepository; +import org.springframework.data.rest.core.annotation.RestResource; +import org.springframework.stereotype.Repository; import com.iemr.hwc.data.masterdata.registrar.RelationshipMaster; - +@Repository +@RestResource(exported = false) public interface RelationshipMasterRepo extends CrudRepository { @Query("select r from RelationshipMaster r where r.deleted is false") diff --git a/src/main/java/com/iemr/hwc/repo/masterrepo/ncdScreening/BloodGlucoseMasterRepo.java b/src/main/java/com/iemr/hwc/repo/masterrepo/ncdScreening/BloodGlucoseMasterRepo.java index e1856496..fcabe13e 100644 --- a/src/main/java/com/iemr/hwc/repo/masterrepo/ncdScreening/BloodGlucoseMasterRepo.java +++ b/src/main/java/com/iemr/hwc/repo/masterrepo/ncdScreening/BloodGlucoseMasterRepo.java @@ -25,10 +25,12 @@ import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.CrudRepository; +import org.springframework.data.rest.core.annotation.RestResource; import org.springframework.stereotype.Repository; import com.iemr.hwc.data.masterdata.ncdscreening.BloodGlucoseType; @Repository +@RestResource(exported = false) public interface BloodGlucoseMasterRepo extends CrudRepository { @Query("select b from BloodGlucoseType b where b.deleted = false") diff --git a/src/main/java/com/iemr/hwc/repo/masterrepo/ncdScreening/CBACRepo.java b/src/main/java/com/iemr/hwc/repo/masterrepo/ncdScreening/CBACRepo.java index 8e121717..202bb2c0 100644 --- a/src/main/java/com/iemr/hwc/repo/masterrepo/ncdScreening/CBACRepo.java +++ b/src/main/java/com/iemr/hwc/repo/masterrepo/ncdScreening/CBACRepo.java @@ -26,10 +26,12 @@ import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.CrudRepository; import org.springframework.data.repository.query.Param; +import org.springframework.data.rest.core.annotation.RestResource; import org.springframework.stereotype.Repository; import com.iemr.hwc.data.masterdata.ncdscreening.CBAC; @Repository +@RestResource(exported = false) public interface CBACRepo extends CrudRepository { @Query("select c from CBAC c where c.deleted = false AND (c.gender =:gender OR c.gender is null) order by questionId") diff --git a/src/main/java/com/iemr/hwc/repo/masterrepo/ncdScreening/CervicalLympRepo.java b/src/main/java/com/iemr/hwc/repo/masterrepo/ncdScreening/CervicalLympRepo.java index 8c6cfebf..dfa459fc 100644 --- a/src/main/java/com/iemr/hwc/repo/masterrepo/ncdScreening/CervicalLympRepo.java +++ b/src/main/java/com/iemr/hwc/repo/masterrepo/ncdScreening/CervicalLympRepo.java @@ -25,9 +25,12 @@ import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.CrudRepository; +import org.springframework.data.rest.core.annotation.RestResource; +import org.springframework.stereotype.Repository; import com.iemr.hwc.data.masterdata.ncdscreening.CervicalLymph; - +@Repository +@RestResource(exported = false) public interface CervicalLympRepo extends CrudRepository { @Query("SELECT obj FROM CervicalLymph obj WHERE obj.deleted is false") diff --git a/src/main/java/com/iemr/hwc/repo/masterrepo/ncdScreening/InpectionBreastsRepo.java b/src/main/java/com/iemr/hwc/repo/masterrepo/ncdScreening/InpectionBreastsRepo.java index 11b1bdea..b74cf35b 100644 --- a/src/main/java/com/iemr/hwc/repo/masterrepo/ncdScreening/InpectionBreastsRepo.java +++ b/src/main/java/com/iemr/hwc/repo/masterrepo/ncdScreening/InpectionBreastsRepo.java @@ -25,9 +25,12 @@ import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.CrudRepository; +import org.springframework.data.rest.core.annotation.RestResource; +import org.springframework.stereotype.Repository; import com.iemr.hwc.data.masterdata.ncdscreening.InpectionofBreasts; - +@Repository +@RestResource(exported = false) public interface InpectionBreastsRepo extends CrudRepository { @Query("SELECT obj FROM InpectionofBreasts obj WHERE obj.deleted is false") ArrayList getBreastInspectionMasters(); diff --git a/src/main/java/com/iemr/hwc/repo/masterrepo/ncdScreening/MouthOpeningRepo.java b/src/main/java/com/iemr/hwc/repo/masterrepo/ncdScreening/MouthOpeningRepo.java index 734203b8..d4a6f0ce 100644 --- a/src/main/java/com/iemr/hwc/repo/masterrepo/ncdScreening/MouthOpeningRepo.java +++ b/src/main/java/com/iemr/hwc/repo/masterrepo/ncdScreening/MouthOpeningRepo.java @@ -25,9 +25,12 @@ import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.CrudRepository; +import org.springframework.data.rest.core.annotation.RestResource; +import org.springframework.stereotype.Repository; import com.iemr.hwc.data.masterdata.ncdscreening.MouthOpening; - +@Repository +@RestResource(exported = false) public interface MouthOpeningRepo extends CrudRepository { @Query("SELECT obj FROM MouthOpening obj WHERE obj.deleted is false") diff --git a/src/main/java/com/iemr/hwc/repo/masterrepo/ncdScreening/OralCavityFindingRepo.java b/src/main/java/com/iemr/hwc/repo/masterrepo/ncdScreening/OralCavityFindingRepo.java index 6f6de80b..ef3d46e8 100644 --- a/src/main/java/com/iemr/hwc/repo/masterrepo/ncdScreening/OralCavityFindingRepo.java +++ b/src/main/java/com/iemr/hwc/repo/masterrepo/ncdScreening/OralCavityFindingRepo.java @@ -25,9 +25,12 @@ import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.CrudRepository; +import org.springframework.data.rest.core.annotation.RestResource; +import org.springframework.stereotype.Repository; import com.iemr.hwc.data.masterdata.ncdscreening.OralCavityFinding; - +@Repository +@RestResource(exported = false) public interface OralCavityFindingRepo extends CrudRepository { @Query("SELECT obj FROM OralCavityFinding obj WHERE obj.deleted is false") ArrayList getOralCavityMasters(); diff --git a/src/main/java/com/iemr/hwc/repo/masterrepo/ncdScreening/PalpationBreastsRepo.java b/src/main/java/com/iemr/hwc/repo/masterrepo/ncdScreening/PalpationBreastsRepo.java index e94adcda..8580ffe8 100644 --- a/src/main/java/com/iemr/hwc/repo/masterrepo/ncdScreening/PalpationBreastsRepo.java +++ b/src/main/java/com/iemr/hwc/repo/masterrepo/ncdScreening/PalpationBreastsRepo.java @@ -25,9 +25,12 @@ import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.CrudRepository; +import org.springframework.data.rest.core.annotation.RestResource; +import org.springframework.stereotype.Repository; import com.iemr.hwc.data.masterdata.ncdscreening.PalpationOfBreasts; - +@Repository +@RestResource(exported = false) public interface PalpationBreastsRepo extends CrudRepository { @Query("SELECT obj FROM PalpationOfBreasts obj WHERE obj.deleted is false") ArrayList getPalpationBreastsMasters(); diff --git a/src/main/java/com/iemr/hwc/repo/masterrepo/ncdScreening/PalpationOfLymphRepo.java b/src/main/java/com/iemr/hwc/repo/masterrepo/ncdScreening/PalpationOfLymphRepo.java index 996a80b2..2ea3b593 100644 --- a/src/main/java/com/iemr/hwc/repo/masterrepo/ncdScreening/PalpationOfLymphRepo.java +++ b/src/main/java/com/iemr/hwc/repo/masterrepo/ncdScreening/PalpationOfLymphRepo.java @@ -25,9 +25,12 @@ import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.CrudRepository; +import org.springframework.data.rest.core.annotation.RestResource; +import org.springframework.stereotype.Repository; import com.iemr.hwc.data.masterdata.ncdscreening.PalpationOfLymph; - +@Repository +@RestResource(exported = false) public interface PalpationOfLymphRepo extends CrudRepository { @Query("SELECT obj FROM PalpationOfLymph obj WHERE obj.deleted is false") ArrayList getPalpationLymphMasters(); diff --git a/src/main/java/com/iemr/hwc/repo/masterrepo/ncdScreening/PalpationOralCavityRepo.java b/src/main/java/com/iemr/hwc/repo/masterrepo/ncdScreening/PalpationOralCavityRepo.java index b4ff43a5..e4a29d4a 100644 --- a/src/main/java/com/iemr/hwc/repo/masterrepo/ncdScreening/PalpationOralCavityRepo.java +++ b/src/main/java/com/iemr/hwc/repo/masterrepo/ncdScreening/PalpationOralCavityRepo.java @@ -25,9 +25,12 @@ import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.CrudRepository; +import org.springframework.data.rest.core.annotation.RestResource; +import org.springframework.stereotype.Repository; import com.iemr.hwc.data.masterdata.ncdscreening.PalpationOfOralCavity; - +@Repository +@RestResource(exported = false) public interface PalpationOralCavityRepo extends CrudRepository { @Query("SELECT obj FROM PalpationOfOralCavity obj WHERE obj.deleted is false") ArrayList getPalpationOralCavityMasters(); diff --git a/src/main/java/com/iemr/hwc/repo/masterrepo/ncdScreening/TemperomandibularRepo.java b/src/main/java/com/iemr/hwc/repo/masterrepo/ncdScreening/TemperomandibularRepo.java index 7b64b23a..5a7bbdd9 100644 --- a/src/main/java/com/iemr/hwc/repo/masterrepo/ncdScreening/TemperomandibularRepo.java +++ b/src/main/java/com/iemr/hwc/repo/masterrepo/ncdScreening/TemperomandibularRepo.java @@ -25,9 +25,12 @@ import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.CrudRepository; +import org.springframework.data.rest.core.annotation.RestResource; +import org.springframework.stereotype.Repository; import com.iemr.hwc.data.masterdata.ncdscreening.TemperomandibularJoin; - +@Repository +@RestResource(exported = false) public interface TemperomandibularRepo extends CrudRepository { @Query("SELECT obj FROM TemperomandibularJoin obj WHERE obj.deleted is false") ArrayList getTemperomandibularJoinMasters(); diff --git a/src/main/java/com/iemr/hwc/repo/masterrepo/ncdScreening/VisualExamRepo.java b/src/main/java/com/iemr/hwc/repo/masterrepo/ncdScreening/VisualExamRepo.java index 9f1e6f49..1694de73 100644 --- a/src/main/java/com/iemr/hwc/repo/masterrepo/ncdScreening/VisualExamRepo.java +++ b/src/main/java/com/iemr/hwc/repo/masterrepo/ncdScreening/VisualExamRepo.java @@ -25,9 +25,12 @@ import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.CrudRepository; +import org.springframework.data.rest.core.annotation.RestResource; +import org.springframework.stereotype.Repository; import com.iemr.hwc.data.masterdata.ncdscreening.VisualExamination; - +@Repository +@RestResource(exported = false) public interface VisualExamRepo extends CrudRepository { @Query("SELECT obj FROM VisualExamination obj WHERE obj.deleted is false") ArrayList getVisualExaminationMasters(); diff --git a/src/main/java/com/iemr/hwc/repo/masterrepo/pnc/DeliveryConductedByMasterRepo.java b/src/main/java/com/iemr/hwc/repo/masterrepo/pnc/DeliveryConductedByMasterRepo.java index 75b2c936..97b8db94 100644 --- a/src/main/java/com/iemr/hwc/repo/masterrepo/pnc/DeliveryConductedByMasterRepo.java +++ b/src/main/java/com/iemr/hwc/repo/masterrepo/pnc/DeliveryConductedByMasterRepo.java @@ -24,11 +24,13 @@ import java.util.List; import org.springframework.data.repository.CrudRepository; +import org.springframework.data.rest.core.annotation.RestResource; import org.springframework.stereotype.Repository; import com.iemr.hwc.data.masterdata.pnc.DeliveryConductedByMaster; @Repository +@RestResource(exported = false) public interface DeliveryConductedByMasterRepo extends CrudRepository { List findByDeleted(Boolean deleted); diff --git a/src/main/java/com/iemr/hwc/repo/neonatal/FollowUpForImmunizationRepo.java b/src/main/java/com/iemr/hwc/repo/neonatal/FollowUpForImmunizationRepo.java index 44e77de4..bef0467f 100644 --- a/src/main/java/com/iemr/hwc/repo/neonatal/FollowUpForImmunizationRepo.java +++ b/src/main/java/com/iemr/hwc/repo/neonatal/FollowUpForImmunizationRepo.java @@ -22,11 +22,13 @@ package com.iemr.hwc.repo.neonatal; import org.springframework.data.repository.CrudRepository; +import org.springframework.data.rest.core.annotation.RestResource; import org.springframework.stereotype.Repository; import com.iemr.hwc.data.neonatal.FollowUpForImmunization; @Repository +@RestResource(exported = false) public interface FollowUpForImmunizationRepo extends CrudRepository { FollowUpForImmunization findByBeneficiaryRegIDAndVisitCode(long benRegId, long visitCode); diff --git a/src/main/java/com/iemr/hwc/repo/neonatal/ImmunizationServicesRepo.java b/src/main/java/com/iemr/hwc/repo/neonatal/ImmunizationServicesRepo.java index 56d0af6c..660f8287 100644 --- a/src/main/java/com/iemr/hwc/repo/neonatal/ImmunizationServicesRepo.java +++ b/src/main/java/com/iemr/hwc/repo/neonatal/ImmunizationServicesRepo.java @@ -27,12 +27,14 @@ import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.CrudRepository; import org.springframework.data.repository.query.Param; +import org.springframework.data.rest.core.annotation.RestResource; import org.springframework.stereotype.Repository; import org.springframework.transaction.annotation.Transactional; import com.iemr.hwc.data.neonatal.ImmunizationServices; @Repository +@RestResource(exported = false) public interface ImmunizationServicesRepo extends CrudRepository { List findByBeneficiaryRegIDAndVisitCodeAndDeleted(long benRegId, long visitCode, boolean deleted); diff --git a/src/main/java/com/iemr/hwc/repo/neonatal/InfantBirthDetailsRepo.java b/src/main/java/com/iemr/hwc/repo/neonatal/InfantBirthDetailsRepo.java index 51bcc0c5..7660d1ee 100644 --- a/src/main/java/com/iemr/hwc/repo/neonatal/InfantBirthDetailsRepo.java +++ b/src/main/java/com/iemr/hwc/repo/neonatal/InfantBirthDetailsRepo.java @@ -22,11 +22,13 @@ package com.iemr.hwc.repo.neonatal; import org.springframework.data.repository.CrudRepository; +import org.springframework.data.rest.core.annotation.RestResource; import org.springframework.stereotype.Repository; import com.iemr.hwc.data.neonatal.InfantBirthDetails; @Repository +@RestResource(exported = false) public interface InfantBirthDetailsRepo extends CrudRepository { InfantBirthDetails findByBeneficiaryRegIDAndVisitCode(Long benRegId, Long visitCode); diff --git a/src/main/java/com/iemr/hwc/repo/nurse/BenVisitDetailRepo.java b/src/main/java/com/iemr/hwc/repo/nurse/BenVisitDetailRepo.java index 2cb78bbd..14b0da09 100644 --- a/src/main/java/com/iemr/hwc/repo/nurse/BenVisitDetailRepo.java +++ b/src/main/java/com/iemr/hwc/repo/nurse/BenVisitDetailRepo.java @@ -120,4 +120,13 @@ public int updateFileID(@Param("fileIDs") String fileIDs, @Param("regID") Long r @Query(" SELECT bvd from BeneficiaryVisitDetail bvd WHERE bvd.benVisitID = :benVisitID AND bvd.lastModDate > :lastModDate ORDER BY bvd.lastModDate DESC") public BeneficiaryVisitDetail getVisitDetailsByVisitIDAndLastModifDate(@Param("benVisitID") Long benVisitID, @Param("lastModDate") Timestamp lastModDate); + @Query(nativeQuery = true, value = " SELECT v.visitCode FROM t_benvisitdetail v WHERE v.beneficiaryRegID=:benRegId AND v.providerServiceMapID=:psmId ORDER BY BenVisitID DESC LIMIT 1 ") + public Long getVisitCode(@Param("benRegId") Long benRegId, @Param("psmId") Integer psmId); + + @Modifying + @Transactional + @Query(" DELETE FROM BeneficiaryVisitDetail WHERE visitCode=:visitCode ") + public int deleteVisitDetails(@Param("visitCode") Long visitCode); + + } diff --git a/src/main/java/com/iemr/hwc/repo/nurse/CDSSRepo.java b/src/main/java/com/iemr/hwc/repo/nurse/CDSSRepo.java index ba0597cb..9d9e4d9f 100644 --- a/src/main/java/com/iemr/hwc/repo/nurse/CDSSRepo.java +++ b/src/main/java/com/iemr/hwc/repo/nurse/CDSSRepo.java @@ -1,16 +1,26 @@ package com.iemr.hwc.repo.nurse; +import javax.transaction.Transactional; + +import org.springframework.data.jpa.repository.Modifying; import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.CrudRepository; import org.springframework.data.repository.query.Param; +import org.springframework.data.rest.core.annotation.RestResource; import org.springframework.stereotype.Repository; import com.iemr.hwc.data.nurse.CDSS; @Repository +@RestResource(exported = false) public interface CDSSRepo extends CrudRepository { CDSS findByBeneficiaryRegIDAndVisitCode(Long beneficiaryRegID, Long visitCode); + @Modifying + @Transactional + @Query("DELETE FROM CDSS WHERE visitCode=:visitCode ") + public int deleteVisitDetails(@Param("visitCode") Long visitCode); + } diff --git a/src/main/java/com/iemr/hwc/repo/nurse/anc/BenAdherenceRepo.java b/src/main/java/com/iemr/hwc/repo/nurse/anc/BenAdherenceRepo.java index 6a24b524..546f9211 100644 --- a/src/main/java/com/iemr/hwc/repo/nurse/anc/BenAdherenceRepo.java +++ b/src/main/java/com/iemr/hwc/repo/nurse/anc/BenAdherenceRepo.java @@ -63,4 +63,9 @@ public int updateBenAdherence(@Param("toDrugs") Boolean toDrugs, @Param("benVisitID") Long benVisitID, @Param("ID") Long ID); + @Modifying + @Transactional + @Query("DELETE FROM BenAdherence WHERE visitCode=:visitCode ") + public int deleteVisitDetails(@Param("visitCode") Long visitCode); + } diff --git a/src/main/java/com/iemr/hwc/repo/nurse/covid19/Covid19BenFeedbackRepo.java b/src/main/java/com/iemr/hwc/repo/nurse/covid19/Covid19BenFeedbackRepo.java index 0e87f577..c47307d0 100644 --- a/src/main/java/com/iemr/hwc/repo/nurse/covid19/Covid19BenFeedbackRepo.java +++ b/src/main/java/com/iemr/hwc/repo/nurse/covid19/Covid19BenFeedbackRepo.java @@ -21,9 +21,13 @@ */ package com.iemr.hwc.repo.nurse.covid19; +import org.springframework.data.jpa.repository.Modifying; +import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.CrudRepository; +import org.springframework.data.repository.query.Param; import org.springframework.data.rest.core.annotation.RestResource; import org.springframework.stereotype.Repository; +import org.springframework.transaction.annotation.Transactional; import com.iemr.hwc.data.covid19.Covid19BenFeedback; @@ -31,4 +35,9 @@ @RestResource(exported = false) public interface Covid19BenFeedbackRepo extends CrudRepository { Covid19BenFeedback findByBeneficiaryRegIDAndVisitCode(Long benRegID, Long visitCode); + + @Modifying + @Transactional + @Query(" DELETE FROM Covid19BenFeedback WHERE visitCode=:visitCode ") + public int deleteVisitDetails(@Param("visitCode") Long visitCode); } diff --git a/src/main/java/com/iemr/hwc/repo/nurse/ncdscreening/BreastCancerScreeningRepo.java b/src/main/java/com/iemr/hwc/repo/nurse/ncdscreening/BreastCancerScreeningRepo.java index 4094301b..859df1bd 100644 --- a/src/main/java/com/iemr/hwc/repo/nurse/ncdscreening/BreastCancerScreeningRepo.java +++ b/src/main/java/com/iemr/hwc/repo/nurse/ncdscreening/BreastCancerScreeningRepo.java @@ -27,11 +27,13 @@ import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.CrudRepository; import org.springframework.data.repository.query.Param; +import org.springframework.data.rest.core.annotation.RestResource; import org.springframework.stereotype.Repository; import com.iemr.hwc.data.ncdScreening.BreastCancerScreening; @Repository +@RestResource(exported = false) public interface BreastCancerScreeningRepo extends CrudRepository { // @Query("SELECT db FROM BreastCancerScreening db WHERE db.beneficiaryRegID = :beneficiaryRegID AND db.beneficiaryVisitId = :beneficiaryVisitId ") diff --git a/src/main/java/com/iemr/hwc/repo/nurse/ncdscreening/CbacDetailsRepo.java b/src/main/java/com/iemr/hwc/repo/nurse/ncdscreening/CbacDetailsRepo.java index e36b87e0..808824df 100644 --- a/src/main/java/com/iemr/hwc/repo/nurse/ncdscreening/CbacDetailsRepo.java +++ b/src/main/java/com/iemr/hwc/repo/nurse/ncdscreening/CbacDetailsRepo.java @@ -22,11 +22,13 @@ package com.iemr.hwc.repo.nurse.ncdscreening; import org.springframework.data.repository.CrudRepository; +import org.springframework.data.rest.core.annotation.RestResource; import org.springframework.stereotype.Repository; import com.iemr.hwc.data.ncdScreening.CbacDetails; @Repository +@RestResource(exported = false) public interface CbacDetailsRepo extends CrudRepository { public CbacDetails findByBeneficiaryRegIdAndVisitCode(Long beneficiaryRegId, Long visitCode); diff --git a/src/main/java/com/iemr/hwc/repo/nurse/ncdscreening/CervicalCancerScreeningRepo.java b/src/main/java/com/iemr/hwc/repo/nurse/ncdscreening/CervicalCancerScreeningRepo.java index 7e6e56f1..4867d70c 100644 --- a/src/main/java/com/iemr/hwc/repo/nurse/ncdscreening/CervicalCancerScreeningRepo.java +++ b/src/main/java/com/iemr/hwc/repo/nurse/ncdscreening/CervicalCancerScreeningRepo.java @@ -27,11 +27,13 @@ import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.CrudRepository; import org.springframework.data.repository.query.Param; +import org.springframework.data.rest.core.annotation.RestResource; import org.springframework.stereotype.Repository; import com.iemr.hwc.data.ncdScreening.CervicalCancerScreening; @Repository +@RestResource(exported = false) public interface CervicalCancerScreeningRepo extends CrudRepository { // @Query("SELECT db FROM CervicalCancerScreening db WHERE db.beneficiaryRegID = :beneficiaryRegID AND db.beneficiaryVisitId = :beneficiaryVisitId ") diff --git a/src/main/java/com/iemr/hwc/repo/nurse/ncdscreening/DiabetesScreeningRepo.java b/src/main/java/com/iemr/hwc/repo/nurse/ncdscreening/DiabetesScreeningRepo.java index 27ad7bf4..8de54378 100644 --- a/src/main/java/com/iemr/hwc/repo/nurse/ncdscreening/DiabetesScreeningRepo.java +++ b/src/main/java/com/iemr/hwc/repo/nurse/ncdscreening/DiabetesScreeningRepo.java @@ -27,6 +27,7 @@ import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.CrudRepository; import org.springframework.data.repository.query.Param; +import org.springframework.data.rest.core.annotation.RestResource; import org.springframework.stereotype.Repository; import com.iemr.hwc.data.ncdScreening.DiabetesScreening; @@ -37,6 +38,7 @@ */ @Repository +@RestResource(exported = false) public interface DiabetesScreeningRepo extends CrudRepository { // // @Query("SELECT obj FROM Diabetes obj WHERE obj.beneficiaryRegId = :beneficiaryRegId AND " diff --git a/src/main/java/com/iemr/hwc/repo/nurse/ncdscreening/HypertensionScreeningRepo.java b/src/main/java/com/iemr/hwc/repo/nurse/ncdscreening/HypertensionScreeningRepo.java index 9ec58430..7ce54aa0 100644 --- a/src/main/java/com/iemr/hwc/repo/nurse/ncdscreening/HypertensionScreeningRepo.java +++ b/src/main/java/com/iemr/hwc/repo/nurse/ncdscreening/HypertensionScreeningRepo.java @@ -29,6 +29,7 @@ import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.CrudRepository; import org.springframework.data.repository.query.Param; +import org.springframework.data.rest.core.annotation.RestResource; import org.springframework.stereotype.Repository; import com.iemr.hwc.data.ncdScreening.HypertensionScreening; @@ -39,6 +40,7 @@ */ @Repository +@RestResource(exported = false) public interface HypertensionScreeningRepo extends CrudRepository { // @Query("SELECT obj FROM Hypertension obj WHERE obj.beneficiaryRegId = :beneficiaryRegId AND " // + "obj.beneficiaryVisitId = :beneficiaryVisitId") diff --git a/src/main/java/com/iemr/hwc/repo/nurse/ncdscreening/OralCancerScreeningRepo.java b/src/main/java/com/iemr/hwc/repo/nurse/ncdscreening/OralCancerScreeningRepo.java index 1839f72d..d36b2c1d 100644 --- a/src/main/java/com/iemr/hwc/repo/nurse/ncdscreening/OralCancerScreeningRepo.java +++ b/src/main/java/com/iemr/hwc/repo/nurse/ncdscreening/OralCancerScreeningRepo.java @@ -27,11 +27,13 @@ import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.CrudRepository; import org.springframework.data.repository.query.Param; +import org.springframework.data.rest.core.annotation.RestResource; import org.springframework.stereotype.Repository; import com.iemr.hwc.data.ncdScreening.OralCancerScreening; @Repository +@RestResource(exported = false) public interface OralCancerScreeningRepo extends CrudRepository { // @Query("SELECT db FROM OralCancerScreening db WHERE db.beneficiaryRegID = :beneficiaryRegID AND db.beneficiaryVisitId = :beneficiaryVisitId ") diff --git a/src/main/java/com/iemr/hwc/repo/quickConsultation/BenChiefComplaintRepo.java b/src/main/java/com/iemr/hwc/repo/quickConsultation/BenChiefComplaintRepo.java index 463747ac..3e6ab6c0 100644 --- a/src/main/java/com/iemr/hwc/repo/quickConsultation/BenChiefComplaintRepo.java +++ b/src/main/java/com/iemr/hwc/repo/quickConsultation/BenChiefComplaintRepo.java @@ -49,5 +49,10 @@ public ArrayList getBenChiefComplaints(@Param("benRegID") Long benRegI @Transactional @Query(" Delete from BenChiefComplaint WHERE beneficiaryRegID = :benRegID AND visitCode = :visitCode") public int deleteExistingBenChiefComplaints(@Param("benRegID") Long benRegID, @Param("visitCode") Long visitCode); + + @Modifying + @Transactional + @Query("DELETE FROM BenChiefComplaint WHERE visitCode=:visitCode ") + public int deleteVisitDetails(@Param("visitCode") Long visitCode); } diff --git a/src/main/java/com/iemr/hwc/repo/quickConsultation/LabTestOrderDetailRepo.java b/src/main/java/com/iemr/hwc/repo/quickConsultation/LabTestOrderDetailRepo.java index 0beb5bdb..5ab7371b 100644 --- a/src/main/java/com/iemr/hwc/repo/quickConsultation/LabTestOrderDetailRepo.java +++ b/src/main/java/com/iemr/hwc/repo/quickConsultation/LabTestOrderDetailRepo.java @@ -52,4 +52,9 @@ public ArrayList getLabTestOrderDetails2(@Param("benRegID") @Query(" Delete from LabTestOrderDetail WHERE beneficiaryRegID = :benRegID AND benVisitID = :benVisitID ") public int deleteExistingLabTestOrderDetail(@Param("benRegID") Long benRegID, @Param("benVisitID") Long benVisitID); + @Modifying + @Transactional + @Query(" DELETE FROM LabTestOrderDetail WHERE visitCode=:visitCode ") + public int deleteVisitDetails(@Param("visitCode") Long visitCode); + } diff --git a/src/main/java/com/iemr/hwc/repo/quickConsultation/PrescriptionDetailRepo.java b/src/main/java/com/iemr/hwc/repo/quickConsultation/PrescriptionDetailRepo.java index 6194e283..ce217c10 100644 --- a/src/main/java/com/iemr/hwc/repo/quickConsultation/PrescriptionDetailRepo.java +++ b/src/main/java/com/iemr/hwc/repo/quickConsultation/PrescriptionDetailRepo.java @@ -89,5 +89,10 @@ public int updatePrescription(@Param("diagnosisProvided") String diagnosisProvid public List getProvisionalDiagnosis(@Param("visitCode") Long visitCode, @Param("prescriptionID") Long prescriptionID); + + @Modifying + @Transactional + @Query(" DELETE FROM PrescriptionDetail WHERE visitCode=:visitCode ") + public int deleteVisitDetails(@Param("visitCode") Long visitCode); } diff --git a/src/main/java/com/iemr/hwc/repo/uptsu/M_104ActionMasterRepo.java b/src/main/java/com/iemr/hwc/repo/uptsu/M_104ActionMasterRepo.java index 024b8226..e536eb86 100644 --- a/src/main/java/com/iemr/hwc/repo/uptsu/M_104ActionMasterRepo.java +++ b/src/main/java/com/iemr/hwc/repo/uptsu/M_104ActionMasterRepo.java @@ -24,11 +24,13 @@ import java.util.List; import org.springframework.data.repository.CrudRepository; +import org.springframework.data.rest.core.annotation.RestResource; import org.springframework.stereotype.Repository; import com.iemr.hwc.data.uptsu.M_104ActionMaster; @Repository +@RestResource(exported = false) public interface M_104ActionMasterRepo extends CrudRepository { List findByDeleted(Boolean deleted); diff --git a/src/main/java/com/iemr/hwc/service/adolescent/AdolescentAndChildCareService.java b/src/main/java/com/iemr/hwc/service/adolescent/AdolescentAndChildCareService.java index 90098ddf..7b67b8bd 100644 --- a/src/main/java/com/iemr/hwc/service/adolescent/AdolescentAndChildCareService.java +++ b/src/main/java/com/iemr/hwc/service/adolescent/AdolescentAndChildCareService.java @@ -30,6 +30,8 @@ public interface AdolescentAndChildCareService { public String saveNurseData(JsonObject requestOBJ, String Authorization) throws SQLException, Exception; + + public void deleteVisitDetails(JsonObject requestOBJ) throws Exception; public String getBenVisitDetailsFrmNurseCAC(Long benRegID, Long visitCode) throws Exception; diff --git a/src/main/java/com/iemr/hwc/service/adolescent/AdolescentAndChildCareServiceImpl.java b/src/main/java/com/iemr/hwc/service/adolescent/AdolescentAndChildCareServiceImpl.java index 1fccbc94..8b051a1c 100644 --- a/src/main/java/com/iemr/hwc/service/adolescent/AdolescentAndChildCareServiceImpl.java +++ b/src/main/java/com/iemr/hwc/service/adolescent/AdolescentAndChildCareServiceImpl.java @@ -60,6 +60,9 @@ import com.iemr.hwc.repo.neonatal.ImmunizationServicesRepo; import com.iemr.hwc.repo.neonatal.InfantBirthDetailsRepo; import com.iemr.hwc.repo.nurse.BenVisitDetailRepo; +import com.iemr.hwc.repo.nurse.CDSSRepo; +import com.iemr.hwc.repo.nurse.anc.BenAdherenceRepo; +import com.iemr.hwc.repo.quickConsultation.BenChiefComplaintRepo; import com.iemr.hwc.service.benFlowStatus.CommonBenStatusFlowServiceImpl; import com.iemr.hwc.service.common.transaction.CommonDoctorServiceImpl; import com.iemr.hwc.service.common.transaction.CommonNurseServiceImpl; @@ -96,9 +99,15 @@ public class AdolescentAndChildCareServiceImpl implements AdolescentAndChildCare private LabTechnicianServiceImpl labTechnicianServiceImpl; @Autowired private T_OralVitaminProphylaxisRepo oralVitaminProphylaxisRepo; + @Autowired + private BenChiefComplaintRepo benChiefComplaintRepo; + @Autowired + private BenAdherenceRepo benAdherenceRepo; + + @Autowired + private CDSSRepo cdssRepo; @Override - @Transactional(rollbackFor = Exception.class) public String saveNurseData(JsonObject requestOBJ, String Authorization) throws SQLException, Exception { Map responseMap = new HashMap(); @@ -233,6 +242,26 @@ public String saveNurseData(JsonObject requestOBJ, String Authorization) throws return new Gson().toJson(responseMap); } + + @Override + public void deleteVisitDetails(JsonObject requestOBJ) throws Exception { + if (requestOBJ != null && requestOBJ.has("visitDetails") && !requestOBJ.get("visitDetails").isJsonNull()) { + + CommonUtilityClass nurseUtilityClass = InputMapper.gson().fromJson(requestOBJ, CommonUtilityClass.class); + + Long visitCode = benVisitDetailRepo.getVisitCode(nurseUtilityClass.getBeneficiaryRegID(), + nurseUtilityClass.getProviderServiceMapID()); + + if (visitCode != null) { + benChiefComplaintRepo.deleteVisitDetails(visitCode); + benAdherenceRepo.deleteVisitDetails(visitCode); + cdssRepo.deleteVisitDetails(visitCode); + benVisitDetailRepo.deleteVisitDetails(visitCode); + } + + } + + } private Map saveBenVisitDetails(JsonObject visitDetailsOBJ, CommonUtilityClass nurseUtilityClass) throws Exception { diff --git a/src/main/java/com/iemr/hwc/service/anc/ANCService.java b/src/main/java/com/iemr/hwc/service/anc/ANCService.java index b26e8185..7cf16ed6 100644 --- a/src/main/java/com/iemr/hwc/service/anc/ANCService.java +++ b/src/main/java/com/iemr/hwc/service/anc/ANCService.java @@ -29,6 +29,8 @@ public interface ANCService { public String saveANCNurseData(JsonObject requestOBJ, String Authorization) throws Exception; + + public void deleteVisitDetails(JsonObject requestOBJ) throws Exception; // int UpdateANCVisitDetails(JsonObject jsnOBJ) throws Exception; diff --git a/src/main/java/com/iemr/hwc/service/anc/ANCServiceImpl.java b/src/main/java/com/iemr/hwc/service/anc/ANCServiceImpl.java index 903efbe4..cdb5801f 100644 --- a/src/main/java/com/iemr/hwc/service/anc/ANCServiceImpl.java +++ b/src/main/java/com/iemr/hwc/service/anc/ANCServiceImpl.java @@ -81,13 +81,17 @@ import com.iemr.hwc.repo.benFlowStatus.BeneficiaryFlowStatusRepo; import com.iemr.hwc.repo.foetalmonitor.FoetalMonitorRepo; import com.iemr.hwc.repo.nurse.BenAnthropometryRepo; +import com.iemr.hwc.repo.nurse.BenVisitDetailRepo; +import com.iemr.hwc.repo.nurse.CDSSRepo; import com.iemr.hwc.repo.nurse.anc.ANCCareRepo; import com.iemr.hwc.repo.nurse.anc.ANCDiagnosisRepo; +import com.iemr.hwc.repo.nurse.anc.BenAdherenceRepo; import com.iemr.hwc.repo.nurse.anc.BenMedHistoryRepo; import com.iemr.hwc.repo.nurse.anc.BenMenstrualDetailsRepo; import com.iemr.hwc.repo.nurse.anc.BencomrbidityCondRepo; import com.iemr.hwc.repo.nurse.anc.FemaleObstetricHistoryRepo; import com.iemr.hwc.repo.nurse.anc.SysObstetricExaminationRepo; +import com.iemr.hwc.repo.quickConsultation.BenChiefComplaintRepo; import com.iemr.hwc.service.benFlowStatus.CommonBenStatusFlowServiceImpl; import com.iemr.hwc.service.common.transaction.CommonDoctorServiceImpl; import com.iemr.hwc.service.common.transaction.CommonNurseServiceImpl; @@ -125,6 +129,16 @@ public class ANCServiceImpl implements ANCService { @Autowired private SysObstetricExaminationRepo sysObstetricExaminationRepo; + + @Autowired + private BenVisitDetailRepo benVisitDetailRepo; + @Autowired + private BenChiefComplaintRepo benChiefComplaintRepo; + @Autowired + private BenAdherenceRepo benAdherenceRepo; + + @Autowired + private CDSSRepo cdssRepo; @Autowired public void setLabTechnicianServiceImpl(LabTechnicianServiceImpl labTechnicianServiceImpl) { @@ -160,7 +174,6 @@ public void setAncNurseServiceImpl(ANCNurseServiceImpl ancNurseServiceImpl) { private SMSGatewayServiceImpl sMSGatewayServiceImpl; @Override - @Transactional(rollbackFor = Exception.class) public String saveANCNurseData(JsonObject requestOBJ, String Authorization) throws Exception { // String vr = ""; // String vc = ""; @@ -264,6 +277,26 @@ public String saveANCNurseData(JsonObject requestOBJ, String Authorization) thro } return new Gson().toJson(responseMap); } + + @Override + public void deleteVisitDetails(JsonObject requestOBJ) throws Exception { + if (requestOBJ != null && requestOBJ.has("visitDetails") && !requestOBJ.get("visitDetails").isJsonNull()) { + + CommonUtilityClass nurseUtilityClass = InputMapper.gson().fromJson(requestOBJ, CommonUtilityClass.class); + + Long visitCode = benVisitDetailRepo.getVisitCode(nurseUtilityClass.getBeneficiaryRegID(), + nurseUtilityClass.getProviderServiceMapID()); + + if (visitCode != null) { + benChiefComplaintRepo.deleteVisitDetails(visitCode); + benAdherenceRepo.deleteVisitDetails(visitCode); + cdssRepo.deleteVisitDetails(visitCode); + benVisitDetailRepo.deleteVisitDetails(visitCode); + } + + } + + } private int updateBenFlowNurseAfterNurseActivityANC(JsonObject investigationDataCheck, JsonObject tmpOBJ, Long benVisitID, Long benFlowID, Long visitCode, Integer vanID, TeleconsultationRequestOBJ tcRequestOBJ) { diff --git a/src/main/java/com/iemr/hwc/service/cancerScreening/CSService.java b/src/main/java/com/iemr/hwc/service/cancerScreening/CSService.java index ac6e88aa..fa012691 100644 --- a/src/main/java/com/iemr/hwc/service/cancerScreening/CSService.java +++ b/src/main/java/com/iemr/hwc/service/cancerScreening/CSService.java @@ -34,6 +34,8 @@ public interface CSService { public int UpdateCSHistoryNurseData(JsonObject jsnOBJ) throws Exception; + + public void deleteVisitDetails(JsonObject requestOBJ) throws Exception; public int updateBenVitalDetail(BenCancerVitalDetail benCancerVitalDetail); diff --git a/src/main/java/com/iemr/hwc/service/cancerScreening/CSServiceImpl.java b/src/main/java/com/iemr/hwc/service/cancerScreening/CSServiceImpl.java index 66b06121..fdbf91d8 100644 --- a/src/main/java/com/iemr/hwc/service/cancerScreening/CSServiceImpl.java +++ b/src/main/java/com/iemr/hwc/service/cancerScreening/CSServiceImpl.java @@ -59,6 +59,10 @@ import com.iemr.hwc.data.tele_consultation.TcSpecialistSlotBookingRequestOBJ; import com.iemr.hwc.data.tele_consultation.TeleconsultationRequestOBJ; import com.iemr.hwc.repo.benFlowStatus.BeneficiaryFlowStatusRepo; +import com.iemr.hwc.repo.nurse.BenVisitDetailRepo; +import com.iemr.hwc.repo.nurse.CDSSRepo; +import com.iemr.hwc.repo.nurse.anc.BenAdherenceRepo; +import com.iemr.hwc.repo.quickConsultation.BenChiefComplaintRepo; import com.iemr.hwc.repo.registrar.RegistrarRepoBenData; import com.iemr.hwc.repo.tc_consultation.TCRequestModelRepo; import com.iemr.hwc.service.anc.Utility; @@ -96,6 +100,15 @@ public class CSServiceImpl implements CSService { private CommonServiceImpl commonServiceImpl; @Autowired private TCRequestModelRepo tCRequestModelRepo; + + private BenVisitDetailRepo benVisitDetailRepo; + @Autowired + private BenChiefComplaintRepo benChiefComplaintRepo; + @Autowired + private BenAdherenceRepo benAdherenceRepo; + + @Autowired + private CDSSRepo cdssRepo; @Autowired public void setBeneficiaryFlowStatusRepo(BeneficiaryFlowStatusRepo beneficiaryFlowStatusRepo) { @@ -147,7 +160,6 @@ public void setCsOncologistServiceImpl(CSOncologistServiceImpl csOncologistServi * @param requestOBJ * @throws Exception */ - @Transactional(rollbackFor = Exception.class) public String saveCancerScreeningNurseData(JsonObject requestOBJ, String Authorization) throws Exception { Long nurseDataSuccessFlag = null; TeleconsultationRequestOBJ tcRequestOBJ = null; @@ -283,6 +295,26 @@ else if (nurseDataSuccessFlag == 2) } return new Gson().toJson(responseMap); } + + @Override + public void deleteVisitDetails(JsonObject requestOBJ) throws Exception { + if (requestOBJ != null && requestOBJ.has("visitDetails") && !requestOBJ.get("visitDetails").isJsonNull()) { + + CommonUtilityClass nurseUtilityClass = InputMapper.gson().fromJson(requestOBJ, CommonUtilityClass.class); + + Long visitCode = benVisitDetailRepo.getVisitCode(nurseUtilityClass.getBeneficiaryRegID(), + nurseUtilityClass.getProviderServiceMapID()); + + if (visitCode != null) { + benChiefComplaintRepo.deleteVisitDetails(visitCode); + benAdherenceRepo.deleteVisitDetails(visitCode); + cdssRepo.deleteVisitDetails(visitCode); + benVisitDetailRepo.deleteVisitDetails(visitCode); + } + + } + + } // method for updating ben flow status flag for nurse private int updateBenStatusFlagAfterNurseSaveSuccess(BeneficiaryVisitDetail benVisitDetailsOBJ, Long benVisitID, diff --git a/src/main/java/com/iemr/hwc/service/common/transaction/CommonNurseServiceImpl.java b/src/main/java/com/iemr/hwc/service/common/transaction/CommonNurseServiceImpl.java index a8ec6ca2..523a5b6a 100644 --- a/src/main/java/com/iemr/hwc/service/common/transaction/CommonNurseServiceImpl.java +++ b/src/main/java/com/iemr/hwc/service/common/transaction/CommonNurseServiceImpl.java @@ -35,6 +35,10 @@ import java.util.Map; import java.util.Objects; + +import javax.persistence.PersistenceContext; +import javax.transaction.Transactional; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -153,8 +157,9 @@ public class CommonNurseServiceImpl implements CommonNurseService { private Integer oncoWL; @Value("${TMReferredWL}") private Integer TMReferredWL; - + private BenVisitDetailRepo benVisitDetailRepo; + private BenChiefComplaintRepo benChiefComplaintRepo; private BenMedHistoryRepo benMedHistoryRepo; private BencomrbidityCondRepo bencomrbidityCondRepo; @@ -176,7 +181,6 @@ public class CommonNurseServiceImpl implements CommonNurseService { private SysCentralNervousExaminationRepo sysCentralNervousExaminationRepo; private SysMusculoskeletalSystemExaminationRepo sysMusculoskeletalSystemExaminationRepo; private SysGenitourinarySystemExaminationRepo sysGenitourinarySystemExaminationRepo; - @Autowired private OralExaminationRepo oralExaminationRepo; private RegistrarRepoBenData registrarRepoBenData; private PrescriptionDetailRepo prescriptionDetailRepo; @@ -191,9 +195,8 @@ public class CommonNurseServiceImpl implements CommonNurseService { private PhysicalActivityTypeRepo physicalActivityTypeRepo; private IDRSDataRepo iDRSDataRepo; private BenCancerVitalDetailRepo benCancerVitalDetailRepo; - + private CommonDoctorServiceImpl commonDoctorServiceImpl; - @Autowired private BenReferDetailsRepo benReferDetailsRepo; @Autowired private CDSSRepo cdssRepo; diff --git a/src/main/java/com/iemr/hwc/service/common/transaction/CommonServiceImpl.java b/src/main/java/com/iemr/hwc/service/common/transaction/CommonServiceImpl.java index caa0625f..19087979 100644 --- a/src/main/java/com/iemr/hwc/service/common/transaction/CommonServiceImpl.java +++ b/src/main/java/com/iemr/hwc/service/common/transaction/CommonServiceImpl.java @@ -616,7 +616,7 @@ public TeleconsultationRequestOBJ createTcRequest(JsonObject requestOBJ, CommonU throw new RuntimeException("Error while creating TC request."); } } else - throw new RuntimeException("Error while booking slot."); + throw new RuntimeException("Already Booked Slot, Please choose another slot"); } } diff --git a/src/main/java/com/iemr/hwc/service/covid19/Covid19ServiceImpl.java b/src/main/java/com/iemr/hwc/service/covid19/Covid19ServiceImpl.java index 79af7bdf..4e4c7924 100644 --- a/src/main/java/com/iemr/hwc/service/covid19/Covid19ServiceImpl.java +++ b/src/main/java/com/iemr/hwc/service/covid19/Covid19ServiceImpl.java @@ -60,7 +60,11 @@ import com.iemr.hwc.data.quickConsultation.PrescribedDrugDetail; import com.iemr.hwc.data.quickConsultation.PrescriptionDetail; import com.iemr.hwc.data.tele_consultation.TeleconsultationRequestOBJ; +import com.iemr.hwc.repo.nurse.BenVisitDetailRepo; +import com.iemr.hwc.repo.nurse.CDSSRepo; +import com.iemr.hwc.repo.nurse.anc.BenAdherenceRepo; import com.iemr.hwc.repo.nurse.covid19.Covid19BenFeedbackRepo; +import com.iemr.hwc.repo.quickConsultation.BenChiefComplaintRepo; import com.iemr.hwc.repo.quickConsultation.PrescriptionDetailRepo; import com.iemr.hwc.service.benFlowStatus.CommonBenStatusFlowServiceImpl; import com.iemr.hwc.service.common.transaction.CommonDoctorServiceImpl; @@ -94,9 +98,14 @@ public class Covid19ServiceImpl implements Covid19Service { private Covid19BenFeedbackRepo covid19BenFeedbackRepo; @Autowired private PrescriptionDetailRepo prescriptionDetailRepo; + + @Autowired + private BenVisitDetailRepo benVisitDetailRepo; + + @Autowired + private CDSSRepo cdssRepo; @Override - @Transactional(rollbackFor = Exception.class) public String saveCovid19NurseData(JsonObject requestOBJ, String Authorization) throws Exception { Long saveSuccessFlag = null; TeleconsultationRequestOBJ tcRequestOBJ = null; @@ -201,6 +210,24 @@ public String saveCovid19NurseData(JsonObject requestOBJ, String Authorization) } return new Gson().toJson(responseMap); } + + public void deleteVisitDetails(JsonObject requestOBJ) throws Exception { + if (requestOBJ != null && requestOBJ.has("visitDetails") && !requestOBJ.get("visitDetails").isJsonNull()) { + + CommonUtilityClass nurseUtilityClass = InputMapper.gson().fromJson(requestOBJ, CommonUtilityClass.class); + + Long visitCode = benVisitDetailRepo.getVisitCode(nurseUtilityClass.getBeneficiaryRegID(), + nurseUtilityClass.getProviderServiceMapID()); + + if (visitCode != null) { + cdssRepo.deleteVisitDetails(visitCode); + covid19BenFeedbackRepo.deleteVisitDetails(visitCode); + benVisitDetailRepo.deleteVisitDetails(visitCode); + } + + } + + } /** * diff --git a/src/main/java/com/iemr/hwc/service/family_planning/FamilyPlanningService.java b/src/main/java/com/iemr/hwc/service/family_planning/FamilyPlanningService.java index 8313d48e..4f5e532b 100644 --- a/src/main/java/com/iemr/hwc/service/family_planning/FamilyPlanningService.java +++ b/src/main/java/com/iemr/hwc/service/family_planning/FamilyPlanningService.java @@ -31,6 +31,8 @@ public interface FamilyPlanningService { // save public String saveNurseDataFP(JsonObject requestOBJ, String Authorization) throws Exception; + + public void deleteVisitDetails(JsonObject requestOBJ) throws Exception; public int saveDoctorDataFP(JsonObject requestOBJ, String Authorization) throws Exception; diff --git a/src/main/java/com/iemr/hwc/service/family_planning/FamilyPlanningServiceImpl.java b/src/main/java/com/iemr/hwc/service/family_planning/FamilyPlanningServiceImpl.java index 90862779..9e8f7c67 100644 --- a/src/main/java/com/iemr/hwc/service/family_planning/FamilyPlanningServiceImpl.java +++ b/src/main/java/com/iemr/hwc/service/family_planning/FamilyPlanningServiceImpl.java @@ -53,6 +53,10 @@ import com.iemr.hwc.repo.family_planning.FPDispenseDetailsRepo; import com.iemr.hwc.repo.family_planning.FPIecCounsellingDetailsRepo; import com.iemr.hwc.repo.family_planning.FamilyPlanningReproductiveRepo; +import com.iemr.hwc.repo.nurse.BenVisitDetailRepo; +import com.iemr.hwc.repo.nurse.CDSSRepo; +import com.iemr.hwc.repo.nurse.anc.BenAdherenceRepo; +import com.iemr.hwc.repo.quickConsultation.BenChiefComplaintRepo; import com.iemr.hwc.service.benFlowStatus.CommonBenStatusFlowServiceImpl; import com.iemr.hwc.service.common.transaction.CommonDoctorServiceImpl; import com.iemr.hwc.service.common.transaction.CommonNurseServiceImpl; @@ -95,9 +99,17 @@ public class FamilyPlanningServiceImpl implements FamilyPlanningService { @Autowired private CommonBenStatusFlowServiceImpl commonBenStatusFlowServiceImpl; + @Autowired + private BenVisitDetailRepo benVisitDetailRepo; + @Autowired + private BenChiefComplaintRepo benChiefComplaintRepo; + @Autowired + private BenAdherenceRepo benAdherenceRepo; + + @Autowired + private CDSSRepo cdssRepo; @Override - @Transactional(rollbackFor = Exception.class) public String saveNurseDataFP(JsonObject requestOBJ, String Authorization) throws Exception { // logic to parse and save data in DB @@ -253,6 +265,26 @@ public String saveNurseDataFP(JsonObject requestOBJ, String Authorization) throw return new Gson().toJson(responseMap); } + + @Override + public void deleteVisitDetails(JsonObject requestOBJ) throws Exception { + if (requestOBJ != null && requestOBJ.has("visitDetails") && !requestOBJ.get("visitDetails").isJsonNull()) { + + CommonUtilityClass nurseUtilityClass = InputMapper.gson().fromJson(requestOBJ, CommonUtilityClass.class); + + Long visitCode = benVisitDetailRepo.getVisitCode(nurseUtilityClass.getBeneficiaryRegID(), + nurseUtilityClass.getProviderServiceMapID()); + + if (visitCode != null) { + benChiefComplaintRepo.deleteVisitDetails(visitCode); + benAdherenceRepo.deleteVisitDetails(visitCode); + cdssRepo.deleteVisitDetails(visitCode); + benVisitDetailRepo.deleteVisitDetails(visitCode); + } + + } + + } // method for updating ben flow status flag for nurse private int updateBenStatusFlagAfterNurseSaveSuccess(JsonObject tmpOBJ, Long benVisitID, Long benFlowID, diff --git a/src/main/java/com/iemr/hwc/service/generalOPD/GeneralOPDService.java b/src/main/java/com/iemr/hwc/service/generalOPD/GeneralOPDService.java index b0004984..0e2ae158 100644 --- a/src/main/java/com/iemr/hwc/service/generalOPD/GeneralOPDService.java +++ b/src/main/java/com/iemr/hwc/service/generalOPD/GeneralOPDService.java @@ -29,6 +29,8 @@ public interface GeneralOPDService { String saveNurseData(JsonObject requestOBJ, String Authorization) throws Exception; + + void deleteVisitDetails(JsonObject requestOBJ) throws Exception; Map saveBenVisitDetails(JsonObject visitDetailsOBJ, CommonUtilityClass nurseUtilityClass) throws Exception; diff --git a/src/main/java/com/iemr/hwc/service/generalOPD/GeneralOPDServiceImpl.java b/src/main/java/com/iemr/hwc/service/generalOPD/GeneralOPDServiceImpl.java index 2b1dfa99..ecc887e0 100644 --- a/src/main/java/com/iemr/hwc/service/generalOPD/GeneralOPDServiceImpl.java +++ b/src/main/java/com/iemr/hwc/service/generalOPD/GeneralOPDServiceImpl.java @@ -72,6 +72,9 @@ import com.iemr.hwc.data.tele_consultation.TeleconsultationRequestOBJ; import com.iemr.hwc.repo.nurse.BenVisitDetailRepo; +import com.iemr.hwc.repo.nurse.CDSSRepo; +import com.iemr.hwc.repo.nurse.anc.BenAdherenceRepo; +import com.iemr.hwc.repo.quickConsultation.BenChiefComplaintRepo; import com.iemr.hwc.service.benFlowStatus.CommonBenStatusFlowServiceImpl; import com.iemr.hwc.service.common.transaction.CommonDoctorServiceImpl; import com.iemr.hwc.service.common.transaction.CommonNurseServiceImpl; @@ -108,10 +111,17 @@ public class GeneralOPDServiceImpl implements GeneralOPDService { private FamilyPlanningService familyPlanningService; @Autowired private BenVisitDetailRepo benVisitDetailRepo; + @Autowired + private BenChiefComplaintRepo benChiefComplaintRepo; + @Autowired + private BenAdherenceRepo benAdherenceRepo; + + @Autowired + private CDSSRepo cdssRepo; /// --------------- start of saving nurse data ------------------------ @Override - @Transactional(rollbackFor = Exception.class) +// @Transactional(rollbackFor = Exception.class) public String saveNurseData(JsonObject requestOBJ, String Authorization) throws Exception { Long historySaveSuccessFlag = null; Long vitalSaveSuccessFlag = null; @@ -211,6 +221,26 @@ public String saveNurseData(JsonObject requestOBJ, String Authorization) throws return new Gson().toJson(responseMap); } + @Override + public void deleteVisitDetails(JsonObject requestOBJ) throws Exception { + if (requestOBJ != null && requestOBJ.has("visitDetails") && !requestOBJ.get("visitDetails").isJsonNull()) { + + CommonUtilityClass nurseUtilityClass = InputMapper.gson().fromJson(requestOBJ, CommonUtilityClass.class); + + Long visitCode = benVisitDetailRepo.getVisitCode(nurseUtilityClass.getBeneficiaryRegID(), + nurseUtilityClass.getProviderServiceMapID()); + + if (visitCode != null) { + benChiefComplaintRepo.deleteVisitDetails(visitCode); + benAdherenceRepo.deleteVisitDetails(visitCode); + cdssRepo.deleteVisitDetails(visitCode); + benVisitDetailRepo.deleteVisitDetails(visitCode); + } + + } + + } + // method for updating ben flow status flag for nurse private int updateBenStatusFlagAfterNurseSaveSuccess(JsonObject tmpOBJ, Long benVisitID, Long benFlowID, Long benVisitCode, Integer vanID, TeleconsultationRequestOBJ tcRequestOBJ) { diff --git a/src/main/java/com/iemr/hwc/service/ncdCare/NCDCareService.java b/src/main/java/com/iemr/hwc/service/ncdCare/NCDCareService.java index 3660cd21..d86d90dd 100644 --- a/src/main/java/com/iemr/hwc/service/ncdCare/NCDCareService.java +++ b/src/main/java/com/iemr/hwc/service/ncdCare/NCDCareService.java @@ -26,5 +26,7 @@ public interface NCDCareService { String saveNCDCareNurseData(JsonObject requestOBJ, String Authorization) throws Exception; + + public void deleteVisitDetails(JsonObject requestOBJ) throws Exception; } diff --git a/src/main/java/com/iemr/hwc/service/ncdCare/NCDCareServiceImpl.java b/src/main/java/com/iemr/hwc/service/ncdCare/NCDCareServiceImpl.java index 223f5d57..25625f6c 100644 --- a/src/main/java/com/iemr/hwc/service/ncdCare/NCDCareServiceImpl.java +++ b/src/main/java/com/iemr/hwc/service/ncdCare/NCDCareServiceImpl.java @@ -63,6 +63,12 @@ import com.iemr.hwc.data.quickConsultation.PrescriptionDetail; import com.iemr.hwc.data.snomedct.SCTDescription; import com.iemr.hwc.data.tele_consultation.TeleconsultationRequestOBJ; +import com.iemr.hwc.repo.nurse.BenVisitDetailRepo; +import com.iemr.hwc.repo.nurse.CDSSRepo; +import com.iemr.hwc.repo.nurse.anc.BenAdherenceRepo; +import com.iemr.hwc.repo.quickConsultation.BenChiefComplaintRepo; +import com.iemr.hwc.repo.quickConsultation.LabTestOrderDetailRepo; +import com.iemr.hwc.repo.quickConsultation.PrescriptionDetailRepo; import com.iemr.hwc.service.benFlowStatus.CommonBenStatusFlowServiceImpl; import com.iemr.hwc.service.common.transaction.CommonDoctorServiceImpl; import com.iemr.hwc.service.common.transaction.CommonNurseServiceImpl; @@ -84,6 +90,20 @@ public class NCDCareServiceImpl implements NCDCareService { private CommonServiceImpl commonServiceImpl; @Autowired private TeleConsultationServiceImpl teleConsultationServiceImpl; + + @Autowired + private BenVisitDetailRepo benVisitDetailRepo; + @Autowired + private BenChiefComplaintRepo benChiefComplaintRepo; + @Autowired + private BenAdherenceRepo benAdherenceRepo; + + @Autowired + private CDSSRepo cdssRepo; + @Autowired + private PrescriptionDetailRepo prescriptionDetailRepo; + @Autowired + private LabTestOrderDetailRepo labTestOrderDetailRepo; @Autowired public void setLabTechnicianServiceImpl(LabTechnicianServiceImpl labTechnicianServiceImpl) { @@ -114,7 +134,6 @@ public void setCommonNurseServiceImpl(CommonNurseServiceImpl commonNurseServiceI private SMSGatewayServiceImpl sMSGatewayServiceImpl; @Override - @Transactional(rollbackFor = Exception.class) public String saveNCDCareNurseData(JsonObject requestOBJ, String Authorization) throws Exception { Long saveSuccessFlag = null; TeleconsultationRequestOBJ tcRequestOBJ = null; @@ -209,6 +228,28 @@ public String saveNCDCareNurseData(JsonObject requestOBJ, String Authorization) } return new Gson().toJson(responseMap); } + + @Override + public void deleteVisitDetails(JsonObject requestOBJ) throws Exception { + if (requestOBJ != null && requestOBJ.has("visitDetails") && !requestOBJ.get("visitDetails").isJsonNull()) { + + CommonUtilityClass nurseUtilityClass = InputMapper.gson().fromJson(requestOBJ, CommonUtilityClass.class); + + Long visitCode = benVisitDetailRepo.getVisitCode(nurseUtilityClass.getBeneficiaryRegID(), + nurseUtilityClass.getProviderServiceMapID()); + + if (visitCode != null) { + benChiefComplaintRepo.deleteVisitDetails(visitCode); + benAdherenceRepo.deleteVisitDetails(visitCode); + cdssRepo.deleteVisitDetails(visitCode); + labTestOrderDetailRepo.deleteVisitDetails(visitCode); + prescriptionDetailRepo.deleteVisitDetails(visitCode); + benVisitDetailRepo.deleteVisitDetails(visitCode); + } + + } + + } // method for updating ben flow status flag for nurse private int updateBenFlowNurseAfterNurseActivityANC(JsonObject investigationDataCheck, JsonObject tmpOBJ, diff --git a/src/main/java/com/iemr/hwc/service/ncdscreening/NCDScreeningService.java b/src/main/java/com/iemr/hwc/service/ncdscreening/NCDScreeningService.java index f6c3c53e..220fc46a 100644 --- a/src/main/java/com/iemr/hwc/service/ncdscreening/NCDScreeningService.java +++ b/src/main/java/com/iemr/hwc/service/ncdscreening/NCDScreeningService.java @@ -27,6 +27,8 @@ public interface NCDScreeningService { public String getNCDScreeningDetails(Long beneficiaryRegID, Long benVisitID); + + public void deleteVisitDetails(JsonObject requestOBJ) throws Exception; String saveNCDScreeningNurseData(JsonObject requestOBJ, String Authorization) throws Exception; diff --git a/src/main/java/com/iemr/hwc/service/ncdscreening/NCDScreeningServiceImpl.java b/src/main/java/com/iemr/hwc/service/ncdscreening/NCDScreeningServiceImpl.java index 66745dcf..a71dd78d 100644 --- a/src/main/java/com/iemr/hwc/service/ncdscreening/NCDScreeningServiceImpl.java +++ b/src/main/java/com/iemr/hwc/service/ncdscreening/NCDScreeningServiceImpl.java @@ -75,6 +75,8 @@ import com.iemr.hwc.data.tele_consultation.TeleconsultationRequestOBJ; import com.iemr.hwc.repo.benFlowStatus.BeneficiaryFlowStatusRepo; import com.iemr.hwc.repo.nurse.BenVisitDetailRepo; +import com.iemr.hwc.repo.nurse.CDSSRepo; +import com.iemr.hwc.repo.nurse.anc.BenAdherenceRepo; import com.iemr.hwc.repo.nurse.ncdscreening.BreastCancerScreeningRepo; import com.iemr.hwc.repo.nurse.ncdscreening.CbacDetailsRepo; import com.iemr.hwc.repo.nurse.ncdscreening.CervicalCancerScreeningRepo; @@ -82,6 +84,7 @@ import com.iemr.hwc.repo.nurse.ncdscreening.HypertensionScreeningRepo; import com.iemr.hwc.repo.nurse.ncdscreening.IDRSDataRepo; import com.iemr.hwc.repo.nurse.ncdscreening.OralCancerScreeningRepo; +import com.iemr.hwc.repo.quickConsultation.BenChiefComplaintRepo; import com.iemr.hwc.repo.quickConsultation.PrescriptionDetailRepo; import com.iemr.hwc.service.benFlowStatus.CommonBenStatusFlowServiceImpl; import com.iemr.hwc.service.common.transaction.CommonDoctorServiceImpl; @@ -141,6 +144,14 @@ public class NCDScreeningServiceImpl implements NCDScreeningService { @Autowired private CommonNcdScreeningService commonNcdScreeningService; + + @Autowired + private BenChiefComplaintRepo benChiefComplaintRepo; + @Autowired + private BenAdherenceRepo benAdherenceRepo; + + @Autowired + private CDSSRepo cdssRepo; @Autowired public void setLabTechnicianServiceImpl(LabTechnicianServiceImpl labTechnicianServiceImpl) { @@ -175,7 +186,6 @@ public void setCommonDoctorServiceImpl(CommonDoctorServiceImpl commonDoctorServi private Logger logger = LoggerFactory.getLogger(this.getClass().getSimpleName()); @Override - @Transactional(rollbackFor = Exception.class) public String saveNCDScreeningNurseData(JsonObject requestOBJ, String Authorization) throws Exception { // Shubham Shekhar,8-12-2020,WDF Long saveSuccessFlag = null; @@ -408,6 +418,26 @@ public String saveNCDScreeningNurseData(JsonObject requestOBJ, String Authorizat return new Gson().toJson(responseMap); } + + @Override + public void deleteVisitDetails(JsonObject requestOBJ) throws Exception { + if (requestOBJ != null && requestOBJ.has("visitDetails") && !requestOBJ.get("visitDetails").isJsonNull()) { + + CommonUtilityClass nurseUtilityClass = InputMapper.gson().fromJson(requestOBJ, CommonUtilityClass.class); + + Long visitCode = benVisitDetailRepo.getVisitCode(nurseUtilityClass.getBeneficiaryRegID(), + nurseUtilityClass.getProviderServiceMapID()); + + if (visitCode != null) { + benChiefComplaintRepo.deleteVisitDetails(visitCode); + benAdherenceRepo.deleteVisitDetails(visitCode); + cdssRepo.deleteVisitDetails(visitCode); + benVisitDetailRepo.deleteVisitDetails(visitCode); + } + + } + + } // method for updating ben flow status flag for nurse private int updateBenFlowNurseAfterNurseActivityANC(JsonObject tmpOBJ, Long benVisitID, Long benFlowID, diff --git a/src/main/java/com/iemr/hwc/service/neonatal/NeonatalService.java b/src/main/java/com/iemr/hwc/service/neonatal/NeonatalService.java index 01cf7307..61bb2739 100644 --- a/src/main/java/com/iemr/hwc/service/neonatal/NeonatalService.java +++ b/src/main/java/com/iemr/hwc/service/neonatal/NeonatalService.java @@ -30,6 +30,8 @@ public interface NeonatalService { public String saveNurseData(JsonObject requestOBJ, String Authorization) throws SQLException, Exception; + + public void deleteVisitDetails(JsonObject requestOBJ) throws Exception; public String getBenVisitDetailsFrmNurseNNI(Long benRegID, Long visitCode) throws Exception; diff --git a/src/main/java/com/iemr/hwc/service/neonatal/NeonatalServiceImpl.java b/src/main/java/com/iemr/hwc/service/neonatal/NeonatalServiceImpl.java index 48461846..04232a2a 100644 --- a/src/main/java/com/iemr/hwc/service/neonatal/NeonatalServiceImpl.java +++ b/src/main/java/com/iemr/hwc/service/neonatal/NeonatalServiceImpl.java @@ -58,6 +58,9 @@ import com.iemr.hwc.repo.neonatal.ImmunizationServicesRepo; import com.iemr.hwc.repo.neonatal.InfantBirthDetailsRepo; import com.iemr.hwc.repo.nurse.BenVisitDetailRepo; +import com.iemr.hwc.repo.nurse.CDSSRepo; +import com.iemr.hwc.repo.nurse.anc.BenAdherenceRepo; +import com.iemr.hwc.repo.quickConsultation.BenChiefComplaintRepo; import com.iemr.hwc.service.benFlowStatus.CommonBenStatusFlowServiceImpl; import com.iemr.hwc.service.common.transaction.CommonDoctorServiceImpl; import com.iemr.hwc.service.common.transaction.CommonNurseServiceImpl; @@ -93,9 +96,16 @@ public class NeonatalServiceImpl implements NeonatalService { private GeneralOPDDoctorServiceImpl generalOPDDoctorServiceImpl; @Autowired private LabTechnicianServiceImpl labTechnicianServiceImpl; + + @Autowired + private BenChiefComplaintRepo benChiefComplaintRepo; + @Autowired + private BenAdherenceRepo benAdherenceRepo; + + @Autowired + private CDSSRepo cdssRepo; @Override - @Transactional(rollbackFor = Exception.class) public String saveNurseData(JsonObject requestOBJ, String Authorization) throws SQLException, Exception { Map responseMap = new HashMap(); @@ -226,6 +236,26 @@ public String saveNurseData(JsonObject requestOBJ, String Authorization) throws return new Gson().toJson(responseMap); } + + @Override + public void deleteVisitDetails(JsonObject requestOBJ) throws Exception { + if (requestOBJ != null && requestOBJ.has("visitDetails") && !requestOBJ.get("visitDetails").isJsonNull()) { + + CommonUtilityClass nurseUtilityClass = InputMapper.gson().fromJson(requestOBJ, CommonUtilityClass.class); + + Long visitCode = benVisitDetailRepo.getVisitCode(nurseUtilityClass.getBeneficiaryRegID(), + nurseUtilityClass.getProviderServiceMapID()); + + if (visitCode != null) { + benChiefComplaintRepo.deleteVisitDetails(visitCode); + benAdherenceRepo.deleteVisitDetails(visitCode); + cdssRepo.deleteVisitDetails(visitCode); + benVisitDetailRepo.deleteVisitDetails(visitCode); + } + + } + + } /// --------------- start of saving doctor data ------------------------ @Override diff --git a/src/main/java/com/iemr/hwc/service/pnc/PNCService.java b/src/main/java/com/iemr/hwc/service/pnc/PNCService.java index 156cc15f..39b19153 100644 --- a/src/main/java/com/iemr/hwc/service/pnc/PNCService.java +++ b/src/main/java/com/iemr/hwc/service/pnc/PNCService.java @@ -26,6 +26,8 @@ public interface PNCService { String savePNCNurseData(JsonObject requestOBJ, String Authorization) throws Exception; + + void deleteVisitDetails(JsonObject requestOBJ) throws Exception; String getBenVisitDetailsFrmNursePNC(Long benRegID, Long benVisitID); diff --git a/src/main/java/com/iemr/hwc/service/pnc/PNCServiceImpl.java b/src/main/java/com/iemr/hwc/service/pnc/PNCServiceImpl.java index df8b7f4f..a2846133 100644 --- a/src/main/java/com/iemr/hwc/service/pnc/PNCServiceImpl.java +++ b/src/main/java/com/iemr/hwc/service/pnc/PNCServiceImpl.java @@ -71,6 +71,10 @@ import com.iemr.hwc.data.quickConsultation.PrescriptionDetail; import com.iemr.hwc.data.tele_consultation.TeleconsultationRequestOBJ; import com.iemr.hwc.repo.benFlowStatus.BeneficiaryFlowStatusRepo; +import com.iemr.hwc.repo.nurse.BenVisitDetailRepo; +import com.iemr.hwc.repo.nurse.CDSSRepo; +import com.iemr.hwc.repo.nurse.anc.BenAdherenceRepo; +import com.iemr.hwc.repo.quickConsultation.BenChiefComplaintRepo; import com.iemr.hwc.service.benFlowStatus.CommonBenStatusFlowServiceImpl; import com.iemr.hwc.service.common.transaction.CommonDoctorServiceImpl; import com.iemr.hwc.service.common.transaction.CommonNurseServiceImpl; @@ -131,9 +135,18 @@ public void setPncNurseServiceImpl(PNCNurseServiceImpl pncNurseServiceImpl) { @Autowired private BeneficiaryFlowStatusRepo beneficiaryFlowStatusRepo; + + @Autowired + private BenVisitDetailRepo benVisitDetailRepo; + @Autowired + private BenChiefComplaintRepo benChiefComplaintRepo; + @Autowired + private BenAdherenceRepo benAdherenceRepo; + + @Autowired + private CDSSRepo cdssRepo; @Override - @Transactional(rollbackFor = Exception.class) public String savePNCNurseData(JsonObject requestOBJ, String Authorization) throws Exception { Long saveSuccessFlag = null; TeleconsultationRequestOBJ tcRequestOBJ = null; @@ -244,6 +257,26 @@ public String savePNCNurseData(JsonObject requestOBJ, String Authorization) thro } return new Gson().toJson(responseMap); } + + @Override + public void deleteVisitDetails(JsonObject requestOBJ) throws Exception { + if (requestOBJ != null && requestOBJ.has("visitDetails") && !requestOBJ.get("visitDetails").isJsonNull()) { + + CommonUtilityClass nurseUtilityClass = InputMapper.gson().fromJson(requestOBJ, CommonUtilityClass.class); + + Long visitCode = benVisitDetailRepo.getVisitCode(nurseUtilityClass.getBeneficiaryRegID(), + nurseUtilityClass.getProviderServiceMapID()); + + if (visitCode != null) { + benChiefComplaintRepo.deleteVisitDetails(visitCode); + benAdherenceRepo.deleteVisitDetails(visitCode); + cdssRepo.deleteVisitDetails(visitCode); + benVisitDetailRepo.deleteVisitDetails(visitCode); + } + + } + + } // method for updating ben flow status flag for nurse private int updateBenStatusFlagAfterNurseSaveSuccess(JsonObject tmpOBJ, Long benVisitID, Long benFlowID, diff --git a/src/main/java/com/iemr/hwc/service/quickConsultation/QuickConsultationService.java b/src/main/java/com/iemr/hwc/service/quickConsultation/QuickConsultationService.java index 7c2a70aa..a5b0e704 100644 --- a/src/main/java/com/iemr/hwc/service/quickConsultation/QuickConsultationService.java +++ b/src/main/java/com/iemr/hwc/service/quickConsultation/QuickConsultationService.java @@ -47,4 +47,6 @@ public Integer quickConsultDoctorDataInsert(JsonObject quickConsultDoctorOBJ, St throws Exception; Integer updateBeneficiaryClinicalObservations(JsonObject caseSheet) throws Exception; + + public void deleteVisitDetails(JsonObject requestOBJ) throws Exception; } diff --git a/src/main/java/com/iemr/hwc/service/quickConsultation/QuickConsultationServiceImpl.java b/src/main/java/com/iemr/hwc/service/quickConsultation/QuickConsultationServiceImpl.java index 0b4bce30..63b20268 100644 --- a/src/main/java/com/iemr/hwc/service/quickConsultation/QuickConsultationServiceImpl.java +++ b/src/main/java/com/iemr/hwc/service/quickConsultation/QuickConsultationServiceImpl.java @@ -50,6 +50,7 @@ import com.iemr.hwc.repo.nurse.BenPhysicalVitalRepo; import com.iemr.hwc.repo.nurse.BenVisitDetailRepo; import com.iemr.hwc.repo.nurse.CDSSRepo; +import com.iemr.hwc.repo.nurse.anc.BenAdherenceRepo; import com.iemr.hwc.repo.quickConsultation.BenChiefComplaintRepo; import com.iemr.hwc.repo.quickConsultation.BenClinicalObservationsRepo; import com.iemr.hwc.repo.quickConsultation.ExternalTestOrderRepo; @@ -96,6 +97,9 @@ public class QuickConsultationServiceImpl implements QuickConsultationService { private BenVisitDetailRepo benVisitDetailRepo; @Autowired private CDSSRepo cdssRepo; + + @Autowired + private BenAdherenceRepo benAdherenceRepo; @Override public Long saveBeneficiaryChiefComplaint(JsonObject caseSheet) { @@ -290,6 +294,26 @@ public String quickConsultNurseDataInsert(JsonObject jsnOBJ, String Authorizatio return new Gson().toJson(responseMap); // return returnOBJ; } + + @Override + public void deleteVisitDetails(JsonObject requestOBJ) throws Exception { + if (requestOBJ != null && requestOBJ.has("visitDetails") && !requestOBJ.get("visitDetails").isJsonNull()) { + + CommonUtilityClass nurseUtilityClass = InputMapper.gson().fromJson(requestOBJ, CommonUtilityClass.class); + + Long visitCode = benVisitDetailRepo.getVisitCode(nurseUtilityClass.getBeneficiaryRegID(), + nurseUtilityClass.getProviderServiceMapID()); + + if (visitCode != null) { + benChiefComplaintRepo.deleteVisitDetails(visitCode); + benAdherenceRepo.deleteVisitDetails(visitCode); + cdssRepo.deleteVisitDetails(visitCode); + benVisitDetailRepo.deleteVisitDetails(visitCode); + } + + } + + } // method for updating ben flow status flag for nurse private int updateBenStatusFlagAfterNurseSaveSuccess(BeneficiaryVisitDetail benVisitDetailsOBJ, Long benVisitID, diff --git a/src/test/java/com/iemr/mmu/ncdCare/TestNCDCareController.java b/src/test/java/com/iemr/mmu/ncdCare/TestNCDCareController.java index ad8ce05f..aa51ea55 100644 --- a/src/test/java/com/iemr/mmu/ncdCare/TestNCDCareController.java +++ b/src/test/java/com/iemr/mmu/ncdCare/TestNCDCareController.java @@ -40,7 +40,7 @@ public class TestNCDCareController { @BeforeClass public static void initializeParams() { - createController.setNcdCareServiceImpl(ncdCareServiceImplMock); + // createController.setNcdCareServiceImpl(ncdCareServiceImplMock); nurseObjPve = "{\"visitDetails\": { \"beneficiaryRegID\": \"7506\", \"providerServiceMapID\": \"1320\", \"visitNo\": null, \"visitReason\": \"Screening\", \"visitCategory\": \"Cancer Screening\", \"pregnancyStatus\": \"Yes\", \"rCHID\": \"7777\", \"healthFacilityType\": null, \"healthFacilityLocation\": null, \"reportFilePath\": null, \"createdBy\": \"888\" }, \"vitalsDetails\": { \"beneficiaryRegID\": \"7506\", \"benVisitID\": null, \"providerServiceMapID\": \"1320\", \"weight_Kg\": \"64\", \"height_cm\": \"166\", \"waistCircumference_cm\": \"56\", \"systolicBP_1stReading\": \"120\", \"diastolicBP_1stReading\": \"65\", \"systolicBP_2ndReading\": \"113\", \"diastolicBP_2ndReading\": \"73\", \"systolicBP_3rdReading\": \"123\", \"diastolicBP_3rdReading\": \"66\", \"hbA1C\": \"4\", \"hemoglobin\": \"14\", \"bloodGlucose_Fasting\": \"123\", \"bloodGlucose_Random\": \"143\", \"bloodGlucose_2HrPostPrandial\": \"145\", \"createdBy\": \"888\" }, \"examinationDetails\": { \"signsDetails\": { \"cancerSignAndSymptoms\": { \"shortnessOfBreath\": null, \"coughgt2Weeks\": true, \"bloodInSputum\": true, \"difficultyInOpeningMouth\": true, \"nonHealingUlcerOrPatchOrGrowth\": null, \"changeInTheToneOfVoice\": null, \"lumpInTheBreast\": null, \"bloodStainedDischargeFromNipple\": null, \"changeInShapeAndSizeOfBreasts\": null, \"vaginalBleedingBetweenPeriods\": null, \"vaginalBleedingAfterMenopause\": null, \"vaginalBleedingAfterIntercourse\": null, \"foulSmellingVaginalDischarge\": null, \"lymphNode_Enlarged\": true, \"breastEnlargement\": null, \"observation\": \"Lorem Ipsum is simply dummy text of the printing and typesetting industry\", \"beneficiaryRegID\": \"7506\", \"providerServiceMapID\": \"1320\", \"createdBy\": \"888\" }, \"cancerLymphNodeDetails\": [ { \"lymphNodeName\": \" Sub Mandibular\", \"size_Left\": \"3-6 cm\", \"mobility_Left\": true, \"size_Right\": \"3-6 cm\", \"mobility_Right\": true, \"beneficiaryRegID\": \"7506\", \"providerServiceMapID\": \"1320\", \"createdBy\": \"888\" } ] }, \"oralDetails\": { \"limitedMouthOpening\": \"+\", \"premalignantLesions\": true, \"preMalignantLesionTypeList\": [ \"Sub muscus fibrosis\" ], \"prolongedIrritation\": null, \"chronicBurningSensation\": null, \"observation\": \"Lorem Ipsum is simply dummy text of the printing and typesetting industry\", \"beneficiaryRegID\": \"7506\", \"providerServiceMapID\": \"1320\", \"createdBy\": \"888\" }, \"breastDetails\": { \"everBreastFed\": true, \"breastFeedingDurationGTE6months\": true, \"breastsAppear_Normal\": true, \"rashOnBreast\": null, \"dimplingSkinOnBreast\": true, \"dischargeFromNipple\": null, \"peaudOrange\": null, \"lumpInBreast\": null, \"lumpSize\": null, \"lumpShape\": null, \"lumpTexture\": null, \"referredToMammogram\": null, \"beneficiaryRegID\": \"7506\", \"providerServiceMapID\": \"1320\", \"createdBy\": \"888\" }, \"abdominalDetails\": { \"abdominalInspection_Normal\": true, \"liver\": \"Not palpable\", \"ascites_Present\": true, \"anyOtherMass_Present\": true, \"lymphNodes_Enlarged\": null, \"lymphNode_Inguinal_Left\": null, \"lymphNode_Inguinal_Right\": null, \"lymphNode_ExternalIliac_Left\": null, \"lymphNode_ExternalIliac_Right\": null, \"lymphNode_ParaAortic_Left\": null, \"lymphNode_ParaAortic_Right\": null, \"observation\": \"Lorem Ipsum is simply dummy text of the printing and typesetting industry\", \"beneficiaryRegID\": \"7506\", \"providerServiceMapID\": \"1320\", \"createdBy\": \"888\" }, \"gynecologicalDetails\": { \"appearanceOfCervix\": null, \"typeOfLesionList\": null, \"vulvalInvolvement\": null, \"vaginalInvolvement\": true, \"uterus_Normal\": true, \"sufferedFromRTIOrSTI\": null, \"rTIOrSTIDetail\": null, \"filePath\": null, \"experiencedPostCoitalBleeding\": null, \"observation\": \"Lorem Ipsum is simply dummy text of the printing and typesetting industry\", \"beneficiaryRegID\": \"7506\", \"providerServiceMapID\": \"1320\", \"createdBy\": \"888\" }, \"imageCoordinates\": [ { \"beneficiaryRegID\": \"7506\", \"visitID\": null, \"createdBy\": \"888\", \"imageID\": 3, \"providerServiceMapID\": \"1320\", \"markers\": [ { \"xCord\": 97, \"yCord\": 174, \"description\": \"one\", \"point\": 1 } ] }, { \"beneficiaryRegID\": \"7506\", \"visitID\": null, \"createdBy\": \"888\", \"imageID\": 1, \"providerServiceMapID\": \"1320\", \"markers\": [ { \"xCord\": 146, \"yCord\": 184, \"description\": \"three\", \"point\": 1 } ] }, { \"beneficiaryRegID\": \"7506\", \"visitID\": null, \"createdBy\": \"888\", \"imageID\": 4, \"providerServiceMapID\": \"1320\", \"markers\": [ { \"xCord\": 102, \"yCord\": 154, \"description\": \"four\", \"point\": 1 } ] }, { \"beneficiaryRegID\": \"7506\", \"visitID\": null, \"createdBy\": \"888\", \"imageID\": 2, \"providerServiceMapID\": \"1320\", \"markers\": [ { \"xCord\": 171, \"yCord\": 156, \"description\": \"two\", \"point\": 1 } ] } ] }, \"historyDetails\": { \"familyHistory\": { \"diseases\": [ { \"beneficiaryRegID\": \"7506\", \"benVisitID\": null, \"providerServiceMapID\": \"1320\", \"cancerDiseaseType\": \"Breast Cancer\", \"otherDiseaseType\": null, \"familyMemberList\": [ \"Aunt\", \"Brother\" ], \"createdBy\": \"888\" }, { \"beneficiaryRegID\": \"7506\", \"benVisitID\": null, \"providerServiceMapID\": \"1320\", \"cancerDiseaseType\": \"lorem ipsum\", \"otherDiseaseType\": \"lorem ipsum\", \"familyMemberList\": [ \"Grand Father\" ], \"createdBy\": \"888\" } ], \"beneficiaryRegID\": \"7506\", \"providerServiceMapID\": \"1320\", \"createdBy\": \"888\" }, \"personalHistory\": { \"beneficiaryRegID\": \"7506\", \"benVisitID\": null, \"providerServiceMapID\": \"1320\", \"tobaccoUse\": \"Used in Past\", \"startAge_year\": \"23\", \"endAge_year\": \"24\", \"typeOfTobaccoProductList\": [ \"Beedi\", \"Chewing\", \"Cigarettes\" ], \"quantityPerDay\": \"2\", \"isFilteredCigaerette\": true, \"isCigaretteExposure\": false, \"isBetelNutChewing\": true, \"durationOfBetelQuid\": \"12\", \"alcoholUse\": \"Currently Using\", \"ssAlcoholUsed\": true, \"frequencyOfAlcoholUsed\": \"1-4 days/week\", \"dietType\": \"Eggetarian\", \"otherDiet\": null, \"intakeOfOutsidePreparedMeal\": \"2\", \"fruitConsumptionDays\": \"2\", \"fruitQuantityPerDay\": \"2\", \"vegetableConsumptionDays\": \"2\", \"vegetableQuantityPerDay\": \"2\", \"typeOfOilConsumedList\": [ \"Coconut Oil\", \"Corn Oil\" ], \"otherOilType\": null, \"physicalActivityType\": \"Light Activity\", \"ssRadiationExposure\": false, \"isThyroidDisorder\": false, \"createdBy\": \"888\" }, \"pastObstetricHistory\": { \"beneficiaryRegID\": \"7506\", \"benVisitID\": null, \"providerServiceMapID\": \"1320\", \"pregnancyStatus\": \"Yes\", \"isUrinePregTest\": null, \"pregnant_No\": \"1\", \"noOfLivingChild\": \"1\", \"isAbortion\": false, \"isOralContraceptiveUsed\": false, \"isHormoneReplacementTherapy\": false, \"menarche_Age\": \"13\", \"isMenstrualCycleRegular\": true, \"menstrualCycleLength\": \"28\", \"menstrualFlowDuration\": \"3\", \"menstrualFlowType\": \"Little\", \"isDysmenorrhea\": false, \"isInterMenstrualBleeding\": false, \"menopauseAge\": null, \"isPostMenopauseBleeding\": null, \"createdBy\": \"888\" } } }"; doctorObjPve = "{ \"findings\":{ \"beneficiaryRegID\":\"7866\", \"benVisitID\":\"1040\", \"providerServiceMapID\":\"1320\", \"clinicalObservation\":\"Content here, content here\", \"otherSymptoms\":\"Content here, content here\", \"significantFindings\":\"Content here, content here\", \"complaints\":[ { \"chiefComplaint\":\"Abdominal Bloating\", \"chiefComplaintID\":1, \"duration\":\"23\", \"unitOfDuration\":\"Hours\", \"description\":\"content here, content here\" } ], \"createdBy\":\"888\" }, \"diagnosis\":{ \"ncdCareConditionID\":null, \"ncdCareCondition\":null, \"ncdCareTypeID\":null, \"ncdCareType\":null, \"ncdComplication\":\"Content here, content here\", \"beneficiaryRegID\":\"7866\", \"benVisitID\":\"1040\", \"providerServiceMapID\":\"1320\", \"createdBy\":\"888\" }, \"investigation\":{ \"externalInvestigation\":\"Content here, content here\", \"beneficiaryRegID\":\"7866\", \"benVisitID\":\"1040\", \"providerServiceMapID\":\"1320\", \"createdBy\":\"888\", \"laboratoryList\":[ { \"testID\":2, \"testName\":\"Blood Glucose Measurement\", \"isRadiologyImaging\":false }, { \"testID\":12, \"testName\":\"Blood grouping and Rh typing \", \"isRadiologyImaging\":false }, { \"testID\":17, \"testName\":\"BUN, Creatinine, Uric acid\", \"isRadiologyImaging\":false }, { \"testID\":29, \"testName\":\"CT Brain\", \"isRadiologyImaging\":true }, { \"testID\":30, \"testName\":\"CT Whole Spine \", \"isRadiologyImaging\":true }, { \"testID\":33, \"testName\":\"Flouroscopy- Urethrogram \", \"isRadiologyImaging\":true } ] }, \"prescription\":{ \"prescribedDrugs\":[ { \"specialInstruction\":\"After Food\", \"genericDrugName\":\"Ciprofloxacin Hcl Eye /Ear Drops IP 0.3% w/v in 5 ml\", \"dose\":\"Days \", \"frequency\":\"Thrice Daily (TID)\", \"drugForm\":\"Tablet\", \"drugDuration\":\"21\", \"qih\":3 } ], \"beneficiaryRegID\":\"7866\", \"benVisitID\":\"1040\", \"providerServiceMapID\":\"1320\", \"createdBy\":\"888\" }, \"refer\":{ \"referredToInstituteID\":null, \"refrredToAdditionalServiceList\":[ 3, 1, 5 ], \"beneficiaryRegID\":\"7866\", \"benVisitID\":\"1040\", \"providerServiceMapID\":\"1320\", \"createdBy\":\"888\" } }";