Skip to content

Commit be13009

Browse files
vanitha18225Amoghsnehar-ndSauravBizbRollyDurgaPrasad-54
authored
Merge Release 3.6.1 to main (#137)
* Update version in pom.xml to 3.4.0 * story: amm-1668 task - 1754 * story: amm-1668 task - 1754 dto updated (#92) * story: amm-1668 task - 1754 dto updated (#93) * story: amm-1668 task - 1754 dto updated * story: amm-1668 task - 1754 * fix: amm-1879 doctor signature was not coming for ncdcare * fix: aam-1896 prescribed quantity was not coming in the casesheet * Update pom.xml 3.4.0 to 3.4.1 * fix: amm-1919 fix for update doctor data for higher refferal data * fix: signature enhancement for casesheet * fix: signature enhancement for casesheet * fix: signature enhancement for casesheet * fix: signature enhancement for casesheet for ncdscreening * fix: updated beneficiaryflowststusrepo file * fix: wasa-IDOR Vulnerability * fix: coderabbit comments * fix: amm-1927 res headers based on origin via allowed cors * fix: amm-1927 coderabbit comments resolved * localhost regex added * Update regex pattern for localhost in interceptor * fix: remove userid from request * Role Based Broken Access Control Implementation : WASA (#104) * fix: add @PreAuthorize to RBAC * fix: wasa RBAC implementation * fix: remove duplicate dependency * fix: coderabbit comments * fix: update role * fix: enable the request matcher * fix:1896 added space for single dose after food string due * fix:1896 added single dose after and before food confition for calculated qntity * fix: role based on both jwt and auth token * add role in register api * Downgrade from 3.6.2 to 3.6.1 (#132) * fix: amm-2063 added beneficiarytype but not reflecting in the DB level * Bump version from 3.6.0 to 3.6.2 * fix: amm-2063 updated the updateBeneficiary flow * Downgrade version from 3.6.2 to 3.6.1 --------- Co-authored-by: SnehaRH <sneha@navadhiti.com> Co-authored-by: SnehaRH <77656297+snehar-nd@users.noreply.github.com> * Cherry-pick health and version API enhancements to release-3.6.1 (#136) * feat(healt,version): add health and version endpoints * fix(health): improve Redis health semantics when not configured * fix(health): scope PROCESSLIST lock-wait check to application DB user * fix(health): Removed the unused import * fix(health): avoid blocking DB I/O under write lock and restore interrupt flag * fix: add missin close brace * fix(health): cancel in-flight futures on generic failure * fix(health): fail-open on advanced MySQL check exceptions to avoid false degraded state --------- Co-authored-by: Amoghavarsh <93114621+5Amogh@users.noreply.github.com> Co-authored-by: 5Amogh <amoghavarsh@navadhiti.com> Co-authored-by: SnehaRH <sneha@navadhiti.com> Co-authored-by: SnehaRH <77656297+snehar-nd@users.noreply.github.com> Co-authored-by: Saurav Mishra <80103738+SauravBizbRolly@users.noreply.github.com> Co-authored-by: Saurav Mishra <saurav.mishra@bizbrolly.com> Co-authored-by: KOPPIREDDY DURGA PRASAD <144464542+DurgaPrasad-54@users.noreply.github.com>
1 parent 0c6c828 commit be13009

File tree

54 files changed

+909
-150
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

54 files changed

+909
-150
lines changed

‎pom.xml‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
<groupId>com.iemr.tm</groupId>
88
<artifactId>tm-api</artifactId>
9-
<version>3.4.0</version>
9+
<version>3.6.1</version>
1010
<packaging>war</packaging>
1111

1212
<name>TM-API</name>
@@ -56,6 +56,10 @@
5656
<groupId>org.springframework.boot</groupId>
5757
<artifactId>spring-boot-starter-aop</artifactId>
5858
</dependency>
59+
<dependency>
60+
<groupId>org.springframework.boot</groupId>
61+
<artifactId>spring-boot-starter-security</artifactId>
62+
</dependency>
5963
<dependency>
6064
<groupId>org.springframework.boot</groupId>
6165
<artifactId>spring-boot-starter</artifactId>
@@ -71,6 +75,7 @@
7175
<artifactId>logback-ecs-encoder</artifactId>
7276
<version>1.3.2</version>
7377
</dependency>
78+
7479
<!-- Swagger -->
7580
<dependency>
7681
<groupId>org.springdoc</groupId>

‎src/main/environment/common_ci.properties‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ carestreamOrderCreateURL=@env.COMMON_API@carestream/createOrder
1010

1111
## Identity - Common URLs
1212
# Registration
13-
registrationUrl =@env.COMMON_API@beneficiary/create
13+
registrationUrl =@env.COMMON_API@beneficiary/createBeneficiary
1414

1515
registrarQuickSearchByIdUrl =@env.COMMON_API@beneficiary/searchUserByID
1616

@@ -19,7 +19,7 @@ registrarQuickSearchByPhoneNoUrl =@env.COMMON_API@beneficiary/searchUserByPhone
1919
getBenImageFromIdentity =@env.IDENTITY_API@id/benImageByBenRegID
2020

2121
##beneficiary edit
22-
beneficiaryEditUrl =@env.COMMON_API@beneficiary/update
22+
beneficiaryEditUrl =@env.COMMON_API@beneficiary/updateBenefciaryDetails
2323

2424
## Advance Search
2525
registrarAdvanceSearchUrl =@env.COMMON_API@beneficiary/searchBeneficiary

‎src/main/environment/common_docker.properties‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ carestreamOrderCreateURL=${COMMON_API}/carestream/createOrder
1010

1111
## Identity - Common URLs
1212
# Registration
13-
registrationUrl=${COMMON_API}/beneficiary/create
13+
registrationUrl=${COMMON_API}/beneficiary/createBeneficiary
1414

1515
registrarQuickSearchByIdUrl=${COMMON_API}/beneficiary/searchUserByID
1616

@@ -19,7 +19,7 @@ registrarQuickSearchByPhoneNoUrl=${COMMON_API}/beneficiary/searchUserByPhone
1919
getBenImageFromIdentity=${IDENTITY_API}/id/benImageByBenRegID
2020

2121
## beneficiary edit
22-
beneficiaryEditUrl=${COMMON_API}/beneficiary/update
22+
beneficiaryEditUrl=${COMMON_API}/beneficiary/updateBenefciaryDetails
2323

2424
## Advance Search
2525
registrarAdvanceSearchUrl=${COMMON_API}/beneficiary/searchBeneficiary

‎src/main/environment/common_example.properties‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ carestreamOrderCreateURL =http://localhost:8083/carestream/createOrder
1111

1212
## Identity - Common URLs
1313
# Registration
14-
registrationUrl =http://localhost:8083/beneficiary/create
14+
registrationUrl =http://localhost:8083/beneficiary/createBeneficiary
1515

1616
registrarQuickSearchByIdUrl =http://localhost:8083/beneficiary/searchUserByID
1717

@@ -20,7 +20,7 @@ registrarQuickSearchByPhoneNoUrl =http://localhost:8083/beneficiary/searchUserBy
2020
getBenImageFromIdentity =http://localhost:8094/id/benImageByBenRegID
2121

2222
##beneficiary edit
23-
beneficiaryEditUrl =http://localhost:8083/beneficiary/update
23+
beneficiaryEditUrl =http://localhost:8083/beneficiary/updateBenefciaryDetails
2424

2525
## Advance Search
2626
registrarAdvanceSearchUrl =http://localhost:8083/beneficiary/searchBeneficiary

‎src/main/java/com/iemr/tm/controller/anc/AntenatalCareController.java‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
import org.slf4j.Logger;
2626
import org.slf4j.LoggerFactory;
2727
import org.springframework.beans.factory.annotation.Autowired;
28+
import org.springframework.security.access.prepost.PreAuthorize;
2829
import org.springframework.transaction.annotation.Transactional;
2930

3031
import org.springframework.web.bind.annotation.PostMapping;
@@ -66,6 +67,7 @@ public void setAncServiceImpl(ANCServiceImpl ancServiceImpl) {
6667
*/
6768
@Operation(summary = "Save ANC nurse data")
6869
@PostMapping(value = { "/save/nurseData" })
70+
@PreAuthorize("hasRole('NURSE') ")
6971
public String saveBenANCNurseData(@RequestBody String requestObj,
7072
@RequestHeader(value = "Authorization") String Authorization) throws Exception {
7173
OutputResponse response = new OutputResponse();
@@ -98,6 +100,7 @@ public String saveBenANCNurseData(@RequestBody String requestObj,
98100

99101
@Operation(summary = "Save ANC doctor data")
100102
@PostMapping(value = { "/save/doctorData" })
103+
@PreAuthorize("hasRole('DOCTOR') ")
101104
public String saveBenANCDoctorData(@RequestBody String requestObj,
102105
@RequestHeader(value = "Authorization") String Authorization) {
103106
OutputResponse response = new OutputResponse();
@@ -132,6 +135,7 @@ public String saveBenANCDoctorData(@RequestBody String requestObj,
132135
@Operation(summary = "Get ANC beneficiary visit details from nurse")
133136
@PostMapping(value = { "/getBenVisitDetailsFrmNurseANC" })
134137
@Transactional(rollbackFor = Exception.class)
138+
@PreAuthorize("hasRole('NURSE') || hasRole('DOCTOR') ")
135139
public String getBenVisitDetailsFrmNurseANC(
136140
@Param(value = "{\"benRegID\":\"Long\", \"visitCode\":\"Long\"}") @RequestBody String comingRequest) {
137141
OutputResponse response = new OutputResponse();
@@ -158,6 +162,7 @@ public String getBenVisitDetailsFrmNurseANC(
158162
@Operation(summary = "Get ANC beneficiary details from nurse")
159163
@PostMapping(value = { "/getBenANCDetailsFrmNurseANC" })
160164
@Transactional(rollbackFor = Exception.class)
165+
@PreAuthorize("hasRole('NURSE') || hasRole('DOCTOR') ")
161166
public String getBenANCDetailsFrmNurseANC(
162167
@Param(value = "{\"benRegID\":\"Long\", \"visitCode\":\"Long\"}") @RequestBody String comingRequest) {
163168
OutputResponse response = new OutputResponse();
@@ -184,6 +189,7 @@ public String getBenANCDetailsFrmNurseANC(
184189

185190
@Operation(summary = "Get ANC beneficiary history from nurse")
186191
@PostMapping(value = { "/getBenANCHistoryDetails" })
192+
@PreAuthorize("hasRole('NURSE') || hasRole('DOCTOR') ")
187193
public String getBenANCHistoryDetails(
188194
@Param(value = "{\"benRegID\":\"Long\", \"visitCode\":\"Long\"}") @RequestBody String comingRequest) {
189195
OutputResponse response = new OutputResponse();
@@ -209,6 +215,7 @@ public String getBenANCHistoryDetails(
209215

210216
@Operation(summary = "Get ANC beneficiary vitals from nurse")
211217
@PostMapping(value = { "/getBenANCVitalDetailsFrmNurseANC" })
218+
@PreAuthorize("hasRole('NURSE') || hasRole('DOCTOR') ")
212219
public String getBenANCVitalDetailsFrmNurseANC(
213220
@Param(value = "{\"benRegID\":\"Long\",\"visitCode\":\"Long\"}") @RequestBody String comingRequest) {
214221
OutputResponse response = new OutputResponse();
@@ -235,6 +242,7 @@ public String getBenANCVitalDetailsFrmNurseANC(
235242

236243
@Operation(summary = "Get ANC beneficiary examination details from nurse")
237244
@PostMapping(value = { "/getBenExaminationDetailsANC" })
245+
@PreAuthorize("hasRole('NURSE') || hasRole('DOCTOR') ")
238246
public String getBenExaminationDetailsANC(
239247
@Param(value = "{\"benRegID\":\"Long\",\"visitCode\":\"Long\"}") @RequestBody String comingRequest) {
240248
OutputResponse response = new OutputResponse();
@@ -260,6 +268,7 @@ public String getBenExaminationDetailsANC(
260268

261269
@Operation(summary = "Get ANC beneficiary case record")
262270
@PostMapping(value = { "/getBenCaseRecordFromDoctorANC" })
271+
@PreAuthorize("hasRole('NURSE') || hasRole('DOCTOR') ")
263272
@Transactional(rollbackFor = Exception.class)
264273
public String getBenCaseRecordFromDoctorANC(
265274
@Param(value = "{\"benRegID\":\"Long\",\"visitCode\":\"Long\"}") @RequestBody String comingRequest) {
@@ -288,6 +297,7 @@ public String getBenCaseRecordFromDoctorANC(
288297
@Operation(summary = "Check high risk pregnancy status for ANC beneficiary")
289298
@PostMapping(value = { "/getHRPStatus" })
290299
@Transactional(rollbackFor = Exception.class)
300+
@PreAuthorize("hasRole('NURSE') || hasRole('DOCTOR') ")
291301
public String getHRPStatus(
292302
@Param(value = "{\"benRegID\":\"Long\",\"visitCode\":\"Long\"}") @RequestBody String comingRequest) {
293303
OutputResponse response = new OutputResponse();
@@ -316,6 +326,7 @@ public String getHRPStatus(
316326

317327
@Operation(summary = "Update ANC beneficiary data")
318328
@PostMapping(value = { "/update/ANCScreen" })
329+
@PreAuthorize("hasRole('NURSE') || hasRole('DOCTOR') ")
319330
public String updateANCCareNurse(@RequestBody String requestObj) {
320331

321332
OutputResponse response = new OutputResponse();
@@ -344,6 +355,7 @@ public String updateANCCareNurse(@RequestBody String requestObj) {
344355

345356
@Operation(summary = "Update ANC beneficiary history")
346357
@PostMapping(value = { "/update/historyScreen" })
358+
@PreAuthorize("hasRole('NURSE') || hasRole('DOCTOR') ")
347359
public String updateANCHistoryNurse(@RequestBody String requestObj) {
348360

349361
OutputResponse response = new OutputResponse();
@@ -372,6 +384,7 @@ public String updateANCHistoryNurse(@RequestBody String requestObj) {
372384

373385
@Operation(summary = "Update ANC beneficiary vitals")
374386
@PostMapping(value = { "/update/vitalScreen" })
387+
@PreAuthorize("hasRole('NURSE') || hasRole('DOCTOR') ")
375388
public String updateANCVitalNurse(@RequestBody String requestObj) {
376389

377390
OutputResponse response = new OutputResponse();
@@ -400,6 +413,7 @@ public String updateANCVitalNurse(@RequestBody String requestObj) {
400413

401414
@Operation(summary = "Update ANC examination data")
402415
@PostMapping(value = { "/update/examinationScreen" })
416+
@PreAuthorize("hasRole('NURSE') || hasRole('DOCTOR') ")
403417
public String updateANCExaminationNurse(@RequestBody String requestObj) {
404418

405419
OutputResponse response = new OutputResponse();
@@ -428,6 +442,7 @@ public String updateANCExaminationNurse(@RequestBody String requestObj) {
428442

429443
@Operation(summary = "Update ANC doctor data")
430444
@PostMapping(value = { "/update/doctorData" })
445+
@PreAuthorize("hasRole('DOCTOR') ")
431446
public String updateANCDoctorData(@RequestBody String requestObj,
432447
@RequestHeader(value = "Authorization") String Authorization) {
433448

‎src/main/java/com/iemr/tm/controller/cancerscreening/CancerScreeningController.java‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
import org.slf4j.Logger;
2626
import org.slf4j.LoggerFactory;
2727
import org.springframework.beans.factory.annotation.Autowired;
28+
import org.springframework.security.access.prepost.PreAuthorize;
2829
import org.springframework.transaction.annotation.Transactional;
2930

3031
import org.springframework.web.bind.annotation.PostMapping;
@@ -70,6 +71,7 @@ public void setCancerScreeningServiceImpl(CSServiceImpl cSServiceImpl) {
7071
*/
7172
@Operation(summary = "Save cancer screening data collected by nurse")
7273
@PostMapping(value = { "/save/nurseData" })
74+
@PreAuthorize("hasRole('NURSE') ")
7375
public String saveBenCancerScreeningNurseData(@RequestBody String requestObj,
7476
@RequestHeader(value = "Authorization") String Authorization) throws Exception {
7577
OutputResponse response = new OutputResponse();
@@ -106,6 +108,7 @@ public String saveBenCancerScreeningNurseData(@RequestBody String requestObj,
106108
*/
107109
@Operation(summary = "Update cancer screening data by the doctor")
108110
@PostMapping(value = { "/save/doctorData" })
111+
@PreAuthorize("hasRole('DOCTOR') ")
109112
public String saveBenCancerScreeningDoctorData(@RequestBody String requestObj,
110113
@RequestHeader String Authorization) {
111114
OutputResponse response = new OutputResponse();
@@ -137,6 +140,7 @@ public String saveBenCancerScreeningDoctorData(@RequestBody String requestObj,
137140

138141
@Operation(summary = "Get beneficiary visit details")
139142
@PostMapping(value = { "/getBenDataFrmNurseToDocVisitDetailsScreen" })
143+
@PreAuthorize("hasRole('NURSE') || hasRole('DOCTOR') ")
140144
public String getBenDataFrmNurseScrnToDocScrnVisitDetails(
141145
@Param(value = "{\"benRegID\":\"Long\", \"visitCode\":\"Long\"}") @RequestBody String comingRequest) {
142146
OutputResponse response = new OutputResponse();
@@ -166,6 +170,7 @@ public String getBenDataFrmNurseScrnToDocScrnVisitDetails(
166170
*/
167171
@Operation(summary = "Get beneficiary cancer history")
168172
@PostMapping(value = { "/getBenDataFrmNurseToDocHistoryScreen" })
173+
@PreAuthorize("hasRole('NURSE') || hasRole('DOCTOR') ")
169174
public String getBenDataFrmNurseScrnToDocScrnHistory(
170175
@Param(value = "{\"benRegID\":\"Long\", \"visitCode\":\"Long\"}") @RequestBody String comingRequest) {
171176
OutputResponse response = new OutputResponse();
@@ -195,6 +200,7 @@ public String getBenDataFrmNurseScrnToDocScrnHistory(
195200
*/
196201
@Operation(summary = "Get beneficiary vitals")
197202
@PostMapping(value = { "/getBenDataFrmNurseToDocVitalScreen" })
203+
@PreAuthorize("hasRole('NURSE') || hasRole('DOCTOR') ")
198204
public String getBenDataFrmNurseScrnToDocScrnVital(
199205
@Param(value = "{\"benRegID\":\"Long\", \"visitCode\":\"Long\"}") @RequestBody String comingRequest) {
200206
OutputResponse response = new OutputResponse();
@@ -224,6 +230,7 @@ public String getBenDataFrmNurseScrnToDocScrnVital(
224230
*/
225231
@Operation(summary = "Get beneficiary examination details")
226232
@PostMapping(value = { "/getBenDataFrmNurseToDocExaminationScreen" })
233+
@PreAuthorize("hasRole('NURSE') || hasRole('DOCTOR') ")
227234
public String getBenDataFrmNurseScrnToDocScrnExamination(
228235
@Param(value = "{\"benRegID\":\"Long\", \"visitCode\":\"Long\"}") @RequestBody String comingRequest) {
229236
OutputResponse response = new OutputResponse();
@@ -253,6 +260,7 @@ public String getBenDataFrmNurseScrnToDocScrnExamination(
253260
*/
254261
@Operation(summary = "Get beneficiary family history")
255262
@PostMapping(value = { "/getBenCancerFamilyHistory" })
263+
@PreAuthorize("hasRole('NURSE') || hasRole('DOCTOR') ")
256264
public String getBenCancerFamilyHistory(
257265
@Param(value = "{\"benRegID\":\"Long\"}") @RequestBody String comingRequest) {
258266
OutputResponse response = new OutputResponse();
@@ -284,6 +292,7 @@ public String getBenCancerFamilyHistory(
284292
*/
285293
@Operation(summary = "Get beneficiary personal history")
286294
@PostMapping(value = { "/getBenCancerPersonalHistory" })
295+
@PreAuthorize("hasRole('NURSE') || hasRole('DOCTOR') ")
287296
public String getBenCancerPersonalHistory(
288297
@Param(value = "{\"benRegID\":\"Long\"}") @RequestBody String comingRequest) {
289298
OutputResponse response = new OutputResponse();
@@ -315,6 +324,7 @@ public String getBenCancerPersonalHistory(
315324
*/
316325
@Operation(summary = "Get beneficiary personal diet history")
317326
@PostMapping(value = { "/getBenCancerPersonalDietHistory" })
327+
@PreAuthorize("hasRole('NURSE') || hasRole('DOCTOR') ")
318328
public String getBenCancerPersonalDietHistory(
319329
@Param(value = "{\"benRegID\":\"Long\"}") @RequestBody String comingRequest) {
320330
OutputResponse response = new OutputResponse();
@@ -346,6 +356,7 @@ public String getBenCancerPersonalDietHistory(
346356
*/
347357
@Operation(summary = "Get beneficiary obstetric history")
348358
@PostMapping(value = { "/getBenCancerObstetricHistory" })
359+
@PreAuthorize("hasRole('NURSE') || hasRole('DOCTOR') ")
349360
public String getBenCancerObstetricHistory(
350361
@Param(value = "{\"benRegID\":\"Long\"}") @RequestBody String comingRequest) {
351362
OutputResponse response = new OutputResponse();
@@ -376,6 +387,7 @@ public String getBenCancerObstetricHistory(
376387
*/
377388
@Operation(summary = "Get beneficiary case record and referral details")
378389
@PostMapping(value = { "/getBenCaseRecordFromDoctorCS" })
390+
@PreAuthorize("hasRole('NURSE') || hasRole('DOCTOR') ")
379391
@Transactional(rollbackFor = Exception.class)
380392
public String getBenCaseRecordFromDoctorCS(
381393
@Param(value = "{\"benRegID\":\"Long\", \"visitCode\":\"Long\"}") @RequestBody String comingRequest) {
@@ -402,6 +414,7 @@ public String getBenCaseRecordFromDoctorCS(
402414

403415
@Operation(summary = "Update cancer screening history")
404416
@PostMapping(value = { "/update/historyScreen" })
417+
@PreAuthorize("hasRole('NURSE') || hasRole('DOCTOR') ")
405418
public String updateCSHistoryNurse(
406419
@Param(value = "{\"historyDetails\": {\"familyHistory\":{\"diseases\": [{\"beneficiaryRegID\":\"Long\", \"benVisitID\":\"Long\", "
407420
+ "\"providerServiceMapID\":\"Integer\", \"cancerDiseaseType\":\"String\", \"otherDiseaseType\":\"String\", \"familyMemberList\":\"List\", "
@@ -453,6 +466,7 @@ public String updateCSHistoryNurse(
453466
*/
454467
@Operation(summary = "Update beneficiary vitals")
455468
@PostMapping(value = { "/update/vitalScreen" })
469+
@PreAuthorize("hasRole('NURSE') || hasRole('DOCTOR') ")
456470
public String upodateBenVitalDetail(
457471
@Param(value = "{\"ID\": \"Long\", \"beneficiaryRegID\":\"Long\",\"benVisitID\":\"Long\","
458472
+ "\"weight_Kg\":\"Double\", \"height_cm\":\"Double\", \"waistCircumference_cm\":\"Double\", \"bloodGlucose_Fasting\":\"Short\","
@@ -491,6 +505,7 @@ public String upodateBenVitalDetail(
491505
*/
492506
@Operation(summary = "Update beneficiary examination details")
493507
@PostMapping(value = { "/update/examinationScreen" })
508+
@PreAuthorize("hasRole('NURSE') || hasRole('DOCTOR') ")
494509
public String upodateBenExaminationDetail(@RequestBody String requestObj) {
495510

496511
OutputResponse response = new OutputResponse();
@@ -526,6 +541,7 @@ public String upodateBenExaminationDetail(@RequestBody String requestObj) {
526541
*/
527542
@Operation(summary = "Update cancer diagnosis details by oncologist")
528543
@PostMapping(value = { "/update/examinationScreen/diagnosis" })
544+
@PreAuthorize("hasRole('NURSE') || hasRole('DOCTOR') || hasRole('ONCOLOGIST') ")
529545
public String updateCancerDiagnosisDetailsByOncologist(
530546
@Param(value = "{\"beneficiaryRegID\":\"Long\", \"benVisitID\":\"Long\", \"visitCode\":\"Long\", "
531547
+ "\"provisionalDiagnosisOncologist\":\"String\", \"modifiedBy\":\"string\"}") @RequestBody String requestObj) {
@@ -560,6 +576,7 @@ public String updateCancerDiagnosisDetailsByOncologist(
560576
*/
561577
@Operation(summary = "Update cancer screening data")
562578
@PostMapping(value = { "/update/doctorData" })
579+
@PreAuthorize("hasRole('DOCTOR') ")
563580
public String updateCancerScreeningDoctorData(@RequestBody String requestObj) {
564581

565582
OutputResponse response = new OutputResponse();

0 commit comments

Comments
 (0)