From c7ba22cc03200307690209695dd880d8fcb01442 Mon Sep 17 00:00:00 2001 From: Keval Kanpariya Date: Fri, 18 Apr 2025 00:46:09 +0530 Subject: [PATCH 1/4] Global cors config added. controller specific cors config added. --- src/main/environment/common_ci.properties | 3 + .../environment/common_example.properties | 2 + .../java/com/iemr/hwc/config/CorsConfig.java | 24 ++++++ .../ChildhoodAdolescenceController.java | 24 +++--- .../anc/AntenatalCareController.java | 32 +++---- .../CancerScreeningController.java | 34 ++++---- .../choApp/CHOAppSyncController.java | 2 +- .../common/main/WorklistController.java | 84 +++++++++---------- .../common/master/CommonMasterController.java | 2 +- .../controller/covid19/CovidController.java | 20 ++--- .../dataSyncActivity/StartSyncActivity.java | 12 +-- .../MMUDataSyncController.java | 6 +- ...abetesHypertensionScreeningController.java | 6 +- .../FamilyPlanningController.java | 18 ++-- .../FoetalMonitorController.java | 12 +-- .../generalOPD/GeneralOPDController.java | 24 +++--- .../LabTechnicianController.java | 10 +-- .../location/LocationController.java | 4 +- .../MasterVillageController.java | 2 +- .../controller/ncdCare/NCDCareController.java | 20 ++--- .../ncdscreening/NCDScreeningController.java | 38 ++++----- .../neonatal/NeonatalController.java | 24 +++--- .../PatientAppCommonMasterController.java | 18 ++-- .../pnc/PostnatalCareController.java | 28 +++---- .../quickBlox/QuickbloxController.java | 4 +- .../quickconsult/QuickConsultController.java | 14 ++-- .../registrar/main/RegistrarController.java | 30 +++---- .../master/RegistrarMasterController.java | 4 +- .../report/CRMReportController.java | 10 +-- .../controller/snomedct/SnomedController.java | 4 +- .../controller/spoke/VanSpokeController.java | 8 +- .../TeleConsultationController.java | 12 +-- .../UPTechnicalSupportUnitController.java | 8 +- .../controller/version/VersionController.java | 2 +- .../VideoConsultationController.java | 12 +-- .../controller/wo/LocationControllerWo.java | 6 +- .../hwc/controller/wo/UserBiomectrics.java | 4 +- 37 files changed, 298 insertions(+), 269 deletions(-) create mode 100644 src/main/java/com/iemr/hwc/config/CorsConfig.java diff --git a/src/main/environment/common_ci.properties b/src/main/environment/common_ci.properties index 91628182..df126f6b 100644 --- a/src/main/environment/common_ci.properties +++ b/src/main/environment/common_ci.properties @@ -97,3 +97,6 @@ logging.file.name=@env.HWC_API_LOGGING_FILE_NAME@ springdoc.api-docs.enabled=@env.SWAGGER_DOC_ENABLED@ springdoc.swagger-ui.enabled=@env.SWAGGER_DOC_ENABLED@ +cors.allowed-origins=@CORS_ALLOWED_ORIGINS@ + + diff --git a/src/main/environment/common_example.properties b/src/main/environment/common_example.properties index f5de6fd3..5ddea094 100644 --- a/src/main/environment/common_example.properties +++ b/src/main/environment/common_example.properties @@ -96,4 +96,6 @@ spring.redis.port=6379 springdoc.api-docs.enabled=true springdoc.swagger-ui.enabled=true +cors.allowed-origins=http://localhost:*,http://127.0.0.1:* + diff --git a/src/main/java/com/iemr/hwc/config/CorsConfig.java b/src/main/java/com/iemr/hwc/config/CorsConfig.java new file mode 100644 index 00000000..01a926d9 --- /dev/null +++ b/src/main/java/com/iemr/hwc/config/CorsConfig.java @@ -0,0 +1,24 @@ +package com.iemr.hwc.config; + +import org.springframework.beans.factory.annotation.Value; +import org.springframework.context.annotation.Configuration; +import org.springframework.web.servlet.config.annotation.CorsRegistry; +import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; + +@Configuration +public class CorsConfig implements WebMvcConfigurer { + + @Value("${cors.allowed-origins}") + private String allowedOrigins; + + @Override + public void addCorsMappings(CorsRegistry registry) { + registry.addMapping("/**") + .allowedOriginPatterns(allowedOrigins.split(",")) + .allowedMethods("GET", "POST", "PUT", "DELETE", "OPTIONS") + .allowedHeaders("*") + .exposedHeaders("Authorization", "Jwttoken") // Explicitly expose headers if needed + .allowCredentials(true) + .maxAge(3600); + } +} \ No newline at end of file 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 1e5841f6..7d26c89a 100644 --- a/src/main/java/com/iemr/hwc/controller/adolescent/ChildhoodAdolescenceController.java +++ b/src/main/java/com/iemr/hwc/controller/adolescent/ChildhoodAdolescenceController.java @@ -46,7 +46,7 @@ import io.swagger.v3.oas.annotations.Operation; -@CrossOrigin + @RestController @RequestMapping(value = "/child-adolescent-care", headers = "Authorization") public class ChildhoodAdolescenceController { @@ -61,7 +61,7 @@ public class ChildhoodAdolescenceController { * @return success or failure response with visit code * @throws Exception */ - @CrossOrigin + @Operation(summary = "Save child adolescent care (CAC) nurse data") @PostMapping(value = { "/save/nurseData" }) public String saveBenNurseDataCAC(@RequestBody String requestObj, @@ -94,7 +94,7 @@ public String saveBenNurseDataCAC(@RequestBody String requestObj, return response.toString(); } - @CrossOrigin + @Operation(summary = "Save child adolescent care doctor data") @PostMapping(value = { "save/doctorData" }) public String saveDoctorDataCAC(@RequestBody String requestObj, @@ -128,7 +128,7 @@ public String saveDoctorDataCAC(@RequestBody String requestObj, * @param comingRequest * @return visit details in JSON format */ - @CrossOrigin() + @Operation(summary = "Get beneficiary visit details from nurse for child adolescent care") @PostMapping(value = { "/getBenVisitDetailsFrmNurseCAC" }) @Transactional(rollbackFor = Exception.class) @@ -163,7 +163,7 @@ public String getBenVisitDetailsFrmNurseCAC( * @return history details in JSON format */ - @CrossOrigin() + @Operation(summary = "Get child adolescent care beneficiary history") @PostMapping(value = { "/getBenHistoryDetails" }) @@ -196,7 +196,7 @@ public String getBenHistoryDetails( * @return vital details in JSON format */ - @CrossOrigin() + @Operation(summary = "Get child adolescent care beneficiary vitals from nurse") @PostMapping(value = { "/getBenVitalDetailsFrmNurse" }) public String getBenVitalDetailsFrmNurse( @@ -231,7 +231,7 @@ public String getBenVitalDetailsFrmNurse( * @return immunization service details in JSON format */ - @CrossOrigin() + @Operation(summary = "Get child adolescent care beneficiary immunization details") @PostMapping(value = { "/getBenImmunizationServiceDetails" }) @@ -265,7 +265,7 @@ public String getBenImmunizationServiceDetails( * @return doctor details in JSON format */ - @CrossOrigin() + @Operation(summary = "Get child adolescent care beneficiary details entered by doctor") @PostMapping(value = { "/getBenCaseRecordFromDoctor" }) @Transactional(rollbackFor = Exception.class) @@ -299,7 +299,7 @@ public String getBenCaseRecordFromDoctor( * @param comingRequest * @return vital details in JSON format */ - @CrossOrigin + @Operation(summary = "Update child adolescent care beneficiary vitals") @PostMapping(value = { "/update/vitalScreen" }) public String updateVitalNurseCAC(@RequestBody String requestObj) { @@ -334,7 +334,7 @@ public String updateVitalNurseCAC(@RequestBody String requestObj) { * @return history details in JSON format */ - @CrossOrigin + @Operation(summary = "Update birth and immunization history") @PostMapping(value = { "/update/BirthAndImmunizationHistoryScreen" }) public String updateBirthAndImmunizationHistoryNurse(@RequestBody String requestObj) { @@ -370,7 +370,7 @@ public String updateBirthAndImmunizationHistoryNurse(@RequestBody String request * @return immunization service details in JSON format */ - @CrossOrigin + @Operation(summary = "Update immunization service data") @PostMapping(value = { "/update/ImmunizationServicesScreen" }) public String updateImmunizationServicesNurse(@RequestBody String requestObj) { @@ -405,7 +405,7 @@ public String updateImmunizationServicesNurse(@RequestBody String requestObj) { * @return doctor details in JSON format */ - @CrossOrigin + @Operation(summary = "Update child adolescent care doctor data") @PostMapping(value = { "/update/doctorData" }) public String updateCACDoctorData(@RequestBody String requestObj, 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 52c30b3b..1f3bc182 100644 --- a/src/main/java/com/iemr/hwc/controller/anc/AntenatalCareController.java +++ b/src/main/java/com/iemr/hwc/controller/anc/AntenatalCareController.java @@ -53,7 +53,7 @@ * */ -@CrossOrigin + @RestController @RequestMapping(value = "/ANC", headers = "Authorization", consumes = "application/json", produces = "application/json") public class AntenatalCareController { @@ -69,7 +69,7 @@ public class AntenatalCareController { * @throws Exception */ - @CrossOrigin + @Operation(summary = "Save ANC nurse data") @PostMapping(value = { "/save/nurseData" }) public String saveBenANCNurseData(@RequestBody String requestObj, @@ -107,7 +107,7 @@ public String saveBenANCNurseData(@RequestBody String requestObj, * @param JSON requestObj * @return success or failure response */ - @CrossOrigin + @Operation(summary = "Save ANC doctor data") @PostMapping(value = { "/save/doctorData" }) public String saveBenANCDoctorData(@RequestBody String requestObj, @@ -144,7 +144,7 @@ public String saveBenANCDoctorData(@RequestBody String requestObj, * @return visit details in JSON format */ - @CrossOrigin() + @Operation(summary = "Get ANC beneficiary visit details from nurse") @PostMapping(value = { "/getBenVisitDetailsFrmNurseANC" }) @Transactional(rollbackFor = Exception.class) @@ -177,7 +177,7 @@ public String getBenVisitDetailsFrmNurseANC( * @param benRegID and benVisitID * @return anc care details in JSON format */ - @CrossOrigin() + @Operation(summary = "Get ANC beneficiary details from nurse") @PostMapping(value = { "/getBenANCDetailsFrmNurseANC" }) @Transactional(rollbackFor = Exception.class) @@ -214,7 +214,7 @@ public String getBenANCDetailsFrmNurseANC( * @param benRegID and benVisitID * @return history details in JSON format */ - @CrossOrigin() + @Operation(summary = "Get ANC beneficiary history from nurse") @PostMapping(value = { "/getBenANCHistoryDetails" }) @@ -247,7 +247,7 @@ public String getBenANCHistoryDetails( * @param benRegID and benVisitID * @return vital details in JSON format */ - @CrossOrigin() + @Operation(summary = "Get ANC beneficiary vitals from nurse") @PostMapping(value = { "/getBenANCVitalDetailsFrmNurseANC" }) public String getBenANCVitalDetailsFrmNurseANC( @@ -280,7 +280,7 @@ public String getBenANCVitalDetailsFrmNurseANC( * @param benRegID and benVisitID * @return examination details in JSON format */ - @CrossOrigin() + @Operation(summary = "Get ANC beneficiary examination details from nurse") @PostMapping(value = { "/getBenExaminationDetailsANC" }) @@ -313,7 +313,7 @@ public String getBenExaminationDetailsANC( * @param benRegID and benVisitID * @return doctor entered details in JSON format */ - @CrossOrigin() + @Operation(summary = "Get ANC beneficiary case record") @PostMapping(value = { "/getBenCaseRecordFromDoctorANC" }) @Transactional(rollbackFor = Exception.class) @@ -342,7 +342,7 @@ public String getBenCaseRecordFromDoctorANC( return response.toString(); } - @CrossOrigin() + @Operation(summary = "Check high risk pregnancy status for ANC beneficiary") @PostMapping(value = { "/getHRPStatus" }) @Transactional(rollbackFor = Exception.class) @@ -366,7 +366,7 @@ public String getHRPStatus(@RequestBody HrpStatusAndReasonsRequestModel hrpStatu @Autowired private ANCService aNCService; - @CrossOrigin() + @Operation(summary = "Get high risk pregnancy information (status and reason) from obstetric history " + "as per the latest visit") @PostMapping(value = { "/getHrpInformation" }) @@ -399,7 +399,7 @@ public String getHrpInformation( * Doctor */ - @CrossOrigin + @Operation(summary = "Update ANC beneficiary data") @PostMapping(value = { "/update/ANCScreen" }) public String updateANCCareNurse(@RequestBody String requestObj) { @@ -436,7 +436,7 @@ public String updateANCCareNurse(@RequestBody String requestObj) { * by Doctor */ - @CrossOrigin + @Operation(summary = "Update ANC beneficiary history") @PostMapping(value = { "/update/historyScreen" }) public String updateANCHistoryNurse(@RequestBody String requestObj) { @@ -473,7 +473,7 @@ public String updateANCHistoryNurse(@RequestBody String requestObj) { * by Doctor */ - @CrossOrigin + @Operation(summary = "Update ANC beneficiary vitals") @PostMapping(value = { "/update/vitalScreen" }) public String updateANCVitalNurse(@RequestBody String requestObj) { @@ -510,7 +510,7 @@ public String updateANCVitalNurse(@RequestBody String requestObj) { * by Doctor */ - @CrossOrigin + @Operation(summary = "Update ANC examination data") @PostMapping(value = { "/update/examinationScreen" }) public String updateANCExaminationNurse(@RequestBody String requestObj) { @@ -546,7 +546,7 @@ public String updateANCExaminationNurse(@RequestBody String requestObj) { * @objective Replace ANC doctor data for the doctor next visit * */ - @CrossOrigin + @Operation(summary = "Update ANC doctor data") @PostMapping(value = { "/update/doctorData" }) public String updateANCDoctorData(@RequestBody String requestObj, 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 34ecd7cf..49ceb034 100644 --- a/src/main/java/com/iemr/hwc/controller/cancerscreening/CancerScreeningController.java +++ b/src/main/java/com/iemr/hwc/controller/cancerscreening/CancerScreeningController.java @@ -50,7 +50,7 @@ * @Objective Saving Cancer screening data for Nurse and Doctor both. * */ -@CrossOrigin + @RestController @RequestMapping(value = "/CS-cancerScreening", headers = "Authorization", consumes = "application/json", produces = "application/json") public class CancerScreeningController { @@ -70,7 +70,7 @@ public void setCancerScreeningServiceImpl(CSServiceImpl cSServiceImpl) { * @throws Exception */ - @CrossOrigin + @Operation(summary = "Save cancer screening data collected by nurse") @PostMapping(value = { "/save/nurseData" }) public String saveBenCancerScreeningNurseData(@RequestBody String requestObj, @@ -107,7 +107,7 @@ public String saveBenCancerScreeningNurseData(@RequestBody String requestObj, * @return success or failure response */ - @CrossOrigin + @Operation(summary = "Update cancer screening data by the doctor") @PostMapping(value = { "/save/doctorData" }) public String saveBenCancerScreeningDoctorData(@RequestBody String requestObj, @@ -145,7 +145,7 @@ public String saveBenCancerScreeningDoctorData(@RequestBody String requestObj, * @return visit details in JSON format */ - @CrossOrigin() + @Operation(summary = "Get beneficiary visit details") @PostMapping(value = { "/getBenDataFrmNurseToDocVisitDetailsScreen" }) public String getBenDataFrmNurseScrnToDocScrnVisitDetails( @@ -177,7 +177,7 @@ public String getBenDataFrmNurseScrnToDocScrnVisitDetails( * @return history details in JSON format */ - @CrossOrigin() + @Operation(summary = "Get beneficiary cancer history") @PostMapping(value = { "/getBenDataFrmNurseToDocHistoryScreen" }) public String getBenDataFrmNurseScrnToDocScrnHistory( @@ -208,7 +208,7 @@ public String getBenDataFrmNurseScrnToDocScrnHistory( * @return vital details in JSON format */ - @CrossOrigin() + @Operation(summary = "Get beneficiary vitals") @PostMapping(value = { "/getBenDataFrmNurseToDocVitalScreen" }) public String getBenDataFrmNurseScrnToDocScrnVital( @@ -240,7 +240,7 @@ public String getBenDataFrmNurseScrnToDocScrnVital( * @return examination details in JSON format */ - @CrossOrigin() + @Operation(summary = "Get beneficiary examination details") @PostMapping(value = { "/getBenDataFrmNurseToDocExaminationScreen" }) public String getBenDataFrmNurseScrnToDocScrnExamination( @@ -272,7 +272,7 @@ public String getBenDataFrmNurseScrnToDocScrnExamination( * @return previous family history details in JSON format */ - @CrossOrigin() + @Operation(summary = "Get beneficiary family history") @PostMapping(value = { "/getBenCancerFamilyHistory" }) public String getBenCancerFamilyHistory( @@ -306,7 +306,7 @@ public String getBenCancerFamilyHistory( * @return previous personal history details in JSON format */ - @CrossOrigin() + @Operation(summary = "Get beneficiary personal history") @PostMapping(value = { "/getBenCancerPersonalHistory" }) public String getBenCancerPersonalHistory( @@ -339,7 +339,7 @@ public String getBenCancerPersonalHistory( * @return previous personal history details in JSON format */ - @CrossOrigin() + @Operation(summary = "Get beneficiary personal diet history") @PostMapping(value = { "/getBenCancerPersonalDietHistory" }) public String getBenCancerPersonalDietHistory( @@ -373,7 +373,7 @@ public String getBenCancerPersonalDietHistory( * @return previous obstetric history details in JSON format */ - @CrossOrigin() + @Operation(summary = "Get beneficiary obstetric history") @PostMapping(value = { "/getBenCancerObstetricHistory" }) public String getBenCancerObstetricHistory( @@ -405,7 +405,7 @@ public String getBenCancerObstetricHistory( * @return doctor details in JSON format */ - @CrossOrigin() + @Operation(summary = "Get beneficiary case record and referral details") @PostMapping(value = { "/getBenCaseRecordFromDoctorCS" }) @Transactional(rollbackFor = Exception.class) @@ -440,7 +440,7 @@ public String getBenCaseRecordFromDoctorCS( * details entered by Doctor */ - @CrossOrigin + @Operation(summary = "Update cancer screening history") @PostMapping(value = { "/update/historyScreen" }) public String updateCSHistoryNurse( @@ -490,7 +490,7 @@ public String updateCSHistoryNurse( * details entered by Doctor */ - @CrossOrigin + @Operation(summary = "Update beneficiary vitals") @PostMapping(value = { "/update/vitalScreen" }) public String upodateBenVitalDetail( @@ -528,7 +528,7 @@ public String upodateBenVitalDetail( * the details entered by Doctor */ - @CrossOrigin + @Operation(summary = "Update beneficiary examination details") @PostMapping(value = { "/update/examinationScreen" }) public String upodateBenExaminationDetail(@RequestBody String requestObj) { @@ -561,7 +561,7 @@ public String upodateBenExaminationDetail(@RequestBody String requestObj) { * */ - @CrossOrigin + @Operation(summary = "Update cancer diagnosis details by Oncologist") @PostMapping(value = { "/update/examinationScreen/diagnosis" }) public String updateCancerDiagnosisDetailsByOncologist( @@ -594,7 +594,7 @@ public String updateCancerDiagnosisDetailsByOncologist( * */ - @CrossOrigin + @Operation(summary = "Update cancer screening data") @PostMapping(value = { "/update/doctorData" }) public String updateCancerScreeningDoctorData(@RequestBody String requestObj) { diff --git a/src/main/java/com/iemr/hwc/controller/choApp/CHOAppSyncController.java b/src/main/java/com/iemr/hwc/controller/choApp/CHOAppSyncController.java index 7be493cb..a12b42fb 100644 --- a/src/main/java/com/iemr/hwc/controller/choApp/CHOAppSyncController.java +++ b/src/main/java/com/iemr/hwc/controller/choApp/CHOAppSyncController.java @@ -36,7 +36,7 @@ import org.springframework.web.bind.annotation.*; import java.util.List; -@CrossOrigin + @RestController @RequestMapping(value = "/sync", headers = "Authorization", consumes = "application/json", produces = "application/json") /** diff --git a/src/main/java/com/iemr/hwc/controller/common/main/WorklistController.java b/src/main/java/com/iemr/hwc/controller/common/main/WorklistController.java index 6cd7aff4..b84aab06 100644 --- a/src/main/java/com/iemr/hwc/controller/common/main/WorklistController.java +++ b/src/main/java/com/iemr/hwc/controller/common/main/WorklistController.java @@ -48,7 +48,7 @@ import io.swagger.v3.oas.annotations.Operation; -@CrossOrigin + @RestController @RequestMapping(value = "/common", headers = "Authorization", consumes = "application/json", produces = "application/json") public class WorklistController { @@ -73,7 +73,7 @@ public void setCommonNurseServiceImpl(CommonNurseServiceImpl commonNurseServiceI this.commonNurseServiceImpl = commonNurseServiceImpl; } - @CrossOrigin() + @Operation(summary = "Get doctor worklist") @GetMapping(value = { "/getDocWorklistNew/{providerServiceMapID}/{serviceID}/{vanID}" }) public String getDocWorkListNew(@PathVariable("providerServiceMapID") Integer providerServiceMapID, @@ -97,7 +97,7 @@ public String getDocWorkListNew(@PathVariable("providerServiceMapID") Integer pr } // doc worklist new (TM future scheduled beneficiary) - @CrossOrigin() + @Operation(summary = "Get doctor future worklist scheduled for telemedicine") @GetMapping(value = { "/getDocWorkListNewFutureScheduledForTM/{providerServiceMapID}/{serviceID}/{vanID}" }) public String getDocWorkListNewFutureScheduledForTM( @@ -124,7 +124,7 @@ public String getDocWorkListNewFutureScheduledForTM( } // nurse worklist new - @CrossOrigin() + @Operation(summary = "Get nurse worklist") @GetMapping(value = { "/getNurseWorklistNew/{providerServiceMapID}/{serviceID}/{vanID}" }) public String getNurseWorkListNew(@PathVariable("providerServiceMapID") Integer providerServiceMapID, @@ -145,7 +145,7 @@ public String getNurseWorkListNew(@PathVariable("providerServiceMapID") Integer } // nurse worklist TC schedule (current-date) new - @CrossOrigin() + @Operation(summary = "Get worklist for teleconsultation for the current date") @GetMapping(value = { "/getNurseWorkListTcCurrentDate/{providerServiceMapID}/{serviceID}/{vanID}" }) public String getNurseWorkListTcCurrentDateNew(@PathVariable("providerServiceMapID") Integer providerServiceMapID, @@ -165,7 +165,7 @@ public String getNurseWorkListTcCurrentDateNew(@PathVariable("providerServiceMap } // nurse worklist TC schedule (future-date) new - @CrossOrigin() + @Operation(summary = "Get worklist for teleconsultation for the future date") @GetMapping(value = { "/getNurseWorkListTcFutureDate/{providerServiceMapID}/{serviceID}/{vanID}" }) public String getNurseWorkListTcFutureDateNew(@PathVariable("providerServiceMapID") Integer providerServiceMapID, @@ -184,7 +184,7 @@ public String getNurseWorkListTcFutureDateNew(@PathVariable("providerServiceMapI return response.toString(); } - @CrossOrigin() + @Operation(summary = "Get previous significant findings") @PostMapping(value = { "/getDoctorPreviousSignificantFindings" }) public String getDoctorPreviousSignificantFindings( @@ -210,7 +210,7 @@ public String getDoctorPreviousSignificantFindings( } // Get Lab technician worklist new - @CrossOrigin() + @Operation(summary = "Get lab technician worklist") @GetMapping(value = { "/getLabWorklistNew/{providerServiceMapID}/{serviceID}/{vanID}" }) public String getLabWorkListNew(@PathVariable("providerServiceMapID") Integer providerServiceMapID, @@ -230,7 +230,7 @@ public String getLabWorkListNew(@PathVariable("providerServiceMapID") Integer pr } // Get radiologist worklist new - @CrossOrigin() + @Operation(summary = "Get radiologist worklist") @PostMapping(value = { "/getRadiologist-worklist-New/{providerServiceMapID}/{serviceID}/{vanID}" }) public String getRadiologistWorklistNew(@PathVariable("providerServiceMapID") Integer providerServiceMapID, @@ -250,7 +250,7 @@ public String getRadiologistWorklistNew(@PathVariable("providerServiceMapID") In } // Get oncologist worklist new - @CrossOrigin() + @Operation(summary = "Get oncologist worklist") @PostMapping(value = { "/getOncologist-worklist-New/{providerServiceMapID}/{serviceID}/{vanID}" }) public String getOncologistWorklistNew(@PathVariable("providerServiceMapID") Integer providerServiceMapID, @@ -270,7 +270,7 @@ public String getOncologistWorklistNew(@PathVariable("providerServiceMapID") Int } // Get pharma worklist new - @CrossOrigin() + @Operation(summary = "Get pharmacist worklist") @GetMapping(value = { "/getPharma-worklist-New/{providerServiceMapID}/{serviceID}/{vanID}" }) public String getPharmaWorklistNew(@PathVariable("providerServiceMapID") Integer providerServiceMapID, @@ -289,7 +289,7 @@ public String getPharmaWorklistNew(@PathVariable("providerServiceMapID") Integer return response.toString(); } - @CrossOrigin() + @Operation(summary = "Print case sheet of beneficiary.") @PostMapping(value = { "/get/Case-sheet/printData" }) public String getCasesheetPrintData(@RequestBody String comingReq, @@ -309,7 +309,7 @@ public String getCasesheetPrintData(@RequestBody String comingReq, } // Start of Fetch Previous Medical History... - @CrossOrigin() + @Operation(summary = "Get beneficiary history") @PostMapping(value = { "/getBenPastHistory" }) public String getBenPastHistory(@Param(value = "{\"benRegID\":\"Long\"}") @RequestBody String comingRequest) { @@ -335,7 +335,7 @@ public String getBenPastHistory(@Param(value = "{\"benRegID\":\"Long\"}") @Reque return response.toString(); } - @CrossOrigin() + @Operation(summary = "Get beneficiary tobacco consumption history") @PostMapping(value = { "/getBenTobaccoHistory" }) public String getBenTobaccoHistory(@Param(value = "{\"benRegID\":\"Long\"}") @RequestBody String comingRequest) { @@ -360,7 +360,7 @@ public String getBenTobaccoHistory(@Param(value = "{\"benRegID\":\"Long\"}") @Re return response.toString(); } - @CrossOrigin() + @Operation(summary = "Get beneficiary alcohol consumption history") @PostMapping(value = { "/getBenAlcoholHistory" }) public String getBenAlcoholHistory(@Param(value = "{\"benRegID\":\"Long\"}") @RequestBody String comingRequest) { @@ -385,7 +385,7 @@ public String getBenAlcoholHistory(@Param(value = "{\"benRegID\":\"Long\"}") @Re return response.toString(); } - @CrossOrigin() + @Operation(summary = "Get beneficiary allergy history") @PostMapping(value = { "/getBenAllergyHistory" }) public String getBenANCAllergyHistory(@Param(value = "{\"benRegID\":\"Long\"}") @RequestBody String comingRequest) { @@ -411,7 +411,7 @@ public String getBenANCAllergyHistory(@Param(value = "{\"benRegID\":\"Long\"}") return response.toString(); } - @CrossOrigin() + @Operation(summary = "Get beneficiary medication history") @PostMapping(value = { "/getBenMedicationHistory" }) public String getBenMedicationHistory(@Param(value = "{\"benRegID\":\"Long\"}") @RequestBody String comingRequest) { @@ -436,7 +436,7 @@ public String getBenMedicationHistory(@Param(value = "{\"benRegID\":\"Long\"}") return response.toString(); } - @CrossOrigin() + @Operation(summary = "Get beneficiary family history") @PostMapping(value = { "/getBenFamilyHistory" }) public String getBenFamilyHistory(@Param(value = "{\"benRegID\":\"Long\"}") @RequestBody String comingRequest) { @@ -461,7 +461,7 @@ public String getBenFamilyHistory(@Param(value = "{\"benRegID\":\"Long\"}") @Req return response.toString(); } - @CrossOrigin() + @Operation(summary = "Get beneficiary menstrual history") @PostMapping(value = { "/getBenMenstrualHistory" }) public String getBenMenstrualHistory(@Param(value = "{\"benRegID\":\"Long\"}") @RequestBody String comingRequest) { @@ -486,7 +486,7 @@ public String getBenMenstrualHistory(@Param(value = "{\"benRegID\":\"Long\"}") @ return response.toString(); } - @CrossOrigin() + @Operation(summary = "Get beneficiary obstetrics history") @PostMapping(value = { "/getBenPastObstetricHistory" }) public String getBenPastObstetricHistory( @@ -512,7 +512,7 @@ public String getBenPastObstetricHistory( return response.toString(); } - @CrossOrigin() + @Operation(summary = "Get beneficiary comorbidity condition details") @PostMapping(value = { "/getBenComorbidityConditionHistory" }) public String getBenANCComorbidityConditionHistory( @@ -538,7 +538,7 @@ public String getBenANCComorbidityConditionHistory( return response.toString(); } - @CrossOrigin() + @Operation(summary = "Get beneficiary optional vaccine details") @PostMapping(value = { "/getBenOptionalVaccineHistory" }) public String getBenOptionalVaccineHistory( @@ -564,7 +564,7 @@ public String getBenOptionalVaccineHistory( return response.toString(); } - @CrossOrigin() + @Operation(summary = "Get child beneficiary vaccine details") @PostMapping(value = { "/getBenChildVaccineHistory" }) public String getBenImmunizationHistory( @@ -590,7 +590,7 @@ public String getBenImmunizationHistory( return response.toString(); } - @CrossOrigin() + @Operation(summary = "Get beneficiary perinatal history") @PostMapping(value = { "/getBenPerinatalHistory" }) public String getBenPerinatalHistory(@Param(value = "{\"benRegID\":\"Long\"}") @RequestBody String comingRequest) { @@ -615,7 +615,7 @@ public String getBenPerinatalHistory(@Param(value = "{\"benRegID\":\"Long\"}") @ return response.toString(); } - @CrossOrigin() + @Operation(summary = "Get child beneficiary feeding history") @PostMapping(value = { "/getBenFeedingHistory" }) public String getBenFeedingHistory(@Param(value = "{\"benRegID\":\"Long\"}") @RequestBody String comingRequest) { @@ -640,7 +640,7 @@ public String getBenFeedingHistory(@Param(value = "{\"benRegID\":\"Long\"}") @Re return response.toString(); } - @CrossOrigin() + @Operation(summary = "Get child beneficiary development history") @PostMapping(value = { "/getBenDevelopmentHistory" }) public String getBenDevelopmentHistory( @@ -672,7 +672,7 @@ public String getBenDevelopmentHistory( * fetch ben previous visit details for history case-record(Platform). * 08-08-2018 */ - @CrossOrigin() + @Operation(summary = "Get beneficiary casesheet history") @PostMapping(value = { "/getBeneficiaryCaseSheetHistory" }) public String getBeneficiaryCaseSheetHistory( @@ -693,7 +693,7 @@ public String getBeneficiaryCaseSheetHistory( } // TC specialist worklist new - @CrossOrigin() + @Operation(summary = "Get teleconsultation specialist worklist") @GetMapping(value = { "/getTCSpecialistWorklist/{providerServiceMapID}/{serviceID}/{userID}" }) public String getTCSpecialistWorkListNew(@PathVariable("providerServiceMapID") Integer providerServiceMapID, @@ -718,7 +718,7 @@ public String getTCSpecialistWorkListNew(@PathVariable("providerServiceMapID") I } // TC specialist worklist new, patient App, 14-08-2020 - @CrossOrigin() + @Operation(summary = "Get teleconsultation specialist worklist for patient app") @GetMapping(value = { "/getTCSpecialistWorklistPatientApp/{providerServiceMapID}/{serviceID}/{userID}/{vanID}" }) public String getTCSpecialistWorkListNewPatientApp( @@ -744,7 +744,7 @@ public String getTCSpecialistWorkListNewPatientApp( } // TC specialist worklist new future scheduled - @CrossOrigin() + @Operation(summary = "Get teleconsultation specialist future scheduled") @GetMapping(value = { "/getTCSpecialistWorklistFutureScheduled/{providerServiceMapID}/{serviceID}/{userID}" }) @@ -772,7 +772,7 @@ public String getTCSpecialistWorklistFutureScheduled( } // openkm file download - @CrossOrigin + @Operation(summary = "Add file as string to openKM.") @PostMapping(value = "/getKMFile", produces = MediaType.APPLICATION_JSON, consumes = MediaType.APPLICATION_JSON, headers = "Authorization") public String getKMFile(@Param(value = "{}") @RequestBody String request, @@ -793,7 +793,7 @@ public String getKMFile(@Param(value = "{}") @RequestBody String request, return response.toString(); } - @CrossOrigin() + @Operation(summary = "Get beneficiary physical history") @PostMapping(value = { "/getBenPhysicalHistory" }) public String getBenPhysicalHistory(@Param(value = "{\"benRegID\":\"Long\"}") @RequestBody String comingRequest) { @@ -819,7 +819,7 @@ public String getBenPhysicalHistory(@Param(value = "{\"benRegID\":\"Long\"}") @R return response.toString(); } - @CrossOrigin() + @Operation(summary = "Get beneficiary symptomatic questionnaire answer details") @PostMapping(value = { "/getBenSymptomaticQuestionnaireDetails" }) public String getBenSymptomaticQuestionnaireDetails( @@ -846,7 +846,7 @@ public String getBenSymptomaticQuestionnaireDetails( return response.toString(); } - @CrossOrigin() + @Operation(summary = "Get beneficiary previous biabetes history") @PostMapping(value = { "/getBenPreviousDiabetesHistoryDetails" }) public String getBenPreviousDiabetesHistoryDetails( @@ -874,7 +874,7 @@ public String getBenPreviousDiabetesHistoryDetails( } // nurse worklist coming from MMU application - @CrossOrigin() + @Operation(summary = "Get mmu nurse worklist") @GetMapping(value = { "/getMmuNurseWorklistNew/{providerServiceMapID}/{serviceID}/{vanID}" }) public String getMmuNurseWorklistNew(@PathVariable("providerServiceMapID") Integer providerServiceMapID, @@ -894,7 +894,7 @@ public String getMmuNurseWorklistNew(@PathVariable("providerServiceMapID") Integ return response.toString(); } - @CrossOrigin() + @Operation(summary = "Get beneficiary previous Referral history") @PostMapping(value = { "/getBenPreviousReferralHistoryDetails" }) public String getBenPreviousReferralHistoryDetails( @@ -927,7 +927,7 @@ public String getBenPreviousReferralHistoryDetails( * @param comingRequest * @return ProviderSpecificMasterData */ - @CrossOrigin() + @Operation(summary = "Get provider specific data") @PostMapping(value = { "/getProviderSpecificData" }) public String getProviderSpecificData( @@ -952,7 +952,7 @@ public String getProviderSpecificData( * @param comingRequest * @return ProviderSpecificMasterData */ - @CrossOrigin() + @Operation(summary = "Calculate beneficiary BMI status") @PostMapping(value = { "/calculateBMIStatus" }) public String calculateBMIStatus( @@ -976,7 +976,7 @@ public String calculateBMIStatus( * @param { "benRegID": "274685" } * @return immunization service details in JSON format */ - @CrossOrigin() + @Operation(summary = "Get beneficiary immunization history ") @PostMapping(value = { "/getBenImmunizationServiceHistory" }) @@ -1005,7 +1005,7 @@ public String getBenImmunizationServiceHistory( // this functionality are moved to registrar update controller. // 16-04-2018, Neeraj kumar - @CrossOrigin + @Operation(summary = "Update beneficiary status flag") @PostMapping(value = { "/update/benDetailsAndSubmitToNurse" }) public String saveBeneficiaryVisitDetail( @@ -1038,7 +1038,7 @@ public String saveBeneficiaryVisitDetail( return response.toString(); } - @CrossOrigin + @Operation(summary = "Extend redis session for 30 mins") @PostMapping(value = { "/extend/redisSession" }) public String extendRedisSession() { @@ -1052,7 +1052,7 @@ public String extendRedisSession() { return response.toString(); } - @CrossOrigin + @Operation(summary = "Soft delete prescribed medicine") @PostMapping(value = { "/doctor/delete/prescribedMedicine" }) public String deletePrescribedMedicine(@RequestBody String requestOBJ) { diff --git a/src/main/java/com/iemr/hwc/controller/common/master/CommonMasterController.java b/src/main/java/com/iemr/hwc/controller/common/master/CommonMasterController.java index 23bb570c..5c26dd7e 100644 --- a/src/main/java/com/iemr/hwc/controller/common/master/CommonMasterController.java +++ b/src/main/java/com/iemr/hwc/controller/common/master/CommonMasterController.java @@ -39,7 +39,7 @@ -@CrossOrigin + @RestController @RequestMapping(value = "/master", headers = "Authorization", consumes = "application/json", produces = "application/json") /** Objective: provides master data based on given visitCategory */ 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 b097d27c..c5f8eeb1 100644 --- a/src/main/java/com/iemr/hwc/controller/covid19/CovidController.java +++ b/src/main/java/com/iemr/hwc/controller/covid19/CovidController.java @@ -52,7 +52,7 @@ * * @Objective Saving NCD Care data for Nurse and Doctor. */ -@CrossOrigin + @RestController @RequestMapping(value = "/pandemic/covid", headers = "Authorization", consumes = "application/json", produces = "application/json") public class CovidController { @@ -61,7 +61,7 @@ public class CovidController { @Autowired private Covid19ServiceImpl covid19ServiceImpl; - @CrossOrigin + @Operation(summary = "Save COVID nurse data") @PostMapping(value = { "/save/nurseData" }) public String saveBenNCDCareNurseData(@RequestBody String requestObj, @@ -98,7 +98,7 @@ public String saveBenNCDCareNurseData(@RequestBody String requestObj, * @param JSON requestObj * @return success or failure response */ - @CrossOrigin + @Operation(summary = "Save COVID doctor data") @PostMapping(value = { "/save/doctorData" }) public String saveBenCovidDoctorData(@RequestBody String requestObj, @@ -136,7 +136,7 @@ public String saveBenCovidDoctorData(@RequestBody String requestObj, * @return visit details in JSON format */ - @CrossOrigin() + @Operation(summary = "Get COVID beneficiary visit details") @PostMapping(value = { "/getBenVisitDetailsFrmNurseCovid" }) @Transactional(rollbackFor = Exception.class) @@ -170,7 +170,7 @@ public String getBenVisitDetailsFrmNurseCovid19( * @param comingRequest * @return visit details in JSON format */ - @CrossOrigin() + @Operation(summary = "Get COVID beneficiary history") @PostMapping(value = { "/getBenCovid19HistoryDetails" }) @@ -204,7 +204,7 @@ public String getBenCovid19HistoryDetails( * @return visit details in JSON format */ - @CrossOrigin() + @Operation(summary = "Get COVID beneficiary vitals") @PostMapping(value = { "/getBenVitalDetailsFrmNurseCovid" }) public String getBenVitalDetailsFrmNurseNCDCare( @@ -237,7 +237,7 @@ public String getBenVitalDetailsFrmNurseNCDCare( * @param comingRequest * @return visit details in JSON format */ - @CrossOrigin() + @Operation(summary = "Get COVID beneficiary case-record and referral details") @PostMapping(value = { "/getBenCaseRecordFromDoctorCovid" }) @Transactional(rollbackFor = Exception.class) @@ -274,7 +274,7 @@ public String getBenCaseRecordFromDoctorCovid19( * entered by doctor */ - @CrossOrigin + @Operation(summary = "Update COVID beneficiary history") @PostMapping(value = { "/update/historyScreen" }) public String updateHistoryNurse(@RequestBody String requestObj) { @@ -313,7 +313,7 @@ public String updateHistoryNurse(@RequestBody String requestObj) { * entered by doctor */ - @CrossOrigin + @Operation(summary = "Update COVID beneficiary vitals") @PostMapping(value = { "/update/vitalScreen" }) public String updateVitalNurse(@RequestBody String requestObj) { @@ -348,7 +348,7 @@ public String updateVitalNurse(@RequestBody String requestObj) { * @return success or failure response * @objective Replace COVID 19 doctor data for the doctor next visit */ - @CrossOrigin + @Operation(summary = "Update COVID beneficiary case-record and referral details") @PostMapping(value = { "/update/doctorData" }) public String updateCovid19DoctorData(@RequestBody String requestObj, diff --git a/src/main/java/com/iemr/hwc/controller/dataSyncActivity/StartSyncActivity.java b/src/main/java/com/iemr/hwc/controller/dataSyncActivity/StartSyncActivity.java index 9926a729..8401fc95 100644 --- a/src/main/java/com/iemr/hwc/controller/dataSyncActivity/StartSyncActivity.java +++ b/src/main/java/com/iemr/hwc/controller/dataSyncActivity/StartSyncActivity.java @@ -48,7 +48,7 @@ * @purpose Class used for data sync from van-to-server & server-to-van * */ -@CrossOrigin + @RestController @RequestMapping(value = "/dataSyncActivity", headers = "Authorization", consumes = "application/json", produces = "application/json") public class StartSyncActivity { @@ -59,7 +59,7 @@ public class StartSyncActivity { @Autowired private DownloadDataFromServerImpl downloadDataFromServerImpl; - @CrossOrigin() + @Operation(summary = "Initiate data sync from van to server") @PostMapping(value = { "/van-to-server" }) public String dataSyncToServer(@RequestBody String requestOBJ, @@ -86,7 +86,7 @@ public String dataSyncToServer(@RequestBody String requestOBJ, return response.toStringWithSerialization(); } - @CrossOrigin() + @Operation(summary = "Get data sync group details") @GetMapping(value = { "/getSyncGroupDetails" }) public String getSyncGroupDetails() { @@ -108,7 +108,7 @@ public String getSyncGroupDetails() { * * @return Masters download in van from central server */ - @CrossOrigin() + @Operation(summary = "Download synched master data") @PostMapping(value = { "/startMasterDownload" }) public String startMasterDownload(@RequestBody String requestOBJ, @@ -141,7 +141,7 @@ public String startMasterDownload(@RequestBody String requestOBJ, return response.toString(); } - @CrossOrigin() + @Operation(summary = "Master data sync download progress check") @GetMapping(value = { "/checkMastersDownloadProgress" }) public String checkMastersDownloadProgress() { @@ -155,7 +155,7 @@ public String checkMastersDownloadProgress() { return response.toString(); } - @CrossOrigin() + @Operation(summary = "Get van details for master sync data download") @GetMapping(value = { "/getVanDetailsForMasterDownload" }) public String getVanDetailsForMasterDownload() { diff --git a/src/main/java/com/iemr/hwc/controller/dataSyncLayerCentral/MMUDataSyncController.java b/src/main/java/com/iemr/hwc/controller/dataSyncLayerCentral/MMUDataSyncController.java index 42f49807..8f111dbb 100644 --- a/src/main/java/com/iemr/hwc/controller/dataSyncLayerCentral/MMUDataSyncController.java +++ b/src/main/java/com/iemr/hwc/controller/dataSyncLayerCentral/MMUDataSyncController.java @@ -46,7 +46,7 @@ * @operation Class used for data sync from van-to-server & server-to-van * */ -@CrossOrigin + @RestController @RequestMapping(value = "/dataSync", headers = "Authorization", consumes = "application/json", produces = "application/json") public class MMUDataSyncController { @@ -57,7 +57,7 @@ public class MMUDataSyncController { @Autowired private GetMasterDataFromCentralForVanImpl getMasterDataFromCentralForVanImpl; - @CrossOrigin() + @Operation(summary = "Sync data from van (Mobile Medical Unit) to server") @PostMapping(value = { "/van-to-server" }) public String dataSyncToServer(@RequestBody String requestOBJ, @@ -76,7 +76,7 @@ public String dataSyncToServer(@RequestBody String requestOBJ, return response.toString(); } - @CrossOrigin() + @Operation(summary = "Download data from server to van (Mobile Medical Unit)") @PostMapping(value = { "/server-to-van" }) public String dataDownloadFromServer(@RequestBody SyncDownloadMaster syncDownloadMaster, diff --git a/src/main/java/com/iemr/hwc/controller/diabetesAndHypertensionOutcome/DiabetesHypertensionScreeningController.java b/src/main/java/com/iemr/hwc/controller/diabetesAndHypertensionOutcome/DiabetesHypertensionScreeningController.java index 99e29280..9a5ea7ce 100644 --- a/src/main/java/com/iemr/hwc/controller/diabetesAndHypertensionOutcome/DiabetesHypertensionScreeningController.java +++ b/src/main/java/com/iemr/hwc/controller/diabetesAndHypertensionOutcome/DiabetesHypertensionScreeningController.java @@ -39,7 +39,7 @@ -@CrossOrigin + @RestController @RequestMapping(value = "/screeningOutcome", headers = "Authorization", consumes = "application/json", produces = "application/json") public class DiabetesHypertensionScreeningController { @@ -48,7 +48,7 @@ public class DiabetesHypertensionScreeningController { @Autowired private DiabetesAndHypertensionOutcomeService diabetesAndHypertensionOutcomeService; - @CrossOrigin() + @Operation(summary = "Evaluate hypertension screening outcome") @PostMapping(value = { "/hypertension" }) public String getHypertensionOutcome( @@ -66,7 +66,7 @@ public String getHypertensionOutcome( return response.toString(); } - @CrossOrigin() + @Operation(summary = "Evaluate diabetes screening outcome") @PostMapping(value = { "/diabetes" }) public String getDiabetesOutcome( 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 258e2dae..66c95b13 100644 --- a/src/main/java/com/iemr/hwc/controller/familyPlanning/FamilyPlanningController.java +++ b/src/main/java/com/iemr/hwc/controller/familyPlanning/FamilyPlanningController.java @@ -48,7 +48,7 @@ -@CrossOrigin + @RestController @RequestMapping(value = "/family-planning", headers = "Authorization") public class FamilyPlanningController { @@ -155,7 +155,7 @@ public String saveFamilyPlanningNuseData(@Param(value = "{\r\n" + " \"visitDeta return response.toString(); } - @CrossOrigin + @Operation(summary = "Save family planning data collected by doctor") @PostMapping(value = { "save-family-planning-doctor-data" }) public String saveFamilyPlanningDoctorData(@RequestBody String requestObj, @@ -190,7 +190,7 @@ public String saveFamilyPlanningDoctorData(@RequestBody String requestObj, * @return visit details in JSON format */ - @CrossOrigin() + @Operation(summary = "Get family planning beneficiary visit details") @PostMapping(value = { "/getBenVisitDetails-Nurse-FamilyPlanning" }) @Transactional(rollbackFor = Exception.class) @@ -223,7 +223,7 @@ public String getBenVisitDetailsFrmNurseFamilyPlanning( * @param benRegID and benVisitID * @return vital details in JSON format */ - @CrossOrigin() + @Operation(summary = "Get family planning beneficiary vitals") @RequestMapping(value = { "/getBenVitalDetailsFrmNurseFamilyPlanning" }) public String getBenVitalDetailsFrmNurseFamilyPlanning( @@ -253,7 +253,7 @@ public String getBenVitalDetailsFrmNurseFamilyPlanning( * @param benRegID and benVisitID * @return FamilyPlanning details in JSON format */ - @CrossOrigin() + @Operation(summary = "Get family planning beneficiary details") @PostMapping(value = { "/getBenFPDetailsFrmNurseFamilyPlanning" }) @Transactional(rollbackFor = Exception.class) @@ -281,7 +281,7 @@ public String getBenFPDetailsFrmNurseFamilyPlanning( * @param comingRequest * @return doctor details in JSON format */ - @CrossOrigin() + @Operation(summary = "Get family planning beneficiary case record") @PostMapping(value = { "/getBenCaseRecordFromDoctor" }) @Transactional(rollbackFor = Exception.class) @@ -310,7 +310,7 @@ public String getBenCaseRecordFromDoctor( return response.toString(); } - @CrossOrigin + @Operation(summary = "Update family planning data") @PostMapping(value = { "/update/FamilyPlanningScreen" }) public String updateFamilyPlanningNurse(@RequestBody String requestObj) { @@ -339,7 +339,7 @@ public String updateFamilyPlanningNurse(@RequestBody String requestObj) { return response.toString(); } - @CrossOrigin + @Operation(summary = "Update family planning beneficiary vitals") @PostMapping(value = { "/update/vitalScreen" }) public String updateVitalNurseFamilyPlanning(@RequestBody String requestObj) { @@ -374,7 +374,7 @@ public String updateVitalNurseFamilyPlanning(@RequestBody String requestObj) { * @return success or failure response * @objective Update FamilyPlanning doctor data for the doctor next visit */ - @CrossOrigin + @Operation(summary = "Update family planning data") @PostMapping(value = { "/update/doctorData" }) public String updateFamilyPlanningDoctorData(@RequestBody String requestObj, diff --git a/src/main/java/com/iemr/hwc/controller/foetalmonitor/FoetalMonitorController.java b/src/main/java/com/iemr/hwc/controller/foetalmonitor/FoetalMonitorController.java index fc4a0247..ceba6e13 100644 --- a/src/main/java/com/iemr/hwc/controller/foetalmonitor/FoetalMonitorController.java +++ b/src/main/java/com/iemr/hwc/controller/foetalmonitor/FoetalMonitorController.java @@ -50,7 +50,7 @@ -@CrossOrigin + @RestController @RequestMapping(value = "/foetalMonitor", headers = "Authorization", consumes = "application/json", produces = "application/json") public class FoetalMonitorController { @@ -65,7 +65,7 @@ public class FoetalMonitorController { * @return success or failure response */ - @CrossOrigin + @Operation(summary = "Send the mother data and prescribed test details to foetal monitor") @PostMapping(value = "/sendMotherTestDetailsToFoetalMonitor", headers = "Authorization") public ResponseEntity sendANCMotherTestDetailsToFoetalMonitor( @@ -99,7 +99,7 @@ public ResponseEntity sendANCMotherTestDetailsToFoetalMonitor( * @param authorization * @return */ - @CrossOrigin + @Operation(summary = "Foetal monitor device status check") @PostMapping(value = "/registerMother", headers = "Authorization") public String saveMother(@RequestBody String requestObj, @@ -122,7 +122,7 @@ public String saveMother(@RequestBody String requestObj, * @return * @throws Exception */ - @CrossOrigin + @Operation(summary = "Get the foetal monitor details") @GetMapping(value = "/fetch/foetalMonitorDetails/{benFlowID}", headers = "Authorization") public String getFoetalMonitorDetails(@Param("{\"benFlowID\":\"Long\"}") @PathVariable("benFlowID") Long benFlowID) { @@ -143,7 +143,7 @@ public String getFoetalMonitorDetails(@Param("{\"benFlowID\":\"Long\"}") @PathVa return output.toString(); } - @CrossOrigin + @Operation(summary = "Fetch foetal monitor pdf report (Base64 format)") @PostMapping(value = "/fetch/reportGraphBase64", headers = "Authorization") public ResponseEntity getFoetalMonitorDetails( @@ -177,7 +177,7 @@ public ResponseEntity getFoetalMonitorDetails( * @return * @throws IOException */ - @CrossOrigin + @Operation(summary = "Update foetal monitor data") @PostMapping(value = "/update/foetalMonitorData") public ResponseEntity updateFoetalMonitorData( 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 3675a844..292579ba 100644 --- a/src/main/java/com/iemr/hwc/controller/generalOPD/GeneralOPDController.java +++ b/src/main/java/com/iemr/hwc/controller/generalOPD/GeneralOPDController.java @@ -53,7 +53,7 @@ */ @RestController -@CrossOrigin + @RequestMapping(value = "/generalOPD", headers = "Authorization", consumes = "application/json", produces = "application/json") public class GeneralOPDController { private Logger logger = LoggerFactory.getLogger(this.getClass().getSimpleName()); @@ -71,7 +71,7 @@ public void setGeneralOPDServiceImpl(GeneralOPDServiceImpl generalOPDServiceImpl * @return success or failure response * @throws Exception */ - @CrossOrigin + @Operation(summary = "Save general OPD data collected by nurse") @PostMapping(value = { "/save/nurseData" }) public String saveBenGenOPDNurseData(@RequestBody String requestObj, @@ -108,7 +108,7 @@ public String saveBenGenOPDNurseData(@RequestBody String requestObj, * @param requestObj * @return success or failure response */ - @CrossOrigin + @Operation(summary = "Save general OPD data collected by doctor") @PostMapping(value = { "/save/doctorData" }) public String saveBenGenOPDDoctorData(@RequestBody String requestObj, @@ -145,7 +145,7 @@ public String saveBenGenOPDDoctorData(@RequestBody String requestObj, * @param comingRequest * @return visit details in JSON format */ - @CrossOrigin() + @Operation(summary = "Get general OPD beneficiary visit details") @PostMapping(value = { "/getBenVisitDetailsFrmNurseGOPD" }) @Transactional(rollbackFor = Exception.class) @@ -179,7 +179,7 @@ public String getBenVisitDetailsFrmNurseGOPD( * @param comingRequest * @return history details in JSON format */ - @CrossOrigin() + @Operation(summary = "Get general OPD beneficiary history") @PostMapping(value = { "/getBenHistoryDetails" }) @@ -212,7 +212,7 @@ public String getBenHistoryDetails( * @param comingRequest * @return vital details in JSON format */ - @CrossOrigin() + @Operation(summary = "Get general OPD beneficiary vitals") @PostMapping(value = { "/getBenVitalDetailsFrmNurse" }) public String getBenVitalDetailsFrmNurse( @@ -245,7 +245,7 @@ public String getBenVitalDetailsFrmNurse( * @param comingRequest * @return examination details in JSON format */ - @CrossOrigin() + @Operation(summary = "Get general OPD beneficiary examination details") @PostMapping(value = { "/getBenExaminationDetails" }) @@ -278,7 +278,7 @@ public String getBenExaminationDetails( * @param comingRequest * @return doctor details in JSON format */ - @CrossOrigin() + @Operation(summary = "Get general OPD beneficiary case record and referral") @PostMapping(value = { "/getBenCaseRecordFromDoctorGeneralOPD" }) @Transactional(rollbackFor = Exception.class) @@ -315,7 +315,7 @@ public String getBenCaseRecordFromDoctorGeneralOPD( * entered by Doctor */ - @CrossOrigin + @Operation(summary = "Update beneficiary history") @PostMapping(value = { "/update/historyScreen" }) public String updateHistoryNurse(@RequestBody String requestObj) { @@ -352,7 +352,7 @@ public String updateHistoryNurse(@RequestBody String requestObj) { * entered by Doctor */ - @CrossOrigin + @Operation(summary = "Update general OPD beneficiary vitals") @PostMapping(value = { "/update/vitalScreen" }) public String updateVitalNurse(@RequestBody String requestObj) { @@ -389,7 +389,7 @@ public String updateVitalNurse(@RequestBody String requestObj) { * details entered by Doctor */ - @CrossOrigin + @Operation(summary = "Update general OPD beneficiary examination data") @PostMapping(value = { "/update/examinationScreen" }) public String updateGeneralOPDExaminationNurse(@RequestBody String requestObj) { @@ -424,7 +424,7 @@ public String updateGeneralOPDExaminationNurse(@RequestBody String requestObj) { * @return success or failure response * @objective Replace General OPD doctor data for the doctor next visit */ - @CrossOrigin + @Operation(summary = "Update general OPD beneficiary case record and referral") @PostMapping(value = { "/update/doctorData" }) public String updateGeneralOPDDoctorData(@RequestBody String requestObj, diff --git a/src/main/java/com/iemr/hwc/controller/labtechnician/LabTechnicianController.java b/src/main/java/com/iemr/hwc/controller/labtechnician/LabTechnicianController.java index 002b2229..008ee998 100644 --- a/src/main/java/com/iemr/hwc/controller/labtechnician/LabTechnicianController.java +++ b/src/main/java/com/iemr/hwc/controller/labtechnician/LabTechnicianController.java @@ -48,7 +48,7 @@ */ @RestController -@CrossOrigin + @RequestMapping(value = "/labTechnician", headers = "Authorization", consumes = "application/json", produces = "application/json") public class LabTechnicianController { @@ -66,7 +66,7 @@ public void setLabTechnicianServiceImpl(LabTechnicianServiceImpl labTechnicianSe * @param JSON requestObj * @return success or failure response */ - @CrossOrigin + @Operation(summary = "Save lab test result") @PostMapping(value = { "/save/LabTestResult" }) public String saveLabTestResult(@RequestBody String requestObj) { @@ -102,7 +102,7 @@ public String saveLabTestResult(@RequestBody String requestObj) { * @param requestOBJ * @return lab tests prescribed by doctor */ - @CrossOrigin + @Operation(summary = "Get beneficiary lab test prescription") @PostMapping(value = { "/get/prescribedProceduresList" }) public String getBeneficiaryPrescribedProcedure(@RequestBody String requestOBJ) { @@ -133,7 +133,7 @@ public String getBeneficiaryPrescribedProcedure(@RequestBody String requestOBJ) } // API for getting lab result based on beneficiaryRegID and visitCode - @CrossOrigin() + @Operation(summary = "Get lab test result for a beneficiary visit") @PostMapping(value = { "/get/labResultForVisitcode" }) public String getLabResultForVisitCode(@RequestBody String requestOBJ) { @@ -161,7 +161,7 @@ public String getLabResultForVisitCode(@RequestBody String requestOBJ) { return response.toString(); } - @CrossOrigin + @Operation(summary = "Get procedure component mapped master data") @PostMapping(value = { "/get/fetchProcCompMapMasterData" }) public String getProcedureComponentMappedMasterData(@RequestBody String requestOBJ) { diff --git a/src/main/java/com/iemr/hwc/controller/location/LocationController.java b/src/main/java/com/iemr/hwc/controller/location/LocationController.java index 1492d7be..6cd88feb 100644 --- a/src/main/java/com/iemr/hwc/controller/location/LocationController.java +++ b/src/main/java/com/iemr/hwc/controller/location/LocationController.java @@ -40,7 +40,7 @@ import io.swagger.v3.oas.annotations.Operation; -@CrossOrigin + @RestController @RequestMapping(value = "/location", headers = "Authorization", consumes = "application/json", produces = "application/json") public class LocationController { @@ -179,7 +179,7 @@ public String getVillageByDistrictID(@PathVariable("districtID") Integer distric * @param comingRequest * @return */ - @CrossOrigin() + @Operation(summary = "Get location details from service point id and provider service map id") @PostMapping(value = "/getLocDetailsBasedOnSpIDAndPsmID", produces = { "application/json" }) public String getLocDetailsBasedOnSpIDAndPsmIDNew(@RequestBody String comingRequest) { diff --git a/src/main/java/com/iemr/hwc/controller/masterVillage/MasterVillageController.java b/src/main/java/com/iemr/hwc/controller/masterVillage/MasterVillageController.java index 6c0a82b3..6a85a859 100644 --- a/src/main/java/com/iemr/hwc/controller/masterVillage/MasterVillageController.java +++ b/src/main/java/com/iemr/hwc/controller/masterVillage/MasterVillageController.java @@ -34,7 +34,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; -@CrossOrigin + @RestController @RequestMapping(value = "/masterVillage", headers = "Authorization", consumes = "application/json", produces = "application/json") public class MasterVillageController { 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 9c3aa291..cb20b786 100644 --- a/src/main/java/com/iemr/hwc/controller/ncdCare/NCDCareController.java +++ b/src/main/java/com/iemr/hwc/controller/ncdCare/NCDCareController.java @@ -52,7 +52,7 @@ * * @Objective Saving NCD Care data for Nurse and Doctor. */ -@CrossOrigin + @RestController @RequestMapping(value = "/NCDCare", headers = "Authorization", consumes = "application/json", produces = "application/json") public class NCDCareController { @@ -67,7 +67,7 @@ public class NCDCareController { * @return success or failure response * @throws Exception */ - @CrossOrigin + @Operation(summary = "Save NCD care data collected by nurse") @PostMapping(value = { "/save/nurseData" }) public String saveBenNCDCareNurseData(@RequestBody String requestObj, @@ -103,7 +103,7 @@ public String saveBenNCDCareNurseData(@RequestBody String requestObj, * @param JSON requestObj * @return success or failure response */ - @CrossOrigin + @Operation(summary = "Save NCD care beneficiary case record and referral") @PostMapping(value = { "/save/doctorData" }) public String saveBenNCDCareDoctorData(@RequestBody String requestObj, @@ -141,7 +141,7 @@ public String saveBenNCDCareDoctorData(@RequestBody String requestObj, * @return visit details in JSON format */ - @CrossOrigin() + () @Operation(summary = "Get NCD care beneficiary visit details") @PostMapping(value = { "/getBenVisitDetailsFrmNurseNCDCare" }) @Transactional(rollbackFor = Exception.class) @@ -175,7 +175,7 @@ public String getBenVisitDetailsFrmNurseNCDCare( * @param comingRequest * @return visit details in JSON format */ - @CrossOrigin() + () @Operation(summary = "Get NCD Care beneficiary history") @PostMapping(value = { "/getBenNCDCareHistoryDetails" }) @@ -209,7 +209,7 @@ public String getBenNCDCareHistoryDetails( * @return visit details in JSON format */ - @CrossOrigin() + () @Operation(summary = "Get NCD Care beneficiary vitals") @PostMapping(value = { "/getBenVitalDetailsFrmNurseNCDCare" }) public String getBenVitalDetailsFrmNurseNCDCare( @@ -242,7 +242,7 @@ public String getBenVitalDetailsFrmNurseNCDCare( * @param comingRequest * @return visit details in JSON format */ - @CrossOrigin() + () @Operation(summary = "Get NCD care beneficiary case record and referral") @PostMapping(value = { "/getBenCaseRecordFromDoctorNCDCare" }) @Transactional(rollbackFor = Exception.class) @@ -279,7 +279,7 @@ public String getBenCaseRecordFromDoctorNCDCare( * entered by Doctor */ - @CrossOrigin + @Operation(summary = "Update NCD care beneficiary history") @PostMapping(value = { "/update/historyScreen" }) public String updateHistoryNurse(@RequestBody String requestObj) { @@ -318,7 +318,7 @@ public String updateHistoryNurse(@RequestBody String requestObj) { * entered by Doctor */ - @CrossOrigin + @Operation(summary = "Update NCD care beneficiary vitals") @PostMapping(value = { "/update/vitalScreen" }) public String updateVitalNurse(@RequestBody String requestObj) { @@ -353,7 +353,7 @@ public String updateVitalNurse(@RequestBody String requestObj) { * @return success or failure response * @objective Replace NCD Care doctor data for the doctor next visit */ - @CrossOrigin + @Operation(summary = "Update NCD care beneficiary case record and referral") @PostMapping(value = { "/update/doctorData" }) public String updateNCDCareDoctorData(@RequestBody String requestObj, 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 a75742c2..73bbaa0e 100644 --- a/src/main/java/com/iemr/hwc/controller/ncdscreening/NCDScreeningController.java +++ b/src/main/java/com/iemr/hwc/controller/ncdscreening/NCDScreeningController.java @@ -56,7 +56,7 @@ * @Objective Saving NCD Screening nurse data. * */ -@CrossOrigin + @RestController @RequestMapping(value = "/NCD", headers = "Authorization", consumes = "application/json", produces = "application/json") public class NCDScreeningController { @@ -74,7 +74,7 @@ public class NCDScreeningController { * @return success or failure response * @throws Exception */ - @CrossOrigin + @Operation(summary = "Save NCD screening beneficiary data collected by nurse") @PostMapping(value = { "/save/nurseData" }) @@ -106,7 +106,7 @@ public String saveBeneficiaryNCDScreeningDetails(@RequestBody String requestObj, return response.toString(); } - @CrossOrigin + @Operation(summary = "Save NCD screening beneficiary data collected by doctor") @PostMapping(value = { "/save/doctorData" }) public String saveBenNCDScreeningDoctorData(@RequestBody String requestObj, @@ -143,7 +143,7 @@ public String saveBenNCDScreeningDoctorData(@RequestBody String requestObj, * @param benRegID and benVisitID * @return NCD Screening nurse data in JSON format */ - @CrossOrigin() + @Operation(summary = "Get NCD screening beneficiary visit details") @PostMapping(value = { "/get/nurseData" }) public String getNCDScreenigDetails( @@ -170,7 +170,7 @@ public String getNCDScreenigDetails( return response.toString(); } - @CrossOrigin() + @Operation(summary = "Get NCD screening visit count for beneficiary register id") @GetMapping(value = { "/getNcdScreeningVisitCount/{beneficiaryRegID}" }) public String getNcdScreeningVisitCount(@PathVariable("beneficiaryRegID") Long beneficiaryRegID) { @@ -198,7 +198,7 @@ public String getNcdScreeningVisitCount(@PathVariable("beneficiaryRegID") Long b * @param comingRequest * @return visit details in JSON format */ - @CrossOrigin() + @Operation(summary = "Get NCD screening beneficiary case record and referral") @PostMapping(value = { "/getBenCaseRecordFromDoctorNCDScreening" }) @Transactional(rollbackFor = Exception.class) @@ -227,7 +227,7 @@ public String getBenCaseRecordFromDoctorNCDCare( return response.toString(); } - @CrossOrigin() + @Operation(summary = "Get NCD screening beneficiary visit details") @PostMapping(value = { "/getBenVisitDetailsFrmNurseNCDScreening" }) @Transactional(rollbackFor = Exception.class) @@ -256,7 +256,7 @@ public String getBenVisitDetailsFrmNurseGOPD( return response.toString(); } - @CrossOrigin() + @Operation(summary = "Get NCD screening beneficiary general OPD history") @PostMapping(value = { "/getBenHistoryDetails" }) @@ -284,7 +284,7 @@ public String getBenHistoryDetails( return response.toString(); } - @CrossOrigin() + @Operation(summary = "Get NCD screening beneficiary vitals from general OPD nurse") @PostMapping(value = { "/getBenVitalDetailsFrmNurse" }) public String getBenVitalDetailsFrmNurse( @@ -312,7 +312,7 @@ public String getBenVitalDetailsFrmNurse( return response.toString(); } - @CrossOrigin() + @Operation(summary = "Get NCD screening IDRS details from general OPD nurse") @PostMapping(value = { "/getBenIdrsDetailsFrmNurse" }) public String getBenIdrsDetailsFrmNurse( @@ -341,7 +341,7 @@ public String getBenIdrsDetailsFrmNurse( return response.toString(); } - @CrossOrigin() + @Operation(summary = "Get confirmed NCD diseases") @PostMapping(value = { "/fetchConfirmedScreeningDisease" }) public String fetchConfirmedScreeningDisease( @@ -360,7 +360,7 @@ public String fetchConfirmedScreeningDisease( } // get NCD screening data - dia, htn, oral, breast, cervical - @CrossOrigin() + @Operation(summary = "Get NCD screening beneficiary data - dia, htn, oral, breast, cervical") @PostMapping(value = { "/get/ncd/screening/data" }) public String getNCDScreeningData( @@ -382,7 +382,7 @@ public String getNCDScreeningData( return response.toStringWithSerializeNulls(); } - @CrossOrigin() + @Operation(summary = "Get NCD screening beneficiary CBAC details") @PostMapping(value = { "/getCbacDetails" }) public String getCbacDetails( @@ -410,7 +410,7 @@ public String getCbacDetails( * * NOT using as of now */ - @CrossOrigin + @Operation(summary = "Update NCD screening beneficiary details") @PostMapping(value = { "/update/nurseData" }) public String updateBeneficiaryNCDScreeningDetails(@RequestBody String requestObj) { @@ -445,7 +445,7 @@ public String updateBeneficiaryNCDScreeningDetails(@RequestBody String requestOb /* * Updating the history WDF requirement */ - @CrossOrigin + @Operation(summary = "Update NCD screening beneficiary history") @PostMapping(value = { "/update/historyScreen" }) public String updateHistoryNurse(@RequestBody String requestObj) { @@ -474,7 +474,7 @@ public String updateHistoryNurse(@RequestBody String requestObj) { return response.toString(); } - @CrossOrigin + @Operation(summary = "Update NCD screening beneficiary vitals") @PostMapping(value = { "/update/vitalScreen" }) public String updateVitalNurse(@RequestBody String requestObj) { @@ -503,7 +503,7 @@ public String updateVitalNurse(@RequestBody String requestObj) { return response.toString(); } - @CrossOrigin + @Operation(summary = "Update NCD screening beneficiary history") @PostMapping(value = { "/update/idrsScreen" }) public String updateIDRSScreen(@RequestBody String requestObj) { @@ -532,7 +532,7 @@ public String updateIDRSScreen(@RequestBody String requestObj) { return response.toString(); } - @CrossOrigin + @Operation(summary = "Update NCD screening beneficiary case record and referral") @PostMapping(value = { "/update/doctorData" }) public String updateDoctorData(@RequestBody String requestObj, @@ -560,7 +560,7 @@ public String updateDoctorData(@RequestBody String requestObj, return response.toString(); } - @CrossOrigin + @Operation(summary = "Update NCD screening beneficiary data") @PostMapping(value = { "/update/ncd/screening/data" }) public String updateNCDScreeningData(@RequestBody String requestObj) { 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 ac57dddd..cd6eb114 100644 --- a/src/main/java/com/iemr/hwc/controller/neonatal/NeonatalController.java +++ b/src/main/java/com/iemr/hwc/controller/neonatal/NeonatalController.java @@ -50,7 +50,7 @@ -@CrossOrigin + @RestController @RequestMapping(value = "/neonatal-infant-services", headers = "Authorization", consumes = "application/json", produces = "application/json") public class NeonatalController { @@ -66,7 +66,7 @@ public class NeonatalController { * @return success or failure response with visit code * @throws Exception */ - @CrossOrigin + @Operation(summary = "Save neonatal infant nurse data") @PostMapping(value = { "/save/nurseData" }) public String saveBenNeoNatalAndInfantNurseData(@RequestBody String requestObj, @@ -101,7 +101,7 @@ public String saveBenNeoNatalAndInfantNurseData(@RequestBody String requestObj, return response.toString(); } - @CrossOrigin + @Operation(summary = "Save neonatal infant doctor data") @PostMapping(value = { "save-neo-natal-doctor-data" }) public String saveNNIDoctorData(@RequestBody String requestObj, @@ -135,7 +135,7 @@ public String saveNNIDoctorData(@RequestBody String requestObj, * @param comingRequest * @return visit details in JSON format */ - @CrossOrigin() + @Operation(summary = "Get neonatal infant beneficiary visit details") @PostMapping(value = { "/getBenVisitDetailsFrmNurseNNI" }) @Transactional(rollbackFor = Exception.class) @@ -169,7 +169,7 @@ public String getBenVisitDetailsFrmNurseNNI( * @param comingRequest * @return vital details in JSON format */ - @CrossOrigin() + @Operation(summary = "Get neonatal infant beneficiary vitals") @PostMapping(value = { "/getBenVitalDetailsFrmNurse" }) public String getBenVitalDetailsFrmNurse( @@ -202,7 +202,7 @@ public String getBenVitalDetailsFrmNurse( * @param comingRequest * @return history details in JSON format */ - @CrossOrigin() + @Operation(summary = "Get neonatal infant beneficiary history") @PostMapping(value = { "/getBenHistoryDetails" }) @@ -235,7 +235,7 @@ public String getBenHistoryDetails( * "30022000171431" } * @return immunization service details in JSON format */ - @CrossOrigin() + @Operation(summary = "Get neonatal infant beneficiary immunization service details") @PostMapping(value = { "/getBenImmunizationServiceDetails" }) @@ -268,7 +268,7 @@ public String getBenImmunizationServiceDetails( * @param comingRequest * @return doctor details in JSON format */ - @CrossOrigin() + @Operation(summary = "Get neonatal infant beneficiary case record and referral") @PostMapping(value = { "/getBenCaseRecordFromDoctor" }) @Transactional(rollbackFor = Exception.class) @@ -297,7 +297,7 @@ public String getBenCaseRecordFromDoctor( return response.toString(); } - @CrossOrigin + @Operation(summary = "Update neonatal infant beneficiary vitals") @PostMapping(value = { "/update/vitalScreen" }) public String updateVitalNurseNNI(@RequestBody String requestObj) { @@ -326,7 +326,7 @@ public String updateVitalNurseNNI(@RequestBody String requestObj) { return response.toString(); } - @CrossOrigin + @Operation(summary = "Update neonatal infant birth and immunization history") @PostMapping(value = { "/update/BirthAndImmunizationHistoryScreen" }) public String updateBirthAndImmunizationHistoryNurse(@RequestBody String requestObj) { @@ -355,7 +355,7 @@ public String updateBirthAndImmunizationHistoryNurse(@RequestBody String request return response.toString(); } - @CrossOrigin + @Operation(summary = "Update neonatal infant immunization services") @PostMapping(value = { "/update/ImmunizationServicesScreen" }) public String updateImmunizationServicesNurse(@RequestBody String requestObj) { @@ -384,7 +384,7 @@ public String updateImmunizationServicesNurse(@RequestBody String requestObj) { return response.toString(); } - @CrossOrigin + @Operation(summary = "Update neonatal infant data collected by doctor") @PostMapping(value = { "/update/doctorData" }) public String updateNNIDoctorData(@RequestBody String requestObj, diff --git a/src/main/java/com/iemr/hwc/controller/patientApp/master/PatientAppCommonMasterController.java b/src/main/java/com/iemr/hwc/controller/patientApp/master/PatientAppCommonMasterController.java index 773e6869..1ca2b227 100644 --- a/src/main/java/com/iemr/hwc/controller/patientApp/master/PatientAppCommonMasterController.java +++ b/src/main/java/com/iemr/hwc/controller/patientApp/master/PatientAppCommonMasterController.java @@ -40,7 +40,7 @@ import io.swagger.v3.oas.annotations.Operation; import jakarta.ws.rs.core.MediaType; -@CrossOrigin + @RestController @RequestMapping(value = "/master", headers = "Authorization", consumes = "application/json", produces = "application/json") @@ -84,7 +84,7 @@ public String patientAppCovidMasterData(@PathVariable("visitCategoryID") Integer return response.toString(); } - @CrossOrigin + @Operation(summary = "Save COVID data in patient app") @PostMapping(value = { "/save/covidScreeningDataPatientApp" }) public String saveBenCovidDoctorDataPatientApp(@RequestBody String requestObj, @@ -104,7 +104,7 @@ public String saveBenCovidDoctorDataPatientApp(@RequestBody String requestObj, return response.toString(); } - @CrossOrigin + @Operation(summary = "Save chief-complaints data in patient app") @PostMapping(value = { "/save/chiefComplaintsDataPatientApp" }) public String saveBenChiefComplaintsDataPatientApp(@RequestBody String requestObj, @@ -124,7 +124,7 @@ public String saveBenChiefComplaintsDataPatientApp(@RequestBody String requestOb return response.toString(); } - @CrossOrigin + @Operation(summary = "Save tele-consultation slot data in patient app") @PostMapping(value = { "/save/tcSlotDetailsDataPatientApp" }) public String saveTCSlotDataPatientApp(@RequestBody String requestObj, @@ -157,7 +157,7 @@ public String patientAppMasterData(@PathVariable("stateID") Integer stateID) { return response.toString(); } - @CrossOrigin + @Operation(summary = "Get patient episode data for specialist in patient app") @PostMapping(value = { "/get/getPatientEpisodeData" }) public String getPatientEpisodeDataMobileApp(@RequestBody String requestObj, @@ -179,7 +179,7 @@ public String getPatientEpisodeDataMobileApp(@RequestBody String requestObj, return response.toString(); } - @CrossOrigin + @Operation(summary = "Get patient booked slot data in patient app") @PostMapping(value = { "/get/getPatientBookedSlotDetails" }) public String getPatientBookedSlotDetails(@RequestBody String requestObj, @@ -201,7 +201,7 @@ public String getPatientBookedSlotDetails(@RequestBody String requestObj, return response.toString(); } - @CrossOrigin + @Operation(summary = "Save specialist diagnosis data in patient app") @PostMapping(value = { "/save/saveSpecialistDiagnosisData" }) public String saveSpecialistDiagnosisData(@RequestBody String requestObj, @@ -223,7 +223,7 @@ public String saveSpecialistDiagnosisData(@RequestBody String requestObj, return response.toString(); } - @CrossOrigin + @Operation(summary = "Get specialist diagnosis data in patient app") @PostMapping(value = { "/save/getSpecialistDiagnosisData" }) public String getSpecialistDiagnosisData(@RequestBody String requestObj, @@ -245,7 +245,7 @@ public String getSpecialistDiagnosisData(@RequestBody String requestObj, return response.toString(); } - @CrossOrigin + @Operation(summary = "Get last 3 episode data of the patient in patient app") @PostMapping(value = { "/get/getPatientsEpisodes" }) public String getPatientsLast_3_Episode(@RequestBody String requestObj, 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 00f809e4..6dbb4c3b 100644 --- a/src/main/java/com/iemr/hwc/controller/pnc/PostnatalCareController.java +++ b/src/main/java/com/iemr/hwc/controller/pnc/PostnatalCareController.java @@ -51,7 +51,7 @@ * @Objective Saving PNC nurse and doctor data * */ -@CrossOrigin + @RestController @RequestMapping(value = "/PNC", headers = "Authorization", consumes = "application/json", produces = "application/json") public class PostnatalCareController { @@ -70,7 +70,7 @@ public void setPncServiceImpl(PNCServiceImpl pncServiceImpl) { * @throws Exception */ - @CrossOrigin + @Operation(summary = "Save PNC nurse data") @PostMapping(value = { "/save/nurseData" }) public String saveBenPNCNurseData(@RequestBody String requestObj, @@ -108,7 +108,7 @@ public String saveBenPNCNurseData(@RequestBody String requestObj, * @return success or failure response */ - @CrossOrigin + @Operation(summary = "Save PNC doctor data") @PostMapping(value = { "/save/doctorData" }) public String saveBenPNCDoctorData(@RequestBody String requestObj, @@ -144,7 +144,7 @@ public String saveBenPNCDoctorData(@RequestBody String requestObj, * @param comingRequest * @return visit details in JSON format */ - @CrossOrigin() + () @Operation(summary = "Get PNC beneficiary visit details from nurse") @PostMapping(value = { "/getBenVisitDetailsFrmNursePNC" }) @Transactional(rollbackFor = Exception.class) @@ -178,7 +178,7 @@ public String getBenVisitDetailsFrmNursePNC( * @param comingRequest * @return PNC Care data in JSON format */ - @CrossOrigin() + () @Operation(summary = "Get PNC beneficiary details from nurse") @PostMapping(value = { "/getBenPNCDetailsFrmNursePNC" }) @Transactional(rollbackFor = Exception.class) @@ -215,7 +215,7 @@ public String getBenPNCDetailsFrmNursePNC( * @param comingRequest * @return history data in JSON format */ - @CrossOrigin() + () @Operation(summary = "Get PNC bneficiary history from nurse") @PostMapping(value = { "/getBenHistoryDetails" }) @@ -248,7 +248,7 @@ public String getBenHistoryDetails( * @param comingRequest * @return vital data in JSON format */ - @CrossOrigin() + () @Operation(summary = "Get PNC beneficiary vitals from nurse") @PostMapping(value = { "/getBenVitalDetailsFrmNurse" }) public String getBenVitalDetailsFrmNurse( @@ -281,7 +281,7 @@ public String getBenVitalDetailsFrmNurse( * @param comingRequest * @return examination data in JSON format */ - @CrossOrigin() + () @Operation(summary = "Get PNC beneficiary examination details from nurse") @PostMapping(value = { "/getBenExaminationDetailsPNC" }) @@ -314,7 +314,7 @@ public String getBenExaminationDetailsPNC( * @param comingRequest * @return doctor data in JSON format */ - @CrossOrigin() + () @Operation(summary = "Get PNC beneficiary case record") @PostMapping(value = { "/getBenCaseRecordFromDoctorPNC" }) @Transactional(rollbackFor = Exception.class) @@ -351,7 +351,7 @@ public String getBenCaseRecordFromDoctorPNC( * Doctor */ - @CrossOrigin + @Operation(summary = "Update PNC doctor data") @PostMapping(value = { "/update/PNCScreen" }) public String updatePNCCareNurse(@RequestBody String requestObj) { @@ -388,7 +388,7 @@ public String updatePNCCareNurse(@RequestBody String requestObj) { * by Doctor */ - @CrossOrigin + @Operation(summary = "Update PNC beneficiary history") @PostMapping(value = { "/update/historyScreen" }) public String updateHistoryNurse(@RequestBody String requestObj) { @@ -425,7 +425,7 @@ public String updateHistoryNurse(@RequestBody String requestObj) { * by Doctor */ - @CrossOrigin + @Operation(summary = "Update PNC beneficiary vitals") @PostMapping(value = { "/update/vitalScreen" }) public String updateVitalNurse(@RequestBody String requestObj) { @@ -462,7 +462,7 @@ public String updateVitalNurse(@RequestBody String requestObj) { * entered by Doctor */ - @CrossOrigin + @Operation(summary = "Update PNC examination data") @PostMapping(value = { "/update/examinationScreen" }) public String updateGeneralOPDExaminationNurse(@RequestBody String requestObj) { @@ -491,7 +491,7 @@ public String updateGeneralOPDExaminationNurse(@RequestBody String requestObj) { return response.toString(); } - @CrossOrigin + @Operation(summary = "Update PNC doctor data") @PostMapping(value = { "/update/doctorData" }) public String updatePNCDoctorData(@RequestBody String requestObj, diff --git a/src/main/java/com/iemr/hwc/controller/quickBlox/QuickbloxController.java b/src/main/java/com/iemr/hwc/controller/quickBlox/QuickbloxController.java index 21d7036f..4398e88f 100644 --- a/src/main/java/com/iemr/hwc/controller/quickBlox/QuickbloxController.java +++ b/src/main/java/com/iemr/hwc/controller/quickBlox/QuickbloxController.java @@ -36,7 +36,7 @@ import io.swagger.v3.oas.annotations.Operation; -@CrossOrigin + @RestController @RequestMapping(value = "/quickblox", headers = "Authorization", consumes = "application/json", produces = "application/json") @@ -45,7 +45,7 @@ public class QuickbloxController { @Autowired private QuickbloxService quickbloxService; - @CrossOrigin + @Operation(summary = "Get quickblox id") @PostMapping(value = { "/getquickbloxIds" }) public String getquickbloxIds(@RequestBody String requestObj, 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 d198c6fb..bc38a514 100644 --- a/src/main/java/com/iemr/hwc/controller/quickconsult/QuickConsultController.java +++ b/src/main/java/com/iemr/hwc/controller/quickconsult/QuickConsultController.java @@ -53,7 +53,7 @@ * @Objective Saving general OPD quick consult data for Nurse and Doctor both. * */ -@CrossOrigin + @RestController @RequestMapping(value = "/genOPD-QC-quickConsult", headers = "Authorization", consumes = "application/json", produces = "application/json") public class QuickConsultController { @@ -75,7 +75,7 @@ public void setQuickConsultationServiceImpl(QuickConsultationServiceImpl quickCo * Beneficiary Vital and Anthropometry Detail Object and pushed to * Database table */ - @CrossOrigin + @Operation(summary = "Save quick consult nurse data") @PostMapping(value = { "/save/nurseData" }) public String saveBenQuickConsultDataNurse(@RequestBody String requestObj, @@ -112,7 +112,7 @@ public String saveBenQuickConsultDataNurse(@RequestBody String requestObj, * @objective Save beneficiary data for doctor quick consult - QC. */ - @CrossOrigin + @Operation(summary = "Save quick consult details for doctor") @PostMapping(value = { "/save/doctorData" }) public String saveQuickConsultationDetail( @@ -158,7 +158,7 @@ public String saveQuickConsultationDetail( * @return visit details in JSON format */ - @CrossOrigin() + () @Operation(summary = "Get quick consult beneficiary visit details") @PostMapping(value = { "/getBenDataFrmNurseToDocVisitDetailsScreen" }) public String getBenDataFrmNurseScrnToDocScrnVisitDetails( @@ -191,7 +191,7 @@ public String getBenDataFrmNurseScrnToDocScrnVisitDetails( * @return visit details in JSON format */ - @CrossOrigin() + () @Operation(summary = "Get quick consult beneficiary vital details") @PostMapping(value = { "/getBenVitalDetailsFrmNurse" }) public String getBenVitalDetailsFrmNurse( @@ -224,7 +224,7 @@ public String getBenVitalDetailsFrmNurse( * @param benRegID and benVisitID * @return visit details in JSON format */ - @CrossOrigin() + () @Operation(summary = "Get quick consult beneficiary case record") @PostMapping(value = { "/getBenCaseRecordFromDoctorQuickConsult" }) @Transactional(rollbackFor = Exception.class) @@ -261,7 +261,7 @@ public String getBenCaseRecordFromDoctorQuickConsult( * */ - @CrossOrigin + @Operation(summary = "Update quick consult doctor data") @PostMapping(value = { "/update/doctorData" }) public String updateGeneralOPDQCDoctorData(@RequestBody String requestObj, diff --git a/src/main/java/com/iemr/hwc/controller/registrar/main/RegistrarController.java b/src/main/java/com/iemr/hwc/controller/registrar/main/RegistrarController.java index d066dc9a..27cc9ccb 100644 --- a/src/main/java/com/iemr/hwc/controller/registrar/main/RegistrarController.java +++ b/src/main/java/com/iemr/hwc/controller/registrar/main/RegistrarController.java @@ -55,7 +55,7 @@ -@CrossOrigin + @RestController @RequestMapping(value = "/registrar", headers = "Authorization", consumes = "application/json", produces = "application/json") /** @@ -86,7 +86,7 @@ public void setNurseServiceImpl(NurseServiceImpl nurseServiceImpl) { } // Registrar Work List API ..... - @CrossOrigin() + @Operation(summary = "Get registrar worklist data") @PostMapping(value = { "/registrarWorkListData" }) public String getRegistrarWorkList(@Param(value = "{\"spID\": \"Integer\"}") @RequestBody String comingRequest) @@ -106,7 +106,7 @@ public String getRegistrarWorkList(@Param(value = "{\"spID\": \"Integer\"}") @Re } // Registrar Quick search ..... - @CrossOrigin() + @Operation(summary = "Search for beneficiary based on beneficiary id") @PostMapping(value = { "/quickSearch" }) public String quickSearchBeneficiary( @@ -126,7 +126,7 @@ public String quickSearchBeneficiary( } // Registrar Advance search ..... - @CrossOrigin() + @Operation(summary = "Search for beneficiary based on provided data") @PostMapping(value = { "/advanceSearch" }) public String advanceSearch( @@ -149,7 +149,7 @@ public String advanceSearch( } // API for left side ben data - @CrossOrigin() + @Operation(summary = "Get beneficiary details based on beneficiary register id") @PostMapping(value = { "/get/benDetailsByRegID" }) public String getBenDetailsByRegID( @@ -180,7 +180,7 @@ public String getBenDetailsByRegID( return response.toString(); } - @CrossOrigin() + @Operation(summary = "Get beneficiary details") @PostMapping(value = { "/get/beneficiaryDetails" }) public String getBeneficiaryDetails( @@ -216,7 +216,7 @@ public String getBeneficiaryDetails( return response.toString(); } - @CrossOrigin() + @Operation(summary = "Get beneficiary image") @PostMapping(value = { "/get/beneficiaryImage" }) public String getBeneficiaryImage( @@ -244,7 +244,7 @@ public String getBeneficiaryImage( } // beneficiary quick search new integrated with common and identity - @CrossOrigin() + @Operation(summary = "Search beneficiary based on beneficiary id or beneficiary phone number") @PostMapping(value = { "/quickSearchNew" }) public String quickSearchNew(@RequestBody String requestObj, @@ -268,7 +268,7 @@ public String quickSearchNew(@RequestBody String requestObj, } // beneficiary Advance search new integrated with common and identity - @CrossOrigin() + @Operation(summary = "Beneficiary advance search integrated with common and identity API") @PostMapping(value = { "/advanceSearchNew" }) public String advanceSearchNew(@RequestBody String requestObj, @@ -291,7 +291,7 @@ public String advanceSearchNew(@RequestBody String requestObj, } - @CrossOrigin() + @Operation(summary = "Beneficiary advance search") @PostMapping(value = { "/benAdvanceSearchNew" }) public String benAdvanceSearchNew(@RequestBody String requestObj, @@ -315,7 +315,7 @@ public String benAdvanceSearchNew(@RequestBody String requestObj, } // Get Beneficiary Details for left side panel of given beneficiaryRegID new - @CrossOrigin() + @Operation(summary = "Get beneficiary details for side panel") @PostMapping(value = { "/get/benDetailsByRegIDForLeftPanelNew" }) public String getBenDetailsForLeftSidePanelByRegID( @@ -348,7 +348,7 @@ public String getBenDetailsForLeftSidePanelByRegID( } // new api for ben image - @CrossOrigin() + @Operation(summary = "Get beneficiary image") @PostMapping(value = { "/getBenImage" }) public String getBenImage(@RequestBody String requestObj, @@ -366,7 +366,7 @@ public String getBenImage(@RequestBody String requestObj, } // Registrar Beneficiary Registration API ..... - @CrossOrigin() + @Operation(summary = "Register a new beneficiary") @PostMapping(value = { "/registrarBeneficaryRegistration" }) public String createBeneficiary( @@ -429,7 +429,7 @@ public String createBeneficiary( } // beneficiary registration with common and identity new - @CrossOrigin() + @Operation(summary = "Register a new beneficiary new API") @PostMapping(value = { "/registrarBeneficaryRegistrationNew" }) public String registrarBeneficaryRegistrationNew(@RequestBody String comingReq, @@ -448,7 +448,7 @@ public String registrarBeneficaryRegistrationNew(@RequestBody String comingReq, } // Registrar Beneficiary Registration API ..... - @CrossOrigin() + @Operation(summary = "Update registered beneficiary data") @PostMapping(value = { "/update/BeneficiaryDetails" }) public String updateBeneficiary( diff --git a/src/main/java/com/iemr/hwc/controller/registrar/master/RegistrarMasterController.java b/src/main/java/com/iemr/hwc/controller/registrar/master/RegistrarMasterController.java index 725ae797..94b64cf8 100644 --- a/src/main/java/com/iemr/hwc/controller/registrar/master/RegistrarMasterController.java +++ b/src/main/java/com/iemr/hwc/controller/registrar/master/RegistrarMasterController.java @@ -41,7 +41,7 @@ -@CrossOrigin + @RestController @RequestMapping(value = "/registrar", headers = "Authorization", consumes = "application/json", produces = "application/json") /** Objective: Get Registration related master Data */ @@ -55,7 +55,7 @@ public void setRegistrarServiceMasterDataImpl(RegistrarServiceMasterDataImpl reg this.registrarServiceMasterDataImpl = registrarServiceMasterDataImpl; } - @CrossOrigin() + @Operation(summary = "Get master data for registrar") @PostMapping(value = { "/registrarMasterData" }) public String masterDataForRegistration( diff --git a/src/main/java/com/iemr/hwc/controller/report/CRMReportController.java b/src/main/java/com/iemr/hwc/controller/report/CRMReportController.java index 3d024b24..03e0d93e 100644 --- a/src/main/java/com/iemr/hwc/controller/report/CRMReportController.java +++ b/src/main/java/com/iemr/hwc/controller/report/CRMReportController.java @@ -51,7 +51,7 @@ public class CRMReportController { @Autowired private CRMReportService cRMReportService; - @CrossOrigin() + @Operation(summary = "Fetch chief complaints report") @PostMapping(value = "/chiefcomplaintreport", headers = "Authorization", produces = { "application/json" }) public String chiefcomplaintreport(@RequestBody ReportInput input) { @@ -72,7 +72,7 @@ public String chiefcomplaintreport(@RequestBody ReportInput input) { return response.toString(); } - @CrossOrigin() + @Operation(summary = "Fetch consultation report") @PostMapping(value = "/ConsultationReport", headers = "Authorization", produces = { "application/json" }) public String getConsultationReport(@RequestBody ReportInput input) { @@ -93,7 +93,7 @@ public String getConsultationReport(@RequestBody ReportInput input) { return response.toStringWithSerialization(); } - @CrossOrigin() + @Operation(summary = "Fetch total consultation report") @PostMapping(value = "/TotalConsultationReport", headers = "Authorization", produces = { "application/json" }) public String getTotalConsultationReport(@RequestBody ReportInput input) { @@ -114,7 +114,7 @@ public String getTotalConsultationReport(@RequestBody ReportInput input) { return response.toString(); } - @CrossOrigin() + @Operation(summary = "Fetch monthly report") @PostMapping(value = "/MonthlyReport", headers = "Authorization", produces = { "application/json" }) @@ -136,7 +136,7 @@ public String getMonthlyReport(@RequestBody ReportInput input) { return response.toString(); } - @CrossOrigin() + @Operation(summary = "Fetch daily report") @PostMapping(value = "/DailyReport", headers = "Authorization", produces = { "application/json" }) diff --git a/src/main/java/com/iemr/hwc/controller/snomedct/SnomedController.java b/src/main/java/com/iemr/hwc/controller/snomedct/SnomedController.java index b8f6736d..7a64d8ea 100644 --- a/src/main/java/com/iemr/hwc/controller/snomedct/SnomedController.java +++ b/src/main/java/com/iemr/hwc/controller/snomedct/SnomedController.java @@ -55,7 +55,7 @@ public void setSnomedService(SnomedService snomedService) { this.snomedService = snomedService; } - @CrossOrigin + @Operation(summary = "Retrieve Snomed clinical term") @PostMapping(value = "/getSnomedCTRecord", headers = "Authorization") public String getSnomedCTRecord(@Param(value = "{\"term\":\"String\"}") @RequestBody String request) { @@ -81,7 +81,7 @@ public String getSnomedCTRecord(@Param(value = "{\"term\":\"String\"}") @Request return output.toString(); } - @CrossOrigin + @Operation(summary = "Retrieve Snomed clinical term list") @PostMapping(value = "/getSnomedCTRecordList", headers = "Authorization") public String getSnomedCTRecordList(@Param(value = "{\"term\":\"String\"}") @RequestBody String request) { diff --git a/src/main/java/com/iemr/hwc/controller/spoke/VanSpokeController.java b/src/main/java/com/iemr/hwc/controller/spoke/VanSpokeController.java index fb60ea96..7f482d67 100644 --- a/src/main/java/com/iemr/hwc/controller/spoke/VanSpokeController.java +++ b/src/main/java/com/iemr/hwc/controller/spoke/VanSpokeController.java @@ -53,7 +53,7 @@ public void setIemrMmuLoginServiceImpl(IemrMmuLoginServiceImpl iemrMmuLoginServi this.iemrMmuLoginServiceImpl = iemrMmuLoginServiceImpl; } - @CrossOrigin() + @Operation(summary = "Get user service point van details") @PostMapping(value = "/getUserServicePointVanDetails", produces = { "application/json" }) @@ -74,7 +74,7 @@ public String getUserServicePointVanDetails(@RequestBody String comingRequest) { return response.toString(); } - @CrossOrigin() + @Operation(summary = "Get service point villages") @PostMapping(value = "/getServicepointVillages", produces = { "application/json" }) @@ -96,7 +96,7 @@ public String getServicepointVillages(@RequestBody String comingRequest) { return response.toString(); } - @CrossOrigin() + @Operation(summary = "Get user van details") @PostMapping(value = "/getUserVanSpDetails", produces = { "application/json" }) public String getUserVanSpDetails(@RequestBody String comingRequest) { @@ -121,7 +121,7 @@ public String getUserVanSpDetails(@RequestBody String comingRequest) { return response.toString(); } - @CrossOrigin() + @Operation(summary = "Get user spoke details") @GetMapping(value = "/getUserSpokeDetails/{psmId}") public String getUserSpokeDetails(@PathVariable("psmId") Integer psmId) { diff --git a/src/main/java/com/iemr/hwc/controller/teleconsultation/TeleConsultationController.java b/src/main/java/com/iemr/hwc/controller/teleconsultation/TeleConsultationController.java index 528cb961..fe9324cb 100644 --- a/src/main/java/com/iemr/hwc/controller/teleconsultation/TeleConsultationController.java +++ b/src/main/java/com/iemr/hwc/controller/teleconsultation/TeleConsultationController.java @@ -47,7 +47,7 @@ public class TeleConsultationController { @Autowired private TeleConsultationServiceImpl teleConsultationServiceImpl; - @CrossOrigin + @Operation(summary = "Update beneficiary arrival status based on request") @PostMapping(value = { "/update/benArrivalStatus" }) public String benArrivalStatusUpdater(@RequestBody String requestOBJ) { @@ -68,7 +68,7 @@ public String benArrivalStatusUpdater(@RequestBody String requestOBJ) { return response.toString(); } - @CrossOrigin + @Operation(summary = "Update beneficiary status based on request") @PostMapping(value = { "/cancel/benTCRequest" }) public String updateBeneficiaryStatusToCancelTCRequest(@RequestBody String requestOBJ, @@ -91,7 +91,7 @@ public String updateBeneficiaryStatusToCancelTCRequest(@RequestBody String reque return response.toString(); } - @CrossOrigin + @Operation(summary = "Check if specialist can proceed with beneficiary") @PostMapping(value = { "/check/benTCRequestStatus" }) public String checkBeneficiaryStatusToProceedWithSpecialist(@RequestBody String requestOBJ) { @@ -112,7 +112,7 @@ public String checkBeneficiaryStatusToProceedWithSpecialist(@RequestBody String return response.toString(); } - @CrossOrigin + @Operation(summary = "Create teleconsultation request from worklist") @PostMapping(value = { "/create/benTCRequestWithVisitCode" }) public String createTCRequestForBeneficiary(@RequestBody String requestOBJ, @RequestHeader String Authorization) { @@ -139,7 +139,7 @@ public String createTCRequestForBeneficiary(@RequestBody String requestOBJ, @Req } // TC request List - @CrossOrigin + @Operation(summary = "Get teleconsultation request list for a specialist") @PostMapping(value = { "/getTCRequestList" }) public String getTCSpecialistWorkListNew(@RequestBody String requestOBJ) { @@ -169,7 +169,7 @@ public String getTCSpecialistWorkListNew(@RequestBody String requestOBJ) { return response.toString(); } - @CrossOrigin + @Operation(summary = "Update first consultation start time") @PostMapping(value = { "/startconsultation" }) public String startconsultation(@RequestBody String requestOBJ) { diff --git a/src/main/java/com/iemr/hwc/controller/uptsu/UPTechnicalSupportUnitController.java b/src/main/java/com/iemr/hwc/controller/uptsu/UPTechnicalSupportUnitController.java index 7d27929d..802680fd 100644 --- a/src/main/java/com/iemr/hwc/controller/uptsu/UPTechnicalSupportUnitController.java +++ b/src/main/java/com/iemr/hwc/controller/uptsu/UPTechnicalSupportUnitController.java @@ -47,14 +47,14 @@ @RequestMapping(value = "/uptsu", headers = "Authorization", consumes = "application/json", produces = "application/json") @RestController -@CrossOrigin + public class UPTechnicalSupportUnitController { private Logger logger = LoggerFactory.getLogger(this.getClass().getName()); @Autowired private UptsuService uptsuService; - @CrossOrigin + @Operation(summary = "Fetch 104 action master data") @GetMapping(value = "/get/action-master", produces = MediaType.APPLICATION_JSON) public String getActionMaster() { @@ -69,7 +69,7 @@ public String getActionMaster() { return response.toString(); } - @CrossOrigin + @Operation(summary = "Fetch 104 work list data") @GetMapping("/getWorklistByVanID/{vanId}") public String getWolklist104Data(@PathVariable Integer vanId) { @@ -88,7 +88,7 @@ public String getWolklist104Data(@PathVariable Integer vanId) { return response.toString(); } - @CrossOrigin + @Operation(summary = "Save 104 referred details") @PostMapping("/submit/closevisit") public String saveReferred104Details(@RequestBody String request) { diff --git a/src/main/java/com/iemr/hwc/controller/version/VersionController.java b/src/main/java/com/iemr/hwc/controller/version/VersionController.java index 00f3e6c0..184bad71 100644 --- a/src/main/java/com/iemr/hwc/controller/version/VersionController.java +++ b/src/main/java/com/iemr/hwc/controller/version/VersionController.java @@ -45,7 +45,7 @@ public class VersionController { private Logger logger = LoggerFactory.getLogger(this.getClass().getSimpleName()); - @CrossOrigin() + @Operation(summary = "Get version information") @GetMapping(value = "/version") public String versionInformation() { diff --git a/src/main/java/com/iemr/hwc/controller/videoconsultation/VideoConsultationController.java b/src/main/java/com/iemr/hwc/controller/videoconsultation/VideoConsultationController.java index 645e6768..05975e99 100644 --- a/src/main/java/com/iemr/hwc/controller/videoconsultation/VideoConsultationController.java +++ b/src/main/java/com/iemr/hwc/controller/videoconsultation/VideoConsultationController.java @@ -44,7 +44,7 @@ public class VideoConsultationController { @Autowired private VideoConsultationService videoConsultationService; - @CrossOrigin() + @Operation(summary = "Login to video consultation service") @GetMapping(value = "/login/{userID}", headers = "Authorization", produces = { "application/json" }) public String login(@PathVariable("userID") Long userID) { @@ -66,7 +66,7 @@ public String login(@PathVariable("userID") Long userID) { } - @CrossOrigin() + @Operation(summary = "Call user for video consultation") @GetMapping(value = "/call/{fromUserID}/{touserID}", headers = "Authorization", produces = { "application/json" }) public String call(@PathVariable("fromUserID") Long fromUserID, @PathVariable("toUserID") Long toUserID) { @@ -88,7 +88,7 @@ public String call(@PathVariable("fromUserID") Long fromUserID, @PathVariable("t } - @CrossOrigin() + @Operation(summary = "Video consultatation for users by passing type") @GetMapping(value = "/call/{fromUserID}/{toUserID}/{type}", headers = "Authorization", produces = { "application/json" }) @@ -116,7 +116,7 @@ public String callSwymedAndJitsi(@PathVariable("fromUserID") Long fromUserID, } - @CrossOrigin() + @Operation(summary = "Call van through Swymed") @GetMapping(value = "/callvan/{fromUserID}/{vanID}", headers = "Authorization", produces = { "application/json" }) public String callvan(@PathVariable("fromUserID") Long fromUserID, @PathVariable("vanID") Integer vanID) { @@ -138,7 +138,7 @@ public String callvan(@PathVariable("fromUserID") Long fromUserID, @PathVariable } - @CrossOrigin() + @Operation(summary = "Call van through Swymed by passing type") @GetMapping(value = "/callvan/{fromUserID}/{vanID}/{type}", headers = "Authorization", produces = { "application/json" }) @@ -167,7 +167,7 @@ public String callVanSwymedAndJitsi(@PathVariable("fromUserID") Long fromUserID, } - @CrossOrigin() + @Operation(summary = "Logout of video consultation service") @GetMapping(value = "/logout", headers = "Authorization", produces = { "application/json" }) public String logout() { diff --git a/src/main/java/com/iemr/hwc/controller/wo/LocationControllerWo.java b/src/main/java/com/iemr/hwc/controller/wo/LocationControllerWo.java index 15fb77f4..f81adae0 100644 --- a/src/main/java/com/iemr/hwc/controller/wo/LocationControllerWo.java +++ b/src/main/java/com/iemr/hwc/controller/wo/LocationControllerWo.java @@ -40,7 +40,7 @@ import org.springframework.util.MultiValueMap; import org.springframework.web.bind.annotation.*; -@CrossOrigin + @RestController @RequestMapping(value = "wo/location") public class LocationControllerWo { @@ -136,7 +136,7 @@ public String getVillageByDistrictID(@PathVariable("districtID") Integer distric * @param comingRequest * @return */ - @CrossOrigin() + @Operation(summary = "Get location details from service point id and provider service map id") @PostMapping(value = "/getLocDetailsBasedOnSpIDAndPsmID/wo", produces = { "application/json" }) public String getLocDetailsBasedOnSpIDAndPsmIDNew(@RequestBody String comingRequest) { @@ -158,7 +158,7 @@ public String getLocDetailsBasedOnSpIDAndPsmIDNew(@RequestBody String comingRequ return response.toString(); } - @CrossOrigin + @Operation(summary = "Update health and wellness center coordinates") @PostMapping(value = { "/update/villageCoordinates" }) public String updateGeolocationVillage(@RequestBody String requestObj) { diff --git a/src/main/java/com/iemr/hwc/controller/wo/UserBiomectrics.java b/src/main/java/com/iemr/hwc/controller/wo/UserBiomectrics.java index 2641597d..82ba0764 100644 --- a/src/main/java/com/iemr/hwc/controller/wo/UserBiomectrics.java +++ b/src/main/java/com/iemr/hwc/controller/wo/UserBiomectrics.java @@ -37,7 +37,7 @@ import java.util.List; -@CrossOrigin + @RestController @RequestMapping(value = "wo/user_biometrics") public class UserBiomectrics { @@ -46,7 +46,7 @@ public class UserBiomectrics { @Autowired private RegistrarServiceImpl registrarService; - @CrossOrigin() + @Operation(summary = "add fingerprint for a given username") @PostMapping(value = "add/fingerprint/wo", produces = { "application/json" }) From 96a26fae7adf348d977552a50f1beda72556b40e Mon Sep 17 00:00:00 2001 From: Keval Kanpariya Date: Sat, 17 May 2025 09:24:44 +0530 Subject: [PATCH 2/4] DynamicCorsFilter.java added --- .../environment/common_example.properties | 2 +- .../com/iemr/hwc/utils/DynamicCorsFilter.java | 37 +++++++++++++++++++ 2 files changed, 38 insertions(+), 1 deletion(-) create mode 100644 src/main/java/com/iemr/hwc/utils/DynamicCorsFilter.java diff --git a/src/main/environment/common_example.properties b/src/main/environment/common_example.properties index 5ddea094..17194d0e 100644 --- a/src/main/environment/common_example.properties +++ b/src/main/environment/common_example.properties @@ -96,6 +96,6 @@ spring.redis.port=6379 springdoc.api-docs.enabled=true springdoc.swagger-ui.enabled=true -cors.allowed-origins=http://localhost:*,http://127.0.0.1:* +cors.allowed-origins=http://localhost:8085 diff --git a/src/main/java/com/iemr/hwc/utils/DynamicCorsFilter.java b/src/main/java/com/iemr/hwc/utils/DynamicCorsFilter.java new file mode 100644 index 00000000..ad25e94a --- /dev/null +++ b/src/main/java/com/iemr/hwc/utils/DynamicCorsFilter.java @@ -0,0 +1,37 @@ +package com.iemr.hwc.utils; + +import jakarta.servlet.FilterChain; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.stereotype.Component; +import org.springframework.web.filter.OncePerRequestFilter; + +import java.io.IOException; +import java.util.Arrays; + +@Component +public class DynamicCorsFilter extends OncePerRequestFilter { + + @Value("${cors.allowed-origins}") + private String[] allowedOrigins; + + @Override + protected void doFilterInternal(HttpServletRequest request, + HttpServletResponse response, + FilterChain filterChain) + throws ServletException, IOException { + + String origin = request.getHeader("Origin"); + if (origin != null && Arrays.asList(allowedOrigins).contains(origin)) { + response.setHeader("Access-Control-Allow-Origin", origin); + } + + if ("OPTIONS".equalsIgnoreCase(request.getMethod())) { + response.setStatus(HttpServletResponse.SC_OK); + } else { + filterChain.doFilter(request, response); + } + } +} From 498d62a031071958cab7c8ba5edfae57eef6143e Mon Sep 17 00:00:00 2001 From: Keval Kanpariya Date: Sat, 17 May 2025 09:28:12 +0530 Subject: [PATCH 3/4] fix: cors config --- src/main/java/com/iemr/hwc/config/CorsConfig.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/iemr/hwc/config/CorsConfig.java b/src/main/java/com/iemr/hwc/config/CorsConfig.java index 01a926d9..9f4de3d0 100644 --- a/src/main/java/com/iemr/hwc/config/CorsConfig.java +++ b/src/main/java/com/iemr/hwc/config/CorsConfig.java @@ -14,7 +14,7 @@ public class CorsConfig implements WebMvcConfigurer { @Override public void addCorsMappings(CorsRegistry registry) { registry.addMapping("/**") - .allowedOriginPatterns(allowedOrigins.split(",")) + .allowedOrigins(allowedOrigins) .allowedMethods("GET", "POST", "PUT", "DELETE", "OPTIONS") .allowedHeaders("*") .exposedHeaders("Authorization", "Jwttoken") // Explicitly expose headers if needed From 3382b45cc9e8dd7bd090a8011da3f25b8680f89d Mon Sep 17 00:00:00 2001 From: vishwab1 Date: Fri, 23 May 2025 16:32:43 +0530 Subject: [PATCH 4/4] fix:cors error and remove spaces --- .../environment/common_example.properties | 2 +- .../java/com/iemr/hwc/config/CorsConfig.java | 2 +- .../ChildhoodAdolescenceController.java | 16 +-- .../anc/AntenatalCareController.java | 24 +--- .../CancerScreeningController.java | 17 --- .../common/main/WorklistController.java | 69 +++------- .../controller/covid19/CovidController.java | 17 +-- .../FamilyPlanningController.java | 18 +-- .../generalOPD/GeneralOPDController.java | 55 ++++---- .../LabTechnicianController.java | 18 +-- .../location/LocationController.java | 4 +- .../controller/ncdCare/NCDCareController.java | 17 +-- .../ncdscreening/NCDScreeningController.java | 29 +---- .../neonatal/NeonatalController.java | 23 +--- .../PatientAppCommonMasterController.java | 10 -- .../pnc/PostnatalCareController.java | 19 +-- .../quickconsult/QuickConsultController.java | 13 +- .../registrar/main/RegistrarController.java | 34 ++--- .../TeleConsultationController.java | 8 +- .../controller/wo/LocationControllerWo.java | 27 ++-- .../hwc/controller/wo/UserBiomectrics.java | 123 +++++++++--------- .../java/com/iemr/hwc/utils/FilterConfig.java | 26 ++++ .../hwc/utils/JwtUserIdValidationFilter.java | 31 ++++- 23 files changed, 235 insertions(+), 367 deletions(-) create mode 100644 src/main/java/com/iemr/hwc/utils/FilterConfig.java diff --git a/src/main/environment/common_example.properties b/src/main/environment/common_example.properties index 17194d0e..b6c74d84 100644 --- a/src/main/environment/common_example.properties +++ b/src/main/environment/common_example.properties @@ -96,6 +96,6 @@ spring.redis.port=6379 springdoc.api-docs.enabled=true springdoc.swagger-ui.enabled=true -cors.allowed-origins=http://localhost:8085 +cors.allowed-origins=http://localhost:* diff --git a/src/main/java/com/iemr/hwc/config/CorsConfig.java b/src/main/java/com/iemr/hwc/config/CorsConfig.java index 9f4de3d0..333314ac 100644 --- a/src/main/java/com/iemr/hwc/config/CorsConfig.java +++ b/src/main/java/com/iemr/hwc/config/CorsConfig.java @@ -14,7 +14,7 @@ public class CorsConfig implements WebMvcConfigurer { @Override public void addCorsMappings(CorsRegistry registry) { registry.addMapping("/**") - .allowedOrigins(allowedOrigins) + .allowedOriginPatterns(allowedOrigins.split(",")) .allowedMethods("GET", "POST", "PUT", "DELETE", "OPTIONS") .allowedHeaders("*") .exposedHeaders("Authorization", "Jwttoken") // Explicitly expose headers if needed 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 7d26c89a..56df8e52 100644 --- a/src/main/java/com/iemr/hwc/controller/adolescent/ChildhoodAdolescenceController.java +++ b/src/main/java/com/iemr/hwc/controller/adolescent/ChildhoodAdolescenceController.java @@ -29,7 +29,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.repository.query.Param; import org.springframework.transaction.annotation.Transactional; -import org.springframework.web.bind.annotation.CrossOrigin; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestHeader; @@ -46,7 +45,6 @@ import io.swagger.v3.oas.annotations.Operation; - @RestController @RequestMapping(value = "/child-adolescent-care", headers = "Authorization") public class ChildhoodAdolescenceController { @@ -61,7 +59,7 @@ public class ChildhoodAdolescenceController { * @return success or failure response with visit code * @throws Exception */ - + @Operation(summary = "Save child adolescent care (CAC) nurse data") @PostMapping(value = { "/save/nurseData" }) public String saveBenNurseDataCAC(@RequestBody String requestObj, @@ -94,7 +92,6 @@ public String saveBenNurseDataCAC(@RequestBody String requestObj, return response.toString(); } - @Operation(summary = "Save child adolescent care doctor data") @PostMapping(value = { "save/doctorData" }) public String saveDoctorDataCAC(@RequestBody String requestObj, @@ -128,7 +125,7 @@ public String saveDoctorDataCAC(@RequestBody String requestObj, * @param comingRequest * @return visit details in JSON format */ - + @Operation(summary = "Get beneficiary visit details from nurse for child adolescent care") @PostMapping(value = { "/getBenVisitDetailsFrmNurseCAC" }) @Transactional(rollbackFor = Exception.class) @@ -163,7 +160,6 @@ public String getBenVisitDetailsFrmNurseCAC( * @return history details in JSON format */ - @Operation(summary = "Get child adolescent care beneficiary history") @PostMapping(value = { "/getBenHistoryDetails" }) @@ -196,7 +192,6 @@ public String getBenHistoryDetails( * @return vital details in JSON format */ - @Operation(summary = "Get child adolescent care beneficiary vitals from nurse") @PostMapping(value = { "/getBenVitalDetailsFrmNurse" }) public String getBenVitalDetailsFrmNurse( @@ -231,7 +226,6 @@ public String getBenVitalDetailsFrmNurse( * @return immunization service details in JSON format */ - @Operation(summary = "Get child adolescent care beneficiary immunization details") @PostMapping(value = { "/getBenImmunizationServiceDetails" }) @@ -265,7 +259,6 @@ public String getBenImmunizationServiceDetails( * @return doctor details in JSON format */ - @Operation(summary = "Get child adolescent care beneficiary details entered by doctor") @PostMapping(value = { "/getBenCaseRecordFromDoctor" }) @Transactional(rollbackFor = Exception.class) @@ -299,7 +292,7 @@ public String getBenCaseRecordFromDoctor( * @param comingRequest * @return vital details in JSON format */ - + @Operation(summary = "Update child adolescent care beneficiary vitals") @PostMapping(value = { "/update/vitalScreen" }) public String updateVitalNurseCAC(@RequestBody String requestObj) { @@ -334,7 +327,6 @@ public String updateVitalNurseCAC(@RequestBody String requestObj) { * @return history details in JSON format */ - @Operation(summary = "Update birth and immunization history") @PostMapping(value = { "/update/BirthAndImmunizationHistoryScreen" }) public String updateBirthAndImmunizationHistoryNurse(@RequestBody String requestObj) { @@ -370,7 +362,6 @@ public String updateBirthAndImmunizationHistoryNurse(@RequestBody String request * @return immunization service details in JSON format */ - @Operation(summary = "Update immunization service data") @PostMapping(value = { "/update/ImmunizationServicesScreen" }) public String updateImmunizationServicesNurse(@RequestBody String requestObj) { @@ -405,7 +396,6 @@ public String updateImmunizationServicesNurse(@RequestBody String requestObj) { * @return doctor details in JSON format */ - @Operation(summary = "Update child adolescent care doctor data") @PostMapping(value = { "/update/doctorData" }) public String updateCACDoctorData(@RequestBody String requestObj, 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 1f3bc182..7ad27a99 100644 --- a/src/main/java/com/iemr/hwc/controller/anc/AntenatalCareController.java +++ b/src/main/java/com/iemr/hwc/controller/anc/AntenatalCareController.java @@ -27,7 +27,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.repository.query.Param; import org.springframework.transaction.annotation.Transactional; -import org.springframework.web.bind.annotation.CrossOrigin; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestHeader; @@ -53,7 +52,6 @@ * */ - @RestController @RequestMapping(value = "/ANC", headers = "Authorization", consumes = "application/json", produces = "application/json") public class AntenatalCareController { @@ -69,7 +67,6 @@ public class AntenatalCareController { * @throws Exception */ - @Operation(summary = "Save ANC nurse data") @PostMapping(value = { "/save/nurseData" }) public String saveBenANCNurseData(@RequestBody String requestObj, @@ -107,7 +104,7 @@ public String saveBenANCNurseData(@RequestBody String requestObj, * @param JSON requestObj * @return success or failure response */ - + @Operation(summary = "Save ANC doctor data") @PostMapping(value = { "/save/doctorData" }) public String saveBenANCDoctorData(@RequestBody String requestObj, @@ -144,7 +141,6 @@ public String saveBenANCDoctorData(@RequestBody String requestObj, * @return visit details in JSON format */ - @Operation(summary = "Get ANC beneficiary visit details from nurse") @PostMapping(value = { "/getBenVisitDetailsFrmNurseANC" }) @Transactional(rollbackFor = Exception.class) @@ -177,7 +173,7 @@ public String getBenVisitDetailsFrmNurseANC( * @param benRegID and benVisitID * @return anc care details in JSON format */ - + @Operation(summary = "Get ANC beneficiary details from nurse") @PostMapping(value = { "/getBenANCDetailsFrmNurseANC" }) @Transactional(rollbackFor = Exception.class) @@ -214,7 +210,7 @@ public String getBenANCDetailsFrmNurseANC( * @param benRegID and benVisitID * @return history details in JSON format */ - + @Operation(summary = "Get ANC beneficiary history from nurse") @PostMapping(value = { "/getBenANCHistoryDetails" }) @@ -247,7 +243,7 @@ public String getBenANCHistoryDetails( * @param benRegID and benVisitID * @return vital details in JSON format */ - + @Operation(summary = "Get ANC beneficiary vitals from nurse") @PostMapping(value = { "/getBenANCVitalDetailsFrmNurseANC" }) public String getBenANCVitalDetailsFrmNurseANC( @@ -280,7 +276,7 @@ public String getBenANCVitalDetailsFrmNurseANC( * @param benRegID and benVisitID * @return examination details in JSON format */ - + @Operation(summary = "Get ANC beneficiary examination details from nurse") @PostMapping(value = { "/getBenExaminationDetailsANC" }) @@ -313,7 +309,7 @@ public String getBenExaminationDetailsANC( * @param benRegID and benVisitID * @return doctor entered details in JSON format */ - + @Operation(summary = "Get ANC beneficiary case record") @PostMapping(value = { "/getBenCaseRecordFromDoctorANC" }) @Transactional(rollbackFor = Exception.class) @@ -342,7 +338,6 @@ public String getBenCaseRecordFromDoctorANC( return response.toString(); } - @Operation(summary = "Check high risk pregnancy status for ANC beneficiary") @PostMapping(value = { "/getHRPStatus" }) @Transactional(rollbackFor = Exception.class) @@ -366,7 +361,6 @@ public String getHRPStatus(@RequestBody HrpStatusAndReasonsRequestModel hrpStatu @Autowired private ANCService aNCService; - @Operation(summary = "Get high risk pregnancy information (status and reason) from obstetric history " + "as per the latest visit") @PostMapping(value = { "/getHrpInformation" }) @@ -399,7 +393,6 @@ public String getHrpInformation( * Doctor */ - @Operation(summary = "Update ANC beneficiary data") @PostMapping(value = { "/update/ANCScreen" }) public String updateANCCareNurse(@RequestBody String requestObj) { @@ -436,7 +429,6 @@ public String updateANCCareNurse(@RequestBody String requestObj) { * by Doctor */ - @Operation(summary = "Update ANC beneficiary history") @PostMapping(value = { "/update/historyScreen" }) public String updateANCHistoryNurse(@RequestBody String requestObj) { @@ -473,7 +465,6 @@ public String updateANCHistoryNurse(@RequestBody String requestObj) { * by Doctor */ - @Operation(summary = "Update ANC beneficiary vitals") @PostMapping(value = { "/update/vitalScreen" }) public String updateANCVitalNurse(@RequestBody String requestObj) { @@ -510,7 +501,6 @@ public String updateANCVitalNurse(@RequestBody String requestObj) { * by Doctor */ - @Operation(summary = "Update ANC examination data") @PostMapping(value = { "/update/examinationScreen" }) public String updateANCExaminationNurse(@RequestBody String requestObj) { @@ -546,7 +536,7 @@ public String updateANCExaminationNurse(@RequestBody String requestObj) { * @objective Replace ANC doctor data for the doctor next visit * */ - + @Operation(summary = "Update ANC doctor data") @PostMapping(value = { "/update/doctorData" }) public String updateANCDoctorData(@RequestBody String requestObj, 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 49ceb034..271ba453 100644 --- a/src/main/java/com/iemr/hwc/controller/cancerscreening/CancerScreeningController.java +++ b/src/main/java/com/iemr/hwc/controller/cancerscreening/CancerScreeningController.java @@ -27,7 +27,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.repository.query.Param; import org.springframework.transaction.annotation.Transactional; -import org.springframework.web.bind.annotation.CrossOrigin; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestHeader; @@ -70,7 +69,6 @@ public void setCancerScreeningServiceImpl(CSServiceImpl cSServiceImpl) { * @throws Exception */ - @Operation(summary = "Save cancer screening data collected by nurse") @PostMapping(value = { "/save/nurseData" }) public String saveBenCancerScreeningNurseData(@RequestBody String requestObj, @@ -107,7 +105,6 @@ public String saveBenCancerScreeningNurseData(@RequestBody String requestObj, * @return success or failure response */ - @Operation(summary = "Update cancer screening data by the doctor") @PostMapping(value = { "/save/doctorData" }) public String saveBenCancerScreeningDoctorData(@RequestBody String requestObj, @@ -145,7 +142,6 @@ public String saveBenCancerScreeningDoctorData(@RequestBody String requestObj, * @return visit details in JSON format */ - @Operation(summary = "Get beneficiary visit details") @PostMapping(value = { "/getBenDataFrmNurseToDocVisitDetailsScreen" }) public String getBenDataFrmNurseScrnToDocScrnVisitDetails( @@ -177,7 +173,6 @@ public String getBenDataFrmNurseScrnToDocScrnVisitDetails( * @return history details in JSON format */ - @Operation(summary = "Get beneficiary cancer history") @PostMapping(value = { "/getBenDataFrmNurseToDocHistoryScreen" }) public String getBenDataFrmNurseScrnToDocScrnHistory( @@ -208,7 +203,6 @@ public String getBenDataFrmNurseScrnToDocScrnHistory( * @return vital details in JSON format */ - @Operation(summary = "Get beneficiary vitals") @PostMapping(value = { "/getBenDataFrmNurseToDocVitalScreen" }) public String getBenDataFrmNurseScrnToDocScrnVital( @@ -240,7 +234,6 @@ public String getBenDataFrmNurseScrnToDocScrnVital( * @return examination details in JSON format */ - @Operation(summary = "Get beneficiary examination details") @PostMapping(value = { "/getBenDataFrmNurseToDocExaminationScreen" }) public String getBenDataFrmNurseScrnToDocScrnExamination( @@ -272,7 +265,6 @@ public String getBenDataFrmNurseScrnToDocScrnExamination( * @return previous family history details in JSON format */ - @Operation(summary = "Get beneficiary family history") @PostMapping(value = { "/getBenCancerFamilyHistory" }) public String getBenCancerFamilyHistory( @@ -306,7 +298,6 @@ public String getBenCancerFamilyHistory( * @return previous personal history details in JSON format */ - @Operation(summary = "Get beneficiary personal history") @PostMapping(value = { "/getBenCancerPersonalHistory" }) public String getBenCancerPersonalHistory( @@ -339,7 +330,6 @@ public String getBenCancerPersonalHistory( * @return previous personal history details in JSON format */ - @Operation(summary = "Get beneficiary personal diet history") @PostMapping(value = { "/getBenCancerPersonalDietHistory" }) public String getBenCancerPersonalDietHistory( @@ -373,7 +363,6 @@ public String getBenCancerPersonalDietHistory( * @return previous obstetric history details in JSON format */ - @Operation(summary = "Get beneficiary obstetric history") @PostMapping(value = { "/getBenCancerObstetricHistory" }) public String getBenCancerObstetricHistory( @@ -405,7 +394,6 @@ public String getBenCancerObstetricHistory( * @return doctor details in JSON format */ - @Operation(summary = "Get beneficiary case record and referral details") @PostMapping(value = { "/getBenCaseRecordFromDoctorCS" }) @Transactional(rollbackFor = Exception.class) @@ -440,7 +428,6 @@ public String getBenCaseRecordFromDoctorCS( * details entered by Doctor */ - @Operation(summary = "Update cancer screening history") @PostMapping(value = { "/update/historyScreen" }) public String updateCSHistoryNurse( @@ -490,7 +477,6 @@ public String updateCSHistoryNurse( * details entered by Doctor */ - @Operation(summary = "Update beneficiary vitals") @PostMapping(value = { "/update/vitalScreen" }) public String upodateBenVitalDetail( @@ -528,7 +514,6 @@ public String upodateBenVitalDetail( * the details entered by Doctor */ - @Operation(summary = "Update beneficiary examination details") @PostMapping(value = { "/update/examinationScreen" }) public String upodateBenExaminationDetail(@RequestBody String requestObj) { @@ -561,7 +546,6 @@ public String upodateBenExaminationDetail(@RequestBody String requestObj) { * */ - @Operation(summary = "Update cancer diagnosis details by Oncologist") @PostMapping(value = { "/update/examinationScreen/diagnosis" }) public String updateCancerDiagnosisDetailsByOncologist( @@ -594,7 +578,6 @@ public String updateCancerDiagnosisDetailsByOncologist( * */ - @Operation(summary = "Update cancer screening data") @PostMapping(value = { "/update/doctorData" }) public String updateCancerScreeningDoctorData(@RequestBody String requestObj) { diff --git a/src/main/java/com/iemr/hwc/controller/common/main/WorklistController.java b/src/main/java/com/iemr/hwc/controller/common/main/WorklistController.java index b84aab06..6d27a04d 100644 --- a/src/main/java/com/iemr/hwc/controller/common/main/WorklistController.java +++ b/src/main/java/com/iemr/hwc/controller/common/main/WorklistController.java @@ -21,21 +21,17 @@ */ package com.iemr.hwc.controller.common.main; -import jakarta.ws.rs.core.MediaType; - import org.json.JSONObject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.repository.query.Param; -import org.springframework.web.bind.annotation.CrossOrigin; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestHeader; import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RestController; import com.iemr.hwc.data.benFlowStatus.BeneficiaryFlowStatus; @@ -47,7 +43,7 @@ import com.iemr.hwc.utils.response.OutputResponse; import io.swagger.v3.oas.annotations.Operation; - +import jakarta.ws.rs.core.MediaType; @RestController @RequestMapping(value = "/common", headers = "Authorization", consumes = "application/json", produces = "application/json") @@ -73,7 +69,6 @@ public void setCommonNurseServiceImpl(CommonNurseServiceImpl commonNurseServiceI this.commonNurseServiceImpl = commonNurseServiceImpl; } - @Operation(summary = "Get doctor worklist") @GetMapping(value = { "/getDocWorklistNew/{providerServiceMapID}/{serviceID}/{vanID}" }) public String getDocWorkListNew(@PathVariable("providerServiceMapID") Integer providerServiceMapID, @@ -97,7 +92,7 @@ public String getDocWorkListNew(@PathVariable("providerServiceMapID") Integer pr } // doc worklist new (TM future scheduled beneficiary) - + @Operation(summary = "Get doctor future worklist scheduled for telemedicine") @GetMapping(value = { "/getDocWorkListNewFutureScheduledForTM/{providerServiceMapID}/{serviceID}/{vanID}" }) public String getDocWorkListNewFutureScheduledForTM( @@ -124,7 +119,7 @@ public String getDocWorkListNewFutureScheduledForTM( } // nurse worklist new - + @Operation(summary = "Get nurse worklist") @GetMapping(value = { "/getNurseWorklistNew/{providerServiceMapID}/{serviceID}/{vanID}" }) public String getNurseWorkListNew(@PathVariable("providerServiceMapID") Integer providerServiceMapID, @@ -145,7 +140,7 @@ public String getNurseWorkListNew(@PathVariable("providerServiceMapID") Integer } // nurse worklist TC schedule (current-date) new - + @Operation(summary = "Get worklist for teleconsultation for the current date") @GetMapping(value = { "/getNurseWorkListTcCurrentDate/{providerServiceMapID}/{serviceID}/{vanID}" }) public String getNurseWorkListTcCurrentDateNew(@PathVariable("providerServiceMapID") Integer providerServiceMapID, @@ -165,7 +160,7 @@ public String getNurseWorkListTcCurrentDateNew(@PathVariable("providerServiceMap } // nurse worklist TC schedule (future-date) new - + @Operation(summary = "Get worklist for teleconsultation for the future date") @GetMapping(value = { "/getNurseWorkListTcFutureDate/{providerServiceMapID}/{serviceID}/{vanID}" }) public String getNurseWorkListTcFutureDateNew(@PathVariable("providerServiceMapID") Integer providerServiceMapID, @@ -184,7 +179,6 @@ public String getNurseWorkListTcFutureDateNew(@PathVariable("providerServiceMapI return response.toString(); } - @Operation(summary = "Get previous significant findings") @PostMapping(value = { "/getDoctorPreviousSignificantFindings" }) public String getDoctorPreviousSignificantFindings( @@ -210,7 +204,7 @@ public String getDoctorPreviousSignificantFindings( } // Get Lab technician worklist new - + @Operation(summary = "Get lab technician worklist") @GetMapping(value = { "/getLabWorklistNew/{providerServiceMapID}/{serviceID}/{vanID}" }) public String getLabWorkListNew(@PathVariable("providerServiceMapID") Integer providerServiceMapID, @@ -230,7 +224,7 @@ public String getLabWorkListNew(@PathVariable("providerServiceMapID") Integer pr } // Get radiologist worklist new - + @Operation(summary = "Get radiologist worklist") @PostMapping(value = { "/getRadiologist-worklist-New/{providerServiceMapID}/{serviceID}/{vanID}" }) public String getRadiologistWorklistNew(@PathVariable("providerServiceMapID") Integer providerServiceMapID, @@ -250,7 +244,7 @@ public String getRadiologistWorklistNew(@PathVariable("providerServiceMapID") In } // Get oncologist worklist new - + @Operation(summary = "Get oncologist worklist") @PostMapping(value = { "/getOncologist-worklist-New/{providerServiceMapID}/{serviceID}/{vanID}" }) public String getOncologistWorklistNew(@PathVariable("providerServiceMapID") Integer providerServiceMapID, @@ -270,7 +264,7 @@ public String getOncologistWorklistNew(@PathVariable("providerServiceMapID") Int } // Get pharma worklist new - + @Operation(summary = "Get pharmacist worklist") @GetMapping(value = { "/getPharma-worklist-New/{providerServiceMapID}/{serviceID}/{vanID}" }) public String getPharmaWorklistNew(@PathVariable("providerServiceMapID") Integer providerServiceMapID, @@ -289,7 +283,6 @@ public String getPharmaWorklistNew(@PathVariable("providerServiceMapID") Integer return response.toString(); } - @Operation(summary = "Print case sheet of beneficiary.") @PostMapping(value = { "/get/Case-sheet/printData" }) public String getCasesheetPrintData(@RequestBody String comingReq, @@ -309,7 +302,7 @@ public String getCasesheetPrintData(@RequestBody String comingReq, } // Start of Fetch Previous Medical History... - + @Operation(summary = "Get beneficiary history") @PostMapping(value = { "/getBenPastHistory" }) public String getBenPastHistory(@Param(value = "{\"benRegID\":\"Long\"}") @RequestBody String comingRequest) { @@ -335,7 +328,6 @@ public String getBenPastHistory(@Param(value = "{\"benRegID\":\"Long\"}") @Reque return response.toString(); } - @Operation(summary = "Get beneficiary tobacco consumption history") @PostMapping(value = { "/getBenTobaccoHistory" }) public String getBenTobaccoHistory(@Param(value = "{\"benRegID\":\"Long\"}") @RequestBody String comingRequest) { @@ -360,7 +352,6 @@ public String getBenTobaccoHistory(@Param(value = "{\"benRegID\":\"Long\"}") @Re return response.toString(); } - @Operation(summary = "Get beneficiary alcohol consumption history") @PostMapping(value = { "/getBenAlcoholHistory" }) public String getBenAlcoholHistory(@Param(value = "{\"benRegID\":\"Long\"}") @RequestBody String comingRequest) { @@ -385,7 +376,6 @@ public String getBenAlcoholHistory(@Param(value = "{\"benRegID\":\"Long\"}") @Re return response.toString(); } - @Operation(summary = "Get beneficiary allergy history") @PostMapping(value = { "/getBenAllergyHistory" }) public String getBenANCAllergyHistory(@Param(value = "{\"benRegID\":\"Long\"}") @RequestBody String comingRequest) { @@ -411,7 +401,6 @@ public String getBenANCAllergyHistory(@Param(value = "{\"benRegID\":\"Long\"}") return response.toString(); } - @Operation(summary = "Get beneficiary medication history") @PostMapping(value = { "/getBenMedicationHistory" }) public String getBenMedicationHistory(@Param(value = "{\"benRegID\":\"Long\"}") @RequestBody String comingRequest) { @@ -436,7 +425,6 @@ public String getBenMedicationHistory(@Param(value = "{\"benRegID\":\"Long\"}") return response.toString(); } - @Operation(summary = "Get beneficiary family history") @PostMapping(value = { "/getBenFamilyHistory" }) public String getBenFamilyHistory(@Param(value = "{\"benRegID\":\"Long\"}") @RequestBody String comingRequest) { @@ -461,7 +449,6 @@ public String getBenFamilyHistory(@Param(value = "{\"benRegID\":\"Long\"}") @Req return response.toString(); } - @Operation(summary = "Get beneficiary menstrual history") @PostMapping(value = { "/getBenMenstrualHistory" }) public String getBenMenstrualHistory(@Param(value = "{\"benRegID\":\"Long\"}") @RequestBody String comingRequest) { @@ -486,7 +473,6 @@ public String getBenMenstrualHistory(@Param(value = "{\"benRegID\":\"Long\"}") @ return response.toString(); } - @Operation(summary = "Get beneficiary obstetrics history") @PostMapping(value = { "/getBenPastObstetricHistory" }) public String getBenPastObstetricHistory( @@ -512,7 +498,6 @@ public String getBenPastObstetricHistory( return response.toString(); } - @Operation(summary = "Get beneficiary comorbidity condition details") @PostMapping(value = { "/getBenComorbidityConditionHistory" }) public String getBenANCComorbidityConditionHistory( @@ -538,7 +523,6 @@ public String getBenANCComorbidityConditionHistory( return response.toString(); } - @Operation(summary = "Get beneficiary optional vaccine details") @PostMapping(value = { "/getBenOptionalVaccineHistory" }) public String getBenOptionalVaccineHistory( @@ -564,7 +548,6 @@ public String getBenOptionalVaccineHistory( return response.toString(); } - @Operation(summary = "Get child beneficiary vaccine details") @PostMapping(value = { "/getBenChildVaccineHistory" }) public String getBenImmunizationHistory( @@ -590,7 +573,6 @@ public String getBenImmunizationHistory( return response.toString(); } - @Operation(summary = "Get beneficiary perinatal history") @PostMapping(value = { "/getBenPerinatalHistory" }) public String getBenPerinatalHistory(@Param(value = "{\"benRegID\":\"Long\"}") @RequestBody String comingRequest) { @@ -615,7 +597,6 @@ public String getBenPerinatalHistory(@Param(value = "{\"benRegID\":\"Long\"}") @ return response.toString(); } - @Operation(summary = "Get child beneficiary feeding history") @PostMapping(value = { "/getBenFeedingHistory" }) public String getBenFeedingHistory(@Param(value = "{\"benRegID\":\"Long\"}") @RequestBody String comingRequest) { @@ -640,7 +621,6 @@ public String getBenFeedingHistory(@Param(value = "{\"benRegID\":\"Long\"}") @Re return response.toString(); } - @Operation(summary = "Get child beneficiary development history") @PostMapping(value = { "/getBenDevelopmentHistory" }) public String getBenDevelopmentHistory( @@ -672,7 +652,7 @@ public String getBenDevelopmentHistory( * fetch ben previous visit details for history case-record(Platform). * 08-08-2018 */ - + @Operation(summary = "Get beneficiary casesheet history") @PostMapping(value = { "/getBeneficiaryCaseSheetHistory" }) public String getBeneficiaryCaseSheetHistory( @@ -693,7 +673,7 @@ public String getBeneficiaryCaseSheetHistory( } // TC specialist worklist new - + @Operation(summary = "Get teleconsultation specialist worklist") @GetMapping(value = { "/getTCSpecialistWorklist/{providerServiceMapID}/{serviceID}/{userID}" }) public String getTCSpecialistWorkListNew(@PathVariable("providerServiceMapID") Integer providerServiceMapID, @@ -718,7 +698,7 @@ public String getTCSpecialistWorkListNew(@PathVariable("providerServiceMapID") I } // TC specialist worklist new, patient App, 14-08-2020 - + @Operation(summary = "Get teleconsultation specialist worklist for patient app") @GetMapping(value = { "/getTCSpecialistWorklistPatientApp/{providerServiceMapID}/{serviceID}/{userID}/{vanID}" }) public String getTCSpecialistWorkListNewPatientApp( @@ -744,10 +724,9 @@ public String getTCSpecialistWorkListNewPatientApp( } // TC specialist worklist new future scheduled - + @Operation(summary = "Get teleconsultation specialist future scheduled") - @GetMapping(value = { - "/getTCSpecialistWorklistFutureScheduled/{providerServiceMapID}/{serviceID}/{userID}" }) + @GetMapping(value = { "/getTCSpecialistWorklistFutureScheduled/{providerServiceMapID}/{serviceID}/{userID}" }) public String getTCSpecialistWorklistFutureScheduled( @PathVariable("providerServiceMapID") Integer providerServiceMapID, @PathVariable("userID") Integer userID, @PathVariable("serviceID") Integer serviceID) { @@ -772,7 +751,7 @@ public String getTCSpecialistWorklistFutureScheduled( } // openkm file download - + @Operation(summary = "Add file as string to openKM.") @PostMapping(value = "/getKMFile", produces = MediaType.APPLICATION_JSON, consumes = MediaType.APPLICATION_JSON, headers = "Authorization") public String getKMFile(@Param(value = "{}") @RequestBody String request, @@ -793,7 +772,6 @@ public String getKMFile(@Param(value = "{}") @RequestBody String request, return response.toString(); } - @Operation(summary = "Get beneficiary physical history") @PostMapping(value = { "/getBenPhysicalHistory" }) public String getBenPhysicalHistory(@Param(value = "{\"benRegID\":\"Long\"}") @RequestBody String comingRequest) { @@ -819,7 +797,6 @@ public String getBenPhysicalHistory(@Param(value = "{\"benRegID\":\"Long\"}") @R return response.toString(); } - @Operation(summary = "Get beneficiary symptomatic questionnaire answer details") @PostMapping(value = { "/getBenSymptomaticQuestionnaireDetails" }) public String getBenSymptomaticQuestionnaireDetails( @@ -846,7 +823,6 @@ public String getBenSymptomaticQuestionnaireDetails( return response.toString(); } - @Operation(summary = "Get beneficiary previous biabetes history") @PostMapping(value = { "/getBenPreviousDiabetesHistoryDetails" }) public String getBenPreviousDiabetesHistoryDetails( @@ -874,7 +850,7 @@ public String getBenPreviousDiabetesHistoryDetails( } // nurse worklist coming from MMU application - + @Operation(summary = "Get mmu nurse worklist") @GetMapping(value = { "/getMmuNurseWorklistNew/{providerServiceMapID}/{serviceID}/{vanID}" }) public String getMmuNurseWorklistNew(@PathVariable("providerServiceMapID") Integer providerServiceMapID, @@ -894,7 +870,6 @@ public String getMmuNurseWorklistNew(@PathVariable("providerServiceMapID") Integ return response.toString(); } - @Operation(summary = "Get beneficiary previous Referral history") @PostMapping(value = { "/getBenPreviousReferralHistoryDetails" }) public String getBenPreviousReferralHistoryDetails( @@ -927,7 +902,7 @@ public String getBenPreviousReferralHistoryDetails( * @param comingRequest * @return ProviderSpecificMasterData */ - + @Operation(summary = "Get provider specific data") @PostMapping(value = { "/getProviderSpecificData" }) public String getProviderSpecificData( @@ -952,7 +927,7 @@ public String getProviderSpecificData( * @param comingRequest * @return ProviderSpecificMasterData */ - + @Operation(summary = "Calculate beneficiary BMI status") @PostMapping(value = { "/calculateBMIStatus" }) public String calculateBMIStatus( @@ -976,7 +951,7 @@ public String calculateBMIStatus( * @param { "benRegID": "274685" } * @return immunization service details in JSON format */ - + @Operation(summary = "Get beneficiary immunization history ") @PostMapping(value = { "/getBenImmunizationServiceHistory" }) @@ -1005,7 +980,7 @@ public String getBenImmunizationServiceHistory( // this functionality are moved to registrar update controller. // 16-04-2018, Neeraj kumar - + @Operation(summary = "Update beneficiary status flag") @PostMapping(value = { "/update/benDetailsAndSubmitToNurse" }) public String saveBeneficiaryVisitDetail( @@ -1038,7 +1013,6 @@ public String saveBeneficiaryVisitDetail( return response.toString(); } - @Operation(summary = "Extend redis session for 30 mins") @PostMapping(value = { "/extend/redisSession" }) public String extendRedisSession() { @@ -1052,7 +1026,6 @@ public String extendRedisSession() { return response.toString(); } - @Operation(summary = "Soft delete prescribed medicine") @PostMapping(value = { "/doctor/delete/prescribedMedicine" }) public String deletePrescribedMedicine(@RequestBody String requestOBJ) { 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 c5f8eeb1..c302e089 100644 --- a/src/main/java/com/iemr/hwc/controller/covid19/CovidController.java +++ b/src/main/java/com/iemr/hwc/controller/covid19/CovidController.java @@ -30,7 +30,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.repository.query.Param; import org.springframework.transaction.annotation.Transactional; -import org.springframework.web.bind.annotation.CrossOrigin; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestHeader; @@ -45,9 +44,6 @@ import io.swagger.v3.oas.annotations.Operation; - - - /** * * @Objective Saving NCD Care data for Nurse and Doctor. @@ -61,7 +57,6 @@ public class CovidController { @Autowired private Covid19ServiceImpl covid19ServiceImpl; - @Operation(summary = "Save COVID nurse data") @PostMapping(value = { "/save/nurseData" }) public String saveBenNCDCareNurseData(@RequestBody String requestObj, @@ -98,7 +93,7 @@ public String saveBenNCDCareNurseData(@RequestBody String requestObj, * @param JSON requestObj * @return success or failure response */ - + @Operation(summary = "Save COVID doctor data") @PostMapping(value = { "/save/doctorData" }) public String saveBenCovidDoctorData(@RequestBody String requestObj, @@ -136,7 +131,6 @@ public String saveBenCovidDoctorData(@RequestBody String requestObj, * @return visit details in JSON format */ - @Operation(summary = "Get COVID beneficiary visit details") @PostMapping(value = { "/getBenVisitDetailsFrmNurseCovid" }) @Transactional(rollbackFor = Exception.class) @@ -170,7 +164,7 @@ public String getBenVisitDetailsFrmNurseCovid19( * @param comingRequest * @return visit details in JSON format */ - + @Operation(summary = "Get COVID beneficiary history") @PostMapping(value = { "/getBenCovid19HistoryDetails" }) @@ -204,7 +198,6 @@ public String getBenCovid19HistoryDetails( * @return visit details in JSON format */ - @Operation(summary = "Get COVID beneficiary vitals") @PostMapping(value = { "/getBenVitalDetailsFrmNurseCovid" }) public String getBenVitalDetailsFrmNurseNCDCare( @@ -237,7 +230,7 @@ public String getBenVitalDetailsFrmNurseNCDCare( * @param comingRequest * @return visit details in JSON format */ - + @Operation(summary = "Get COVID beneficiary case-record and referral details") @PostMapping(value = { "/getBenCaseRecordFromDoctorCovid" }) @Transactional(rollbackFor = Exception.class) @@ -274,7 +267,6 @@ public String getBenCaseRecordFromDoctorCovid19( * entered by doctor */ - @Operation(summary = "Update COVID beneficiary history") @PostMapping(value = { "/update/historyScreen" }) public String updateHistoryNurse(@RequestBody String requestObj) { @@ -313,7 +305,6 @@ public String updateHistoryNurse(@RequestBody String requestObj) { * entered by doctor */ - @Operation(summary = "Update COVID beneficiary vitals") @PostMapping(value = { "/update/vitalScreen" }) public String updateVitalNurse(@RequestBody String requestObj) { @@ -348,7 +339,7 @@ public String updateVitalNurse(@RequestBody String requestObj) { * @return success or failure response * @objective Replace COVID 19 doctor data for the doctor next visit */ - + @Operation(summary = "Update COVID beneficiary case-record and referral details") @PostMapping(value = { "/update/doctorData" }) public String updateCovid19DoctorData(@RequestBody String requestObj, 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 66c95b13..db665124 100644 --- a/src/main/java/com/iemr/hwc/controller/familyPlanning/FamilyPlanningController.java +++ b/src/main/java/com/iemr/hwc/controller/familyPlanning/FamilyPlanningController.java @@ -27,12 +27,10 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.repository.query.Param; import org.springframework.transaction.annotation.Transactional; -import org.springframework.web.bind.annotation.CrossOrigin; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestHeader; import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RestController; import com.google.gson.JsonElement; @@ -45,10 +43,6 @@ import io.swagger.v3.oas.annotations.Operation; - - - - @RestController @RequestMapping(value = "/family-planning", headers = "Authorization") public class FamilyPlanningController { @@ -155,7 +149,6 @@ public String saveFamilyPlanningNuseData(@Param(value = "{\r\n" + " \"visitDeta return response.toString(); } - @Operation(summary = "Save family planning data collected by doctor") @PostMapping(value = { "save-family-planning-doctor-data" }) public String saveFamilyPlanningDoctorData(@RequestBody String requestObj, @@ -190,7 +183,6 @@ public String saveFamilyPlanningDoctorData(@RequestBody String requestObj, * @return visit details in JSON format */ - @Operation(summary = "Get family planning beneficiary visit details") @PostMapping(value = { "/getBenVisitDetails-Nurse-FamilyPlanning" }) @Transactional(rollbackFor = Exception.class) @@ -223,7 +215,7 @@ public String getBenVisitDetailsFrmNurseFamilyPlanning( * @param benRegID and benVisitID * @return vital details in JSON format */ - + @Operation(summary = "Get family planning beneficiary vitals") @RequestMapping(value = { "/getBenVitalDetailsFrmNurseFamilyPlanning" }) public String getBenVitalDetailsFrmNurseFamilyPlanning( @@ -253,7 +245,7 @@ public String getBenVitalDetailsFrmNurseFamilyPlanning( * @param benRegID and benVisitID * @return FamilyPlanning details in JSON format */ - + @Operation(summary = "Get family planning beneficiary details") @PostMapping(value = { "/getBenFPDetailsFrmNurseFamilyPlanning" }) @Transactional(rollbackFor = Exception.class) @@ -281,7 +273,7 @@ public String getBenFPDetailsFrmNurseFamilyPlanning( * @param comingRequest * @return doctor details in JSON format */ - + @Operation(summary = "Get family planning beneficiary case record") @PostMapping(value = { "/getBenCaseRecordFromDoctor" }) @Transactional(rollbackFor = Exception.class) @@ -310,7 +302,6 @@ public String getBenCaseRecordFromDoctor( return response.toString(); } - @Operation(summary = "Update family planning data") @PostMapping(value = { "/update/FamilyPlanningScreen" }) public String updateFamilyPlanningNurse(@RequestBody String requestObj) { @@ -339,7 +330,6 @@ public String updateFamilyPlanningNurse(@RequestBody String requestObj) { return response.toString(); } - @Operation(summary = "Update family planning beneficiary vitals") @PostMapping(value = { "/update/vitalScreen" }) public String updateVitalNurseFamilyPlanning(@RequestBody String requestObj) { @@ -374,7 +364,7 @@ public String updateVitalNurseFamilyPlanning(@RequestBody String requestObj) { * @return success or failure response * @objective Update FamilyPlanning doctor data for the doctor next visit */ - + @Operation(summary = "Update family planning data") @PostMapping(value = { "/update/doctorData" }) public String updateFamilyPlanningDoctorData(@RequestBody String requestObj, 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 292579ba..fbe27633 100644 --- a/src/main/java/com/iemr/hwc/controller/generalOPD/GeneralOPDController.java +++ b/src/main/java/com/iemr/hwc/controller/generalOPD/GeneralOPDController.java @@ -27,12 +27,10 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.repository.query.Param; import org.springframework.transaction.annotation.Transactional; -import org.springframework.web.bind.annotation.CrossOrigin; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestHeader; import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RestController; import com.google.gson.JsonElement; @@ -43,9 +41,6 @@ import io.swagger.v3.oas.annotations.Operation; - - - /*** * * @Objective Saving General OPD data for Nurse and Doctor. @@ -69,36 +64,35 @@ public void setGeneralOPDServiceImpl(GeneralOPDServiceImpl generalOPDServiceImpl * @Objective Save General OPD data for nurse. * @param requestObj * @return success or failure response - * @throws Exception + * @throws Exception */ - + @Operation(summary = "Save general OPD data collected by nurse") @PostMapping(value = { "/save/nurseData" }) public String saveBenGenOPDNurseData(@RequestBody String requestObj, @RequestHeader(value = "Authorization") String Authorization) throws Exception { OutputResponse response = new OutputResponse(); - - if(null != 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); + try { + logger.info("Request object for GeneralOPD nurse data saving :" + requestObj); - if (jsnOBJ != null) { - String genOPDRes = generalOPDServiceImpl.saveNurseData(jsnOBJ, Authorization); - response.setResponse(genOPDRes); - } else { - response.setResponse("Invalid request"); + if (jsnOBJ != null) { + String genOPDRes = generalOPDServiceImpl.saveNurseData(jsnOBJ, Authorization); + response.setResponse(genOPDRes); + } else { + response.setResponse("Invalid request"); + } + } catch (Exception e) { + logger.error("Error in nurse data saving :" + e.getMessage()); + generalOPDServiceImpl.deleteVisitDetails(jsnOBJ); + response.setError(5000, e.getMessage()); } - } catch (Exception e) { - logger.error("Error in nurse data saving :" + e.getMessage()); - generalOPDServiceImpl.deleteVisitDetails(jsnOBJ); - response.setError(5000, e.getMessage()); - } } return response.toString(); } @@ -108,7 +102,7 @@ public String saveBenGenOPDNurseData(@RequestBody String requestObj, * @param requestObj * @return success or failure response */ - + @Operation(summary = "Save general OPD data collected by doctor") @PostMapping(value = { "/save/doctorData" }) public String saveBenGenOPDDoctorData(@RequestBody String requestObj, @@ -145,7 +139,7 @@ public String saveBenGenOPDDoctorData(@RequestBody String requestObj, * @param comingRequest * @return visit details in JSON format */ - + @Operation(summary = "Get general OPD beneficiary visit details") @PostMapping(value = { "/getBenVisitDetailsFrmNurseGOPD" }) @Transactional(rollbackFor = Exception.class) @@ -179,7 +173,7 @@ public String getBenVisitDetailsFrmNurseGOPD( * @param comingRequest * @return history details in JSON format */ - + @Operation(summary = "Get general OPD beneficiary history") @PostMapping(value = { "/getBenHistoryDetails" }) @@ -212,7 +206,7 @@ public String getBenHistoryDetails( * @param comingRequest * @return vital details in JSON format */ - + @Operation(summary = "Get general OPD beneficiary vitals") @PostMapping(value = { "/getBenVitalDetailsFrmNurse" }) public String getBenVitalDetailsFrmNurse( @@ -245,7 +239,7 @@ public String getBenVitalDetailsFrmNurse( * @param comingRequest * @return examination details in JSON format */ - + @Operation(summary = "Get general OPD beneficiary examination details") @PostMapping(value = { "/getBenExaminationDetails" }) @@ -278,7 +272,7 @@ public String getBenExaminationDetails( * @param comingRequest * @return doctor details in JSON format */ - + @Operation(summary = "Get general OPD beneficiary case record and referral") @PostMapping(value = { "/getBenCaseRecordFromDoctorGeneralOPD" }) @Transactional(rollbackFor = Exception.class) @@ -315,7 +309,6 @@ public String getBenCaseRecordFromDoctorGeneralOPD( * entered by Doctor */ - @Operation(summary = "Update beneficiary history") @PostMapping(value = { "/update/historyScreen" }) public String updateHistoryNurse(@RequestBody String requestObj) { @@ -352,7 +345,6 @@ public String updateHistoryNurse(@RequestBody String requestObj) { * entered by Doctor */ - @Operation(summary = "Update general OPD beneficiary vitals") @PostMapping(value = { "/update/vitalScreen" }) public String updateVitalNurse(@RequestBody String requestObj) { @@ -389,7 +381,6 @@ public String updateVitalNurse(@RequestBody String requestObj) { * details entered by Doctor */ - @Operation(summary = "Update general OPD beneficiary examination data") @PostMapping(value = { "/update/examinationScreen" }) public String updateGeneralOPDExaminationNurse(@RequestBody String requestObj) { @@ -424,7 +415,7 @@ public String updateGeneralOPDExaminationNurse(@RequestBody String requestObj) { * @return success or failure response * @objective Replace General OPD doctor data for the doctor next visit */ - + @Operation(summary = "Update general OPD beneficiary case record and referral") @PostMapping(value = { "/update/doctorData" }) public String updateGeneralOPDDoctorData(@RequestBody String requestObj, diff --git a/src/main/java/com/iemr/hwc/controller/labtechnician/LabTechnicianController.java b/src/main/java/com/iemr/hwc/controller/labtechnician/LabTechnicianController.java index 008ee998..cb8a4186 100644 --- a/src/main/java/com/iemr/hwc/controller/labtechnician/LabTechnicianController.java +++ b/src/main/java/com/iemr/hwc/controller/labtechnician/LabTechnicianController.java @@ -24,11 +24,9 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.CrossOrigin; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RestController; import com.google.gson.JsonElement; @@ -39,8 +37,6 @@ import io.swagger.v3.oas.annotations.Operation; - - /*** * * @Objective Saving lab test results given by LabTechnician @@ -66,7 +62,7 @@ public void setLabTechnicianServiceImpl(LabTechnicianServiceImpl labTechnicianSe * @param JSON requestObj * @return success or failure response */ - + @Operation(summary = "Save lab test result") @PostMapping(value = { "/save/LabTestResult" }) public String saveLabTestResult(@RequestBody String requestObj) { @@ -102,7 +98,7 @@ public String saveLabTestResult(@RequestBody String requestObj) { * @param requestOBJ * @return lab tests prescribed by doctor */ - + @Operation(summary = "Get beneficiary lab test prescription") @PostMapping(value = { "/get/prescribedProceduresList" }) public String getBeneficiaryPrescribedProcedure(@RequestBody String requestOBJ) { @@ -133,7 +129,7 @@ public String getBeneficiaryPrescribedProcedure(@RequestBody String requestOBJ) } // API for getting lab result based on beneficiaryRegID and visitCode - + @Operation(summary = "Get lab test result for a beneficiary visit") @PostMapping(value = { "/get/labResultForVisitcode" }) public String getLabResultForVisitCode(@RequestBody String requestOBJ) { @@ -160,8 +156,7 @@ public String getLabResultForVisitCode(@RequestBody String requestOBJ) { } return response.toString(); } - - + @Operation(summary = "Get procedure component mapped master data") @PostMapping(value = { "/get/fetchProcCompMapMasterData" }) public String getProcedureComponentMappedMasterData(@RequestBody String requestOBJ) { @@ -174,8 +169,8 @@ public String getProcedureComponentMappedMasterData(@RequestBody String requestO if (jsnOBJ != null && !jsnOBJ.isJsonNull() && jsnOBJ.has("providerServiceMapID")) { - String s = labTechnicianServiceImpl.getProcedureComponentMappedMasterData( - jsnOBJ.get("providerServiceMapID").getAsLong()); + String s = labTechnicianServiceImpl + .getProcedureComponentMappedMasterData(jsnOBJ.get("providerServiceMapID").getAsLong()); if (s != null) response.setResponse(s); else @@ -190,5 +185,4 @@ public String getProcedureComponentMappedMasterData(@RequestBody String requestO return response.toString(); } - } diff --git a/src/main/java/com/iemr/hwc/controller/location/LocationController.java b/src/main/java/com/iemr/hwc/controller/location/LocationController.java index 6cd88feb..a6336635 100644 --- a/src/main/java/com/iemr/hwc/controller/location/LocationController.java +++ b/src/main/java/com/iemr/hwc/controller/location/LocationController.java @@ -25,7 +25,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.CrossOrigin; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PostMapping; @@ -40,7 +39,6 @@ import io.swagger.v3.oas.annotations.Operation; - @RestController @RequestMapping(value = "/location", headers = "Authorization", consumes = "application/json", produces = "application/json") public class LocationController { @@ -179,7 +177,7 @@ public String getVillageByDistrictID(@PathVariable("districtID") Integer distric * @param comingRequest * @return */ - + @Operation(summary = "Get location details from service point id and provider service map id") @PostMapping(value = "/getLocDetailsBasedOnSpIDAndPsmID", produces = { "application/json" }) public String getLocDetailsBasedOnSpIDAndPsmIDNew(@RequestBody String comingRequest) { 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 cb20b786..c95dc95f 100644 --- a/src/main/java/com/iemr/hwc/controller/ncdCare/NCDCareController.java +++ b/src/main/java/com/iemr/hwc/controller/ncdCare/NCDCareController.java @@ -30,7 +30,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.repository.query.Param; import org.springframework.transaction.annotation.Transactional; -import org.springframework.web.bind.annotation.CrossOrigin; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestHeader; @@ -45,9 +44,6 @@ import io.swagger.v3.oas.annotations.Operation; - - - /** * * @Objective Saving NCD Care data for Nurse and Doctor. @@ -67,7 +63,7 @@ public class NCDCareController { * @return success or failure response * @throws Exception */ - + @Operation(summary = "Save NCD care data collected by nurse") @PostMapping(value = { "/save/nurseData" }) public String saveBenNCDCareNurseData(@RequestBody String requestObj, @@ -103,7 +99,7 @@ public String saveBenNCDCareNurseData(@RequestBody String requestObj, * @param JSON requestObj * @return success or failure response */ - + @Operation(summary = "Save NCD care beneficiary case record and referral") @PostMapping(value = { "/save/doctorData" }) public String saveBenNCDCareDoctorData(@RequestBody String requestObj, @@ -141,7 +137,6 @@ public String saveBenNCDCareDoctorData(@RequestBody String requestObj, * @return visit details in JSON format */ - () @Operation(summary = "Get NCD care beneficiary visit details") @PostMapping(value = { "/getBenVisitDetailsFrmNurseNCDCare" }) @Transactional(rollbackFor = Exception.class) @@ -175,7 +170,6 @@ public String getBenVisitDetailsFrmNurseNCDCare( * @param comingRequest * @return visit details in JSON format */ - () @Operation(summary = "Get NCD Care beneficiary history") @PostMapping(value = { "/getBenNCDCareHistoryDetails" }) @@ -209,7 +203,6 @@ public String getBenNCDCareHistoryDetails( * @return visit details in JSON format */ - () @Operation(summary = "Get NCD Care beneficiary vitals") @PostMapping(value = { "/getBenVitalDetailsFrmNurseNCDCare" }) public String getBenVitalDetailsFrmNurseNCDCare( @@ -242,7 +235,7 @@ public String getBenVitalDetailsFrmNurseNCDCare( * @param comingRequest * @return visit details in JSON format */ - () + @Operation(summary = "Get NCD care beneficiary case record and referral") @PostMapping(value = { "/getBenCaseRecordFromDoctorNCDCare" }) @Transactional(rollbackFor = Exception.class) @@ -279,7 +272,6 @@ public String getBenCaseRecordFromDoctorNCDCare( * entered by Doctor */ - @Operation(summary = "Update NCD care beneficiary history") @PostMapping(value = { "/update/historyScreen" }) public String updateHistoryNurse(@RequestBody String requestObj) { @@ -318,7 +310,6 @@ public String updateHistoryNurse(@RequestBody String requestObj) { * entered by Doctor */ - @Operation(summary = "Update NCD care beneficiary vitals") @PostMapping(value = { "/update/vitalScreen" }) public String updateVitalNurse(@RequestBody String requestObj) { @@ -353,7 +344,7 @@ public String updateVitalNurse(@RequestBody String requestObj) { * @return success or failure response * @objective Replace NCD Care doctor data for the doctor next visit */ - + @Operation(summary = "Update NCD care beneficiary case record and referral") @PostMapping(value = { "/update/doctorData" }) public String updateNCDCareDoctorData(@RequestBody String requestObj, 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 73bbaa0e..93ba431b 100644 --- a/src/main/java/com/iemr/hwc/controller/ncdscreening/NCDScreeningController.java +++ b/src/main/java/com/iemr/hwc/controller/ncdscreening/NCDScreeningController.java @@ -27,14 +27,12 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.repository.query.Param; import org.springframework.transaction.annotation.Transactional; -import org.springframework.web.bind.annotation.CrossOrigin; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestHeader; import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RestController; import com.google.gson.JsonElement; @@ -48,9 +46,6 @@ import io.swagger.v3.oas.annotations.Operation; - - - /** * * @Objective Saving NCD Screening nurse data. @@ -74,7 +69,7 @@ public class NCDScreeningController { * @return success or failure response * @throws Exception */ - + @Operation(summary = "Save NCD screening beneficiary data collected by nurse") @PostMapping(value = { "/save/nurseData" }) @@ -106,7 +101,6 @@ public String saveBeneficiaryNCDScreeningDetails(@RequestBody String requestObj, return response.toString(); } - @Operation(summary = "Save NCD screening beneficiary data collected by doctor") @PostMapping(value = { "/save/doctorData" }) public String saveBenNCDScreeningDoctorData(@RequestBody String requestObj, @@ -143,7 +137,7 @@ public String saveBenNCDScreeningDoctorData(@RequestBody String requestObj, * @param benRegID and benVisitID * @return NCD Screening nurse data in JSON format */ - + @Operation(summary = "Get NCD screening beneficiary visit details") @PostMapping(value = { "/get/nurseData" }) public String getNCDScreenigDetails( @@ -170,7 +164,6 @@ public String getNCDScreenigDetails( return response.toString(); } - @Operation(summary = "Get NCD screening visit count for beneficiary register id") @GetMapping(value = { "/getNcdScreeningVisitCount/{beneficiaryRegID}" }) public String getNcdScreeningVisitCount(@PathVariable("beneficiaryRegID") Long beneficiaryRegID) { @@ -198,7 +191,7 @@ public String getNcdScreeningVisitCount(@PathVariable("beneficiaryRegID") Long b * @param comingRequest * @return visit details in JSON format */ - + @Operation(summary = "Get NCD screening beneficiary case record and referral") @PostMapping(value = { "/getBenCaseRecordFromDoctorNCDScreening" }) @Transactional(rollbackFor = Exception.class) @@ -227,7 +220,6 @@ public String getBenCaseRecordFromDoctorNCDCare( return response.toString(); } - @Operation(summary = "Get NCD screening beneficiary visit details") @PostMapping(value = { "/getBenVisitDetailsFrmNurseNCDScreening" }) @Transactional(rollbackFor = Exception.class) @@ -256,7 +248,6 @@ public String getBenVisitDetailsFrmNurseGOPD( return response.toString(); } - @Operation(summary = "Get NCD screening beneficiary general OPD history") @PostMapping(value = { "/getBenHistoryDetails" }) @@ -284,7 +275,6 @@ public String getBenHistoryDetails( return response.toString(); } - @Operation(summary = "Get NCD screening beneficiary vitals from general OPD nurse") @PostMapping(value = { "/getBenVitalDetailsFrmNurse" }) public String getBenVitalDetailsFrmNurse( @@ -312,7 +302,6 @@ public String getBenVitalDetailsFrmNurse( return response.toString(); } - @Operation(summary = "Get NCD screening IDRS details from general OPD nurse") @PostMapping(value = { "/getBenIdrsDetailsFrmNurse" }) public String getBenIdrsDetailsFrmNurse( @@ -341,7 +330,6 @@ public String getBenIdrsDetailsFrmNurse( return response.toString(); } - @Operation(summary = "Get confirmed NCD diseases") @PostMapping(value = { "/fetchConfirmedScreeningDisease" }) public String fetchConfirmedScreeningDisease( @@ -360,7 +348,7 @@ public String fetchConfirmedScreeningDisease( } // get NCD screening data - dia, htn, oral, breast, cervical - + @Operation(summary = "Get NCD screening beneficiary data - dia, htn, oral, breast, cervical") @PostMapping(value = { "/get/ncd/screening/data" }) public String getNCDScreeningData( @@ -382,7 +370,6 @@ public String getNCDScreeningData( return response.toStringWithSerializeNulls(); } - @Operation(summary = "Get NCD screening beneficiary CBAC details") @PostMapping(value = { "/getCbacDetails" }) public String getCbacDetails( @@ -410,7 +397,7 @@ public String getCbacDetails( * * NOT using as of now */ - + @Operation(summary = "Update NCD screening beneficiary details") @PostMapping(value = { "/update/nurseData" }) public String updateBeneficiaryNCDScreeningDetails(@RequestBody String requestObj) { @@ -445,7 +432,7 @@ public String updateBeneficiaryNCDScreeningDetails(@RequestBody String requestOb /* * Updating the history WDF requirement */ - + @Operation(summary = "Update NCD screening beneficiary history") @PostMapping(value = { "/update/historyScreen" }) public String updateHistoryNurse(@RequestBody String requestObj) { @@ -474,7 +461,6 @@ public String updateHistoryNurse(@RequestBody String requestObj) { return response.toString(); } - @Operation(summary = "Update NCD screening beneficiary vitals") @PostMapping(value = { "/update/vitalScreen" }) public String updateVitalNurse(@RequestBody String requestObj) { @@ -503,7 +489,6 @@ public String updateVitalNurse(@RequestBody String requestObj) { return response.toString(); } - @Operation(summary = "Update NCD screening beneficiary history") @PostMapping(value = { "/update/idrsScreen" }) public String updateIDRSScreen(@RequestBody String requestObj) { @@ -532,7 +517,6 @@ public String updateIDRSScreen(@RequestBody String requestObj) { return response.toString(); } - @Operation(summary = "Update NCD screening beneficiary case record and referral") @PostMapping(value = { "/update/doctorData" }) public String updateDoctorData(@RequestBody String requestObj, @@ -560,7 +544,6 @@ public String updateDoctorData(@RequestBody String requestObj, return response.toString(); } - @Operation(summary = "Update NCD screening beneficiary data") @PostMapping(value = { "/update/ncd/screening/data" }) public String updateNCDScreeningData(@RequestBody String requestObj) { 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 cd6eb114..f8339055 100644 --- a/src/main/java/com/iemr/hwc/controller/neonatal/NeonatalController.java +++ b/src/main/java/com/iemr/hwc/controller/neonatal/NeonatalController.java @@ -29,12 +29,10 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.repository.query.Param; import org.springframework.transaction.annotation.Transactional; -import org.springframework.web.bind.annotation.CrossOrigin; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestHeader; import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RestController; import com.google.gson.JsonElement; @@ -47,10 +45,6 @@ import io.swagger.v3.oas.annotations.Operation; - - - - @RestController @RequestMapping(value = "/neonatal-infant-services", headers = "Authorization", consumes = "application/json", produces = "application/json") public class NeonatalController { @@ -66,7 +60,7 @@ public class NeonatalController { * @return success or failure response with visit code * @throws Exception */ - + @Operation(summary = "Save neonatal infant nurse data") @PostMapping(value = { "/save/nurseData" }) public String saveBenNeoNatalAndInfantNurseData(@RequestBody String requestObj, @@ -101,7 +95,6 @@ public String saveBenNeoNatalAndInfantNurseData(@RequestBody String requestObj, return response.toString(); } - @Operation(summary = "Save neonatal infant doctor data") @PostMapping(value = { "save-neo-natal-doctor-data" }) public String saveNNIDoctorData(@RequestBody String requestObj, @@ -135,7 +128,7 @@ public String saveNNIDoctorData(@RequestBody String requestObj, * @param comingRequest * @return visit details in JSON format */ - + @Operation(summary = "Get neonatal infant beneficiary visit details") @PostMapping(value = { "/getBenVisitDetailsFrmNurseNNI" }) @Transactional(rollbackFor = Exception.class) @@ -169,7 +162,7 @@ public String getBenVisitDetailsFrmNurseNNI( * @param comingRequest * @return vital details in JSON format */ - + @Operation(summary = "Get neonatal infant beneficiary vitals") @PostMapping(value = { "/getBenVitalDetailsFrmNurse" }) public String getBenVitalDetailsFrmNurse( @@ -202,7 +195,7 @@ public String getBenVitalDetailsFrmNurse( * @param comingRequest * @return history details in JSON format */ - + @Operation(summary = "Get neonatal infant beneficiary history") @PostMapping(value = { "/getBenHistoryDetails" }) @@ -235,7 +228,7 @@ public String getBenHistoryDetails( * "30022000171431" } * @return immunization service details in JSON format */ - + @Operation(summary = "Get neonatal infant beneficiary immunization service details") @PostMapping(value = { "/getBenImmunizationServiceDetails" }) @@ -268,7 +261,7 @@ public String getBenImmunizationServiceDetails( * @param comingRequest * @return doctor details in JSON format */ - + @Operation(summary = "Get neonatal infant beneficiary case record and referral") @PostMapping(value = { "/getBenCaseRecordFromDoctor" }) @Transactional(rollbackFor = Exception.class) @@ -297,7 +290,6 @@ public String getBenCaseRecordFromDoctor( return response.toString(); } - @Operation(summary = "Update neonatal infant beneficiary vitals") @PostMapping(value = { "/update/vitalScreen" }) public String updateVitalNurseNNI(@RequestBody String requestObj) { @@ -326,7 +318,6 @@ public String updateVitalNurseNNI(@RequestBody String requestObj) { return response.toString(); } - @Operation(summary = "Update neonatal infant birth and immunization history") @PostMapping(value = { "/update/BirthAndImmunizationHistoryScreen" }) public String updateBirthAndImmunizationHistoryNurse(@RequestBody String requestObj) { @@ -355,7 +346,6 @@ public String updateBirthAndImmunizationHistoryNurse(@RequestBody String request return response.toString(); } - @Operation(summary = "Update neonatal infant immunization services") @PostMapping(value = { "/update/ImmunizationServicesScreen" }) public String updateImmunizationServicesNurse(@RequestBody String requestObj) { @@ -384,7 +374,6 @@ public String updateImmunizationServicesNurse(@RequestBody String requestObj) { return response.toString(); } - @Operation(summary = "Update neonatal infant data collected by doctor") @PostMapping(value = { "/update/doctorData" }) public String updateNNIDoctorData(@RequestBody String requestObj, diff --git a/src/main/java/com/iemr/hwc/controller/patientApp/master/PatientAppCommonMasterController.java b/src/main/java/com/iemr/hwc/controller/patientApp/master/PatientAppCommonMasterController.java index 1ca2b227..8ed93fbb 100644 --- a/src/main/java/com/iemr/hwc/controller/patientApp/master/PatientAppCommonMasterController.java +++ b/src/main/java/com/iemr/hwc/controller/patientApp/master/PatientAppCommonMasterController.java @@ -24,7 +24,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.CrossOrigin; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PostMapping; @@ -40,7 +39,6 @@ import io.swagger.v3.oas.annotations.Operation; import jakarta.ws.rs.core.MediaType; - @RestController @RequestMapping(value = "/master", headers = "Authorization", consumes = "application/json", produces = "application/json") @@ -84,7 +82,6 @@ public String patientAppCovidMasterData(@PathVariable("visitCategoryID") Integer return response.toString(); } - @Operation(summary = "Save COVID data in patient app") @PostMapping(value = { "/save/covidScreeningDataPatientApp" }) public String saveBenCovidDoctorDataPatientApp(@RequestBody String requestObj, @@ -104,7 +101,6 @@ public String saveBenCovidDoctorDataPatientApp(@RequestBody String requestObj, return response.toString(); } - @Operation(summary = "Save chief-complaints data in patient app") @PostMapping(value = { "/save/chiefComplaintsDataPatientApp" }) public String saveBenChiefComplaintsDataPatientApp(@RequestBody String requestObj, @@ -124,7 +120,6 @@ public String saveBenChiefComplaintsDataPatientApp(@RequestBody String requestOb return response.toString(); } - @Operation(summary = "Save tele-consultation slot data in patient app") @PostMapping(value = { "/save/tcSlotDetailsDataPatientApp" }) public String saveTCSlotDataPatientApp(@RequestBody String requestObj, @@ -157,7 +152,6 @@ public String patientAppMasterData(@PathVariable("stateID") Integer stateID) { return response.toString(); } - @Operation(summary = "Get patient episode data for specialist in patient app") @PostMapping(value = { "/get/getPatientEpisodeData" }) public String getPatientEpisodeDataMobileApp(@RequestBody String requestObj, @@ -179,7 +173,6 @@ public String getPatientEpisodeDataMobileApp(@RequestBody String requestObj, return response.toString(); } - @Operation(summary = "Get patient booked slot data in patient app") @PostMapping(value = { "/get/getPatientBookedSlotDetails" }) public String getPatientBookedSlotDetails(@RequestBody String requestObj, @@ -201,7 +194,6 @@ public String getPatientBookedSlotDetails(@RequestBody String requestObj, return response.toString(); } - @Operation(summary = "Save specialist diagnosis data in patient app") @PostMapping(value = { "/save/saveSpecialistDiagnosisData" }) public String saveSpecialistDiagnosisData(@RequestBody String requestObj, @@ -223,7 +215,6 @@ public String saveSpecialistDiagnosisData(@RequestBody String requestObj, return response.toString(); } - @Operation(summary = "Get specialist diagnosis data in patient app") @PostMapping(value = { "/save/getSpecialistDiagnosisData" }) public String getSpecialistDiagnosisData(@RequestBody String requestObj, @@ -245,7 +236,6 @@ public String getSpecialistDiagnosisData(@RequestBody String requestObj, return response.toString(); } - @Operation(summary = "Get last 3 episode data of the patient in patient app") @PostMapping(value = { "/get/getPatientsEpisodes" }) public String getPatientsLast_3_Episode(@RequestBody String requestObj, 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 6dbb4c3b..22e906b3 100644 --- a/src/main/java/com/iemr/hwc/controller/pnc/PostnatalCareController.java +++ b/src/main/java/com/iemr/hwc/controller/pnc/PostnatalCareController.java @@ -27,12 +27,10 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.repository.query.Param; import org.springframework.transaction.annotation.Transactional; -import org.springframework.web.bind.annotation.CrossOrigin; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestHeader; import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RestController; import com.google.gson.JsonElement; @@ -43,9 +41,6 @@ import io.swagger.v3.oas.annotations.Operation; - - - /** * * @Objective Saving PNC nurse and doctor data @@ -70,7 +65,6 @@ public void setPncServiceImpl(PNCServiceImpl pncServiceImpl) { * @throws Exception */ - @Operation(summary = "Save PNC nurse data") @PostMapping(value = { "/save/nurseData" }) public String saveBenPNCNurseData(@RequestBody String requestObj, @@ -108,7 +102,6 @@ public String saveBenPNCNurseData(@RequestBody String requestObj, * @return success or failure response */ - @Operation(summary = "Save PNC doctor data") @PostMapping(value = { "/save/doctorData" }) public String saveBenPNCDoctorData(@RequestBody String requestObj, @@ -144,7 +137,7 @@ public String saveBenPNCDoctorData(@RequestBody String requestObj, * @param comingRequest * @return visit details in JSON format */ - () + @Operation(summary = "Get PNC beneficiary visit details from nurse") @PostMapping(value = { "/getBenVisitDetailsFrmNursePNC" }) @Transactional(rollbackFor = Exception.class) @@ -178,7 +171,6 @@ public String getBenVisitDetailsFrmNursePNC( * @param comingRequest * @return PNC Care data in JSON format */ - () @Operation(summary = "Get PNC beneficiary details from nurse") @PostMapping(value = { "/getBenPNCDetailsFrmNursePNC" }) @Transactional(rollbackFor = Exception.class) @@ -215,7 +207,6 @@ public String getBenPNCDetailsFrmNursePNC( * @param comingRequest * @return history data in JSON format */ - () @Operation(summary = "Get PNC bneficiary history from nurse") @PostMapping(value = { "/getBenHistoryDetails" }) @@ -248,7 +239,6 @@ public String getBenHistoryDetails( * @param comingRequest * @return vital data in JSON format */ - () @Operation(summary = "Get PNC beneficiary vitals from nurse") @PostMapping(value = { "/getBenVitalDetailsFrmNurse" }) public String getBenVitalDetailsFrmNurse( @@ -281,7 +271,6 @@ public String getBenVitalDetailsFrmNurse( * @param comingRequest * @return examination data in JSON format */ - () @Operation(summary = "Get PNC beneficiary examination details from nurse") @PostMapping(value = { "/getBenExaminationDetailsPNC" }) @@ -314,7 +303,6 @@ public String getBenExaminationDetailsPNC( * @param comingRequest * @return doctor data in JSON format */ - () @Operation(summary = "Get PNC beneficiary case record") @PostMapping(value = { "/getBenCaseRecordFromDoctorPNC" }) @Transactional(rollbackFor = Exception.class) @@ -351,7 +339,6 @@ public String getBenCaseRecordFromDoctorPNC( * Doctor */ - @Operation(summary = "Update PNC doctor data") @PostMapping(value = { "/update/PNCScreen" }) public String updatePNCCareNurse(@RequestBody String requestObj) { @@ -388,7 +375,6 @@ public String updatePNCCareNurse(@RequestBody String requestObj) { * by Doctor */ - @Operation(summary = "Update PNC beneficiary history") @PostMapping(value = { "/update/historyScreen" }) public String updateHistoryNurse(@RequestBody String requestObj) { @@ -425,7 +411,6 @@ public String updateHistoryNurse(@RequestBody String requestObj) { * by Doctor */ - @Operation(summary = "Update PNC beneficiary vitals") @PostMapping(value = { "/update/vitalScreen" }) public String updateVitalNurse(@RequestBody String requestObj) { @@ -462,7 +447,6 @@ public String updateVitalNurse(@RequestBody String requestObj) { * entered by Doctor */ - @Operation(summary = "Update PNC examination data") @PostMapping(value = { "/update/examinationScreen" }) public String updateGeneralOPDExaminationNurse(@RequestBody String requestObj) { @@ -491,7 +475,6 @@ public String updateGeneralOPDExaminationNurse(@RequestBody String requestObj) { return response.toString(); } - @Operation(summary = "Update PNC doctor data") @PostMapping(value = { "/update/doctorData" }) public String updatePNCDoctorData(@RequestBody String requestObj, 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 bc38a514..b92de4c9 100644 --- a/src/main/java/com/iemr/hwc/controller/quickconsult/QuickConsultController.java +++ b/src/main/java/com/iemr/hwc/controller/quickconsult/QuickConsultController.java @@ -27,12 +27,10 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.repository.query.Param; import org.springframework.transaction.annotation.Transactional; -import org.springframework.web.bind.annotation.CrossOrigin; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestHeader; import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RestController; import com.google.gson.JsonElement; @@ -45,9 +43,6 @@ import io.swagger.v3.oas.annotations.Operation; - - - /** * * @Objective Saving general OPD quick consult data for Nurse and Doctor both. @@ -75,7 +70,7 @@ public void setQuickConsultationServiceImpl(QuickConsultationServiceImpl quickCo * Beneficiary Vital and Anthropometry Detail Object and pushed to * Database table */ - + @Operation(summary = "Save quick consult nurse data") @PostMapping(value = { "/save/nurseData" }) public String saveBenQuickConsultDataNurse(@RequestBody String requestObj, @@ -112,7 +107,6 @@ public String saveBenQuickConsultDataNurse(@RequestBody String requestObj, * @objective Save beneficiary data for doctor quick consult - QC. */ - @Operation(summary = "Save quick consult details for doctor") @PostMapping(value = { "/save/doctorData" }) public String saveQuickConsultationDetail( @@ -158,7 +152,6 @@ public String saveQuickConsultationDetail( * @return visit details in JSON format */ - () @Operation(summary = "Get quick consult beneficiary visit details") @PostMapping(value = { "/getBenDataFrmNurseToDocVisitDetailsScreen" }) public String getBenDataFrmNurseScrnToDocScrnVisitDetails( @@ -191,7 +184,6 @@ public String getBenDataFrmNurseScrnToDocScrnVisitDetails( * @return visit details in JSON format */ - () @Operation(summary = "Get quick consult beneficiary vital details") @PostMapping(value = { "/getBenVitalDetailsFrmNurse" }) public String getBenVitalDetailsFrmNurse( @@ -224,7 +216,7 @@ public String getBenVitalDetailsFrmNurse( * @param benRegID and benVisitID * @return visit details in JSON format */ - () + @Operation(summary = "Get quick consult beneficiary case record") @PostMapping(value = { "/getBenCaseRecordFromDoctorQuickConsult" }) @Transactional(rollbackFor = Exception.class) @@ -261,7 +253,6 @@ public String getBenCaseRecordFromDoctorQuickConsult( * */ - @Operation(summary = "Update quick consult doctor data") @PostMapping(value = { "/update/doctorData" }) public String updateGeneralOPDQCDoctorData(@RequestBody String requestObj, diff --git a/src/main/java/com/iemr/hwc/controller/registrar/main/RegistrarController.java b/src/main/java/com/iemr/hwc/controller/registrar/main/RegistrarController.java index 27cc9ccb..679529cd 100644 --- a/src/main/java/com/iemr/hwc/controller/registrar/main/RegistrarController.java +++ b/src/main/java/com/iemr/hwc/controller/registrar/main/RegistrarController.java @@ -30,12 +30,10 @@ import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.repository.query.Param; -import org.springframework.web.bind.annotation.CrossOrigin; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestHeader; import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RestController; import com.google.gson.Gson; @@ -52,10 +50,6 @@ import io.swagger.v3.oas.annotations.Operation; - - - - @RestController @RequestMapping(value = "/registrar", headers = "Authorization", consumes = "application/json", produces = "application/json") /** @@ -86,7 +80,7 @@ public void setNurseServiceImpl(NurseServiceImpl nurseServiceImpl) { } // Registrar Work List API ..... - + @Operation(summary = "Get registrar worklist data") @PostMapping(value = { "/registrarWorkListData" }) public String getRegistrarWorkList(@Param(value = "{\"spID\": \"Integer\"}") @RequestBody String comingRequest) @@ -106,11 +100,10 @@ public String getRegistrarWorkList(@Param(value = "{\"spID\": \"Integer\"}") @Re } // Registrar Quick search ..... - + @Operation(summary = "Search for beneficiary based on beneficiary id") @PostMapping(value = { "/quickSearch" }) - public String quickSearchBeneficiary( - @Param(value = "{\"benID\": \"String\"}") @RequestBody String comingRequest) { + public String quickSearchBeneficiary(@Param(value = "{\"benID\": \"String\"}") @RequestBody String comingRequest) { OutputResponse response = new OutputResponse(); logger.info("quickSearchBeneficiary request:" + comingRequest); try { @@ -126,7 +119,7 @@ public String quickSearchBeneficiary( } // Registrar Advance search ..... - + @Operation(summary = "Search for beneficiary based on provided data") @PostMapping(value = { "/advanceSearch" }) public String advanceSearch( @@ -149,7 +142,7 @@ public String advanceSearch( } // API for left side ben data - + @Operation(summary = "Get beneficiary details based on beneficiary register id") @PostMapping(value = { "/get/benDetailsByRegID" }) public String getBenDetailsByRegID( @@ -180,7 +173,6 @@ public String getBenDetailsByRegID( return response.toString(); } - @Operation(summary = "Get beneficiary details") @PostMapping(value = { "/get/beneficiaryDetails" }) public String getBeneficiaryDetails( @@ -216,7 +208,6 @@ public String getBeneficiaryDetails( return response.toString(); } - @Operation(summary = "Get beneficiary image") @PostMapping(value = { "/get/beneficiaryImage" }) public String getBeneficiaryImage( @@ -244,7 +235,7 @@ public String getBeneficiaryImage( } // beneficiary quick search new integrated with common and identity - + @Operation(summary = "Search beneficiary based on beneficiary id or beneficiary phone number") @PostMapping(value = { "/quickSearchNew" }) public String quickSearchNew(@RequestBody String requestObj, @@ -268,7 +259,7 @@ public String quickSearchNew(@RequestBody String requestObj, } // beneficiary Advance search new integrated with common and identity - + @Operation(summary = "Beneficiary advance search integrated with common and identity API") @PostMapping(value = { "/advanceSearchNew" }) public String advanceSearchNew(@RequestBody String requestObj, @@ -291,7 +282,6 @@ public String advanceSearchNew(@RequestBody String requestObj, } - @Operation(summary = "Beneficiary advance search") @PostMapping(value = { "/benAdvanceSearchNew" }) public String benAdvanceSearchNew(@RequestBody String requestObj, @@ -315,7 +305,7 @@ public String benAdvanceSearchNew(@RequestBody String requestObj, } // Get Beneficiary Details for left side panel of given beneficiaryRegID new - + @Operation(summary = "Get beneficiary details for side panel") @PostMapping(value = { "/get/benDetailsByRegIDForLeftPanelNew" }) public String getBenDetailsForLeftSidePanelByRegID( @@ -348,7 +338,7 @@ public String getBenDetailsForLeftSidePanelByRegID( } // new api for ben image - + @Operation(summary = "Get beneficiary image") @PostMapping(value = { "/getBenImage" }) public String getBenImage(@RequestBody String requestObj, @@ -366,7 +356,7 @@ public String getBenImage(@RequestBody String requestObj, } // Registrar Beneficiary Registration API ..... - + @Operation(summary = "Register a new beneficiary") @PostMapping(value = { "/registrarBeneficaryRegistration" }) public String createBeneficiary( @@ -429,7 +419,7 @@ public String createBeneficiary( } // beneficiary registration with common and identity new - + @Operation(summary = "Register a new beneficiary new API") @PostMapping(value = { "/registrarBeneficaryRegistrationNew" }) public String registrarBeneficaryRegistrationNew(@RequestBody String comingReq, @@ -448,7 +438,7 @@ public String registrarBeneficaryRegistrationNew(@RequestBody String comingReq, } // Registrar Beneficiary Registration API ..... - + @Operation(summary = "Update registered beneficiary data") @PostMapping(value = { "/update/BeneficiaryDetails" }) public String updateBeneficiary( diff --git a/src/main/java/com/iemr/hwc/controller/teleconsultation/TeleConsultationController.java b/src/main/java/com/iemr/hwc/controller/teleconsultation/TeleConsultationController.java index fe9324cb..a7591670 100644 --- a/src/main/java/com/iemr/hwc/controller/teleconsultation/TeleConsultationController.java +++ b/src/main/java/com/iemr/hwc/controller/teleconsultation/TeleConsultationController.java @@ -24,7 +24,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.CrossOrigin; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestHeader; @@ -47,7 +46,6 @@ public class TeleConsultationController { @Autowired private TeleConsultationServiceImpl teleConsultationServiceImpl; - @Operation(summary = "Update beneficiary arrival status based on request") @PostMapping(value = { "/update/benArrivalStatus" }) public String benArrivalStatusUpdater(@RequestBody String requestOBJ) { @@ -68,7 +66,6 @@ public String benArrivalStatusUpdater(@RequestBody String requestOBJ) { return response.toString(); } - @Operation(summary = "Update beneficiary status based on request") @PostMapping(value = { "/cancel/benTCRequest" }) public String updateBeneficiaryStatusToCancelTCRequest(@RequestBody String requestOBJ, @@ -91,7 +88,6 @@ public String updateBeneficiaryStatusToCancelTCRequest(@RequestBody String reque return response.toString(); } - @Operation(summary = "Check if specialist can proceed with beneficiary") @PostMapping(value = { "/check/benTCRequestStatus" }) public String checkBeneficiaryStatusToProceedWithSpecialist(@RequestBody String requestOBJ) { @@ -112,7 +108,6 @@ public String checkBeneficiaryStatusToProceedWithSpecialist(@RequestBody String return response.toString(); } - @Operation(summary = "Create teleconsultation request from worklist") @PostMapping(value = { "/create/benTCRequestWithVisitCode" }) public String createTCRequestForBeneficiary(@RequestBody String requestOBJ, @RequestHeader String Authorization) { @@ -139,7 +134,7 @@ public String createTCRequestForBeneficiary(@RequestBody String requestOBJ, @Req } // TC request List - + @Operation(summary = "Get teleconsultation request list for a specialist") @PostMapping(value = { "/getTCRequestList" }) public String getTCSpecialistWorkListNew(@RequestBody String requestOBJ) { @@ -169,7 +164,6 @@ public String getTCSpecialistWorkListNew(@RequestBody String requestOBJ) { return response.toString(); } - @Operation(summary = "Update first consultation start time") @PostMapping(value = { "/startconsultation" }) public String startconsultation(@RequestBody String requestOBJ) { diff --git a/src/main/java/com/iemr/hwc/controller/wo/LocationControllerWo.java b/src/main/java/com/iemr/hwc/controller/wo/LocationControllerWo.java index f81adae0..8f5955ff 100644 --- a/src/main/java/com/iemr/hwc/controller/wo/LocationControllerWo.java +++ b/src/main/java/com/iemr/hwc/controller/wo/LocationControllerWo.java @@ -21,15 +21,6 @@ */ package com.iemr.hwc.controller.wo; -import com.google.gson.JsonElement; -import com.google.gson.JsonObject; -import com.google.gson.JsonParser; -import com.iemr.hwc.controller.common.master.CommonMasterController; -import com.iemr.hwc.service.location.LocationServiceImpl; -import com.iemr.hwc.utils.response.OutputResponse; - -import io.swagger.v3.oas.annotations.Operation; - import org.json.JSONObject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -38,8 +29,21 @@ import org.springframework.http.ResponseEntity; import org.springframework.util.LinkedMultiValueMap; import org.springframework.util.MultiValueMap; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; +import com.google.gson.JsonElement; +import com.google.gson.JsonObject; +import com.google.gson.JsonParser; +import com.iemr.hwc.controller.common.master.CommonMasterController; +import com.iemr.hwc.service.location.LocationServiceImpl; +import com.iemr.hwc.utils.response.OutputResponse; + +import io.swagger.v3.oas.annotations.Operation; @RestController @RequestMapping(value = "wo/location") @@ -136,7 +140,7 @@ public String getVillageByDistrictID(@PathVariable("districtID") Integer distric * @param comingRequest * @return */ - + @Operation(summary = "Get location details from service point id and provider service map id") @PostMapping(value = "/getLocDetailsBasedOnSpIDAndPsmID/wo", produces = { "application/json" }) public String getLocDetailsBasedOnSpIDAndPsmIDNew(@RequestBody String comingRequest) { @@ -158,7 +162,6 @@ public String getLocDetailsBasedOnSpIDAndPsmIDNew(@RequestBody String comingRequ return response.toString(); } - @Operation(summary = "Update health and wellness center coordinates") @PostMapping(value = { "/update/villageCoordinates" }) public String updateGeolocationVillage(@RequestBody String requestObj) { diff --git a/src/main/java/com/iemr/hwc/controller/wo/UserBiomectrics.java b/src/main/java/com/iemr/hwc/controller/wo/UserBiomectrics.java index 82ba0764..5adb514b 100644 --- a/src/main/java/com/iemr/hwc/controller/wo/UserBiomectrics.java +++ b/src/main/java/com/iemr/hwc/controller/wo/UserBiomectrics.java @@ -21,6 +21,16 @@ */ package com.iemr.hwc.controller.wo; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + import com.google.gson.Gson; import com.iemr.hwc.controller.common.master.CommonMasterController; import com.iemr.hwc.data.registrar.FingerPrintDTO; @@ -30,72 +40,61 @@ import io.swagger.v3.oas.annotations.Operation; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; - -import java.util.List; - - @RestController @RequestMapping(value = "wo/user_biometrics") public class UserBiomectrics { - // private OutputResponse response; - private Logger logger = LoggerFactory.getLogger(CommonMasterController.class); + // private OutputResponse response; + private Logger logger = LoggerFactory.getLogger(CommonMasterController.class); + + @Autowired + private RegistrarServiceImpl registrarService; - @Autowired - private RegistrarServiceImpl registrarService; - - @Operation(summary = "add fingerprint for a given username") - @PostMapping(value = "add/fingerprint/wo", produces = { - "application/json" }) - public String addFingerPrints(@RequestBody FingerPrintDTO comingRequest) { - OutputResponse response = new OutputResponse(); - try { - if (comingRequest != null && comingRequest.getUserName() != null) { - String resp = registrarService.saveFingerprints(comingRequest); - if(resp !=null && resp.equals("ok")){ - response.setResponse(resp); - } - else if(resp !=null && resp.equals("ko")){ - response.setError(500, "Error adding fingerprints"); - } - } else { - response.setError(400, "Invalid request"); - } - } catch (Exception e) { - logger.error(e.getMessage()); - response.setError(500, "Error while adding fingerprints data"); - } - return response.toString(); - } + @Operation(summary = "add fingerprint for a given username") + @PostMapping(value = "add/fingerprint/wo", produces = { "application/json" }) + public String addFingerPrints(@RequestBody FingerPrintDTO comingRequest) { + OutputResponse response = new OutputResponse(); + try { + if (comingRequest != null && comingRequest.getUserName() != null) { + String resp = registrarService.saveFingerprints(comingRequest); + if (resp != null && resp.equals("ok")) { + response.setResponse(resp); + } else if (resp != null && resp.equals("ko")) { + response.setError(500, "Error adding fingerprints"); + } + } else { + response.setError(400, "Invalid request"); + } + } catch (Exception e) { + logger.error(e.getMessage()); + response.setError(500, "Error while adding fingerprints data"); + } + return response.toString(); + } - @Operation(summary = "Get fingerprint by username") - @GetMapping(value = "/get/fingerprint/{userID}/wo") - public String getFingerprintsByUsername(@PathVariable("userID") Long userID) { - logger.info("Get fingerprint by username ..." + userID); - OutputResponse response = new OutputResponse(); - UserBiometricsMapping user = registrarService.getFingerprintsByUserID(userID); - if (user != null){ - Gson gson = new Gson(); - UserBiometricsMapping userBiometricsMapping = new UserBiometricsMapping(); - userBiometricsMapping.setUserID(user.getUserID()); - userBiometricsMapping.setFirstName(user.getFirstName()); - userBiometricsMapping.setLastName(user.getLastName()); - userBiometricsMapping.setUserName(user.getUserName()); - userBiometricsMapping.setCreatedBy(user.getUserName()); - userBiometricsMapping.setRightThumb(user.getRightThumb()); - userBiometricsMapping.setRightIndexFinger(user.getRightIndexFinger()); - userBiometricsMapping.setLeftThumb(user.getLeftThumb()); - userBiometricsMapping.setLeftIndexFinger(user.getLeftIndexFinger()); + @Operation(summary = "Get fingerprint by username") + @GetMapping(value = "/get/fingerprint/{userID}/wo") + public String getFingerprintsByUsername(@PathVariable("userID") Long userID) { + logger.info("Get fingerprint by username ..." + userID); + OutputResponse response = new OutputResponse(); + UserBiometricsMapping user = registrarService.getFingerprintsByUserID(userID); + if (user != null) { + Gson gson = new Gson(); + UserBiometricsMapping userBiometricsMapping = new UserBiometricsMapping(); + userBiometricsMapping.setUserID(user.getUserID()); + userBiometricsMapping.setFirstName(user.getFirstName()); + userBiometricsMapping.setLastName(user.getLastName()); + userBiometricsMapping.setUserName(user.getUserName()); + userBiometricsMapping.setCreatedBy(user.getUserName()); + userBiometricsMapping.setRightThumb(user.getRightThumb()); + userBiometricsMapping.setRightIndexFinger(user.getRightIndexFinger()); + userBiometricsMapping.setLeftThumb(user.getLeftThumb()); + userBiometricsMapping.setLeftIndexFinger(user.getLeftIndexFinger()); - response.setResponse(gson.toJson(userBiometricsMapping)); - } - else{ - response.setError(404, "User with userID: "+userID+" not found"); - } - logger.info("Get fingerprint " + response.toString()); - return response.toString(); - } + response.setResponse(gson.toJson(userBiometricsMapping)); + } else { + response.setError(404, "User with userID: " + userID + " not found"); + } + logger.info("Get fingerprint " + response.toString()); + return response.toString(); + } } \ No newline at end of file diff --git a/src/main/java/com/iemr/hwc/utils/FilterConfig.java b/src/main/java/com/iemr/hwc/utils/FilterConfig.java new file mode 100644 index 00000000..81f97d05 --- /dev/null +++ b/src/main/java/com/iemr/hwc/utils/FilterConfig.java @@ -0,0 +1,26 @@ +package com.iemr.hwc.utils; + +import org.springframework.beans.factory.annotation.Value; +import org.springframework.boot.web.servlet.FilterRegistrationBean; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; + +@Configuration +public class FilterConfig { + + @Value("${cors.allowed-origins}") + private String allowedOrigins; + + @Bean + public FilterRegistrationBean jwtUserIdValidationFilter( + JwtAuthenticationUtil jwtAuthenticationUtil) { + FilterRegistrationBean registrationBean = new FilterRegistrationBean<>(); + + // Pass allowedOrigins explicitly to the filter constructor + JwtUserIdValidationFilter filter = new JwtUserIdValidationFilter(jwtAuthenticationUtil, allowedOrigins); + + registrationBean.setFilter(filter); + registrationBean.addUrlPatterns("/*"); // Apply filter to all API endpoints + return registrationBean; + } +} diff --git a/src/main/java/com/iemr/hwc/utils/JwtUserIdValidationFilter.java b/src/main/java/com/iemr/hwc/utils/JwtUserIdValidationFilter.java index d4ab409a..be0ee894 100644 --- a/src/main/java/com/iemr/hwc/utils/JwtUserIdValidationFilter.java +++ b/src/main/java/com/iemr/hwc/utils/JwtUserIdValidationFilter.java @@ -1,9 +1,11 @@ package com.iemr.hwc.utils; import java.io.IOException; +import java.util.Arrays; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Component; import jakarta.servlet.Filter; @@ -20,9 +22,12 @@ public class JwtUserIdValidationFilter implements Filter { private final JwtAuthenticationUtil jwtAuthenticationUtil; private final Logger logger = LoggerFactory.getLogger(this.getClass().getName()); + private final String allowedOrigins; - public JwtUserIdValidationFilter(JwtAuthenticationUtil jwtAuthenticationUtil) { + public JwtUserIdValidationFilter(JwtAuthenticationUtil jwtAuthenticationUtil, + @Value("${cors.allowed-origins}") String allowedOrigins) { this.jwtAuthenticationUtil = jwtAuthenticationUtil; + this.allowedOrigins = allowedOrigins; } @Override @@ -35,6 +40,20 @@ public void doFilter(ServletRequest servletRequest, ServletResponse servletRespo String contextPath = request.getContextPath(); logger.info("JwtUserIdValidationFilter invoked for path: " + path); + String origin = request.getHeader("Origin"); + if (origin != null && isOriginAllowed(origin)) { + response.setHeader("Access-Control-Allow-Origin", origin); + response.setHeader("Access-Control-Allow-Methods", "GET, POST, PUT, DELETE, OPTIONS"); + response.setHeader("Access-Control-Allow-Headers", "Authorization, Content-Type, Accept, Jwttoken"); + response.setHeader("Access-Control-Allow-Credentials", "true"); + } + + if ("OPTIONS".equalsIgnoreCase(request.getMethod())) { + logger.info("OPTIONS request - skipping JWT validation"); + response.setStatus(HttpServletResponse.SC_OK); + return; + } + // Log cookies for debugging Cookie[] cookies = request.getCookies(); if (cookies != null) { @@ -99,6 +118,16 @@ public void doFilter(ServletRequest servletRequest, ServletResponse servletRespo } } + private boolean isOriginAllowed(String origin) { + if (origin == null || allowedOrigins == null || allowedOrigins.trim().isEmpty()) { + logger.warn("No allowed origins configured or origin is null"); + return false; + } + + return Arrays.stream(allowedOrigins.split(",")).map(String::trim) + .anyMatch(pattern -> origin.matches(pattern.replace(".", "\\.").replace("*", ".*"))); + } + private boolean isMobileClient(String userAgent) { if (userAgent == null) return false;