From 959a6f32c0d413f8abd477b49ea18bdd2d0359eb Mon Sep 17 00:00:00 2001 From: SnehaRH Date: Wed, 25 Mar 2026 17:30:05 +0530 Subject: [PATCH 1/4] fix: aam-2217 disable submit button immediately on click to prevent duplicates Co-Authored-By: Claude Opus 4.6 (1M context) --- .../registrar/registration/registration.component.ts | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/app/app-modules/registrar/registration/registration.component.ts b/src/app/app-modules/registrar/registration/registration.component.ts index c37e320..2804334 100644 --- a/src/app/app-modules/registrar/registration/registration.component.ts +++ b/src/app/app-modules/registrar/registration/registration.component.ts @@ -756,17 +756,19 @@ export class RegistrationComponent */ postButtonCall() { if (this.isSubmitting) return; + this.isSubmitting = true; const valid = this.checkValids(this.beneficiaryRegistrationForm); // Need to revert back the health id change - 2024 // if (valid && this.checkValidHealthID(null)) { if (valid) { - this.isSubmitting = true; if (this.patientRevisit) { this.updateBeneficiarynPassToNurse(); } else if (!this.patientRevisit) { this.submitBeneficiaryDetails(); } + } else { + this.isSubmitting = false; } } checkValidHealthID(type: any) { From f1580c32875a0ca770b298d3cee648a50f868dfd Mon Sep 17 00:00:00 2001 From: SnehaRH Date: Wed, 25 Mar 2026 19:33:40 +0530 Subject: [PATCH 2/4] fix: aam-2217 update Common-UI submodule with duplicate submit fix Points Common-UI to sn/aam-2217-prevent-duplicate-submit branch which adds isSubmitting guard to prevent duplicate beneficiary registration on rapid double-click. Co-Authored-By: Claude Opus 4.6 (1M context) --- Common-UI | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Common-UI b/Common-UI index e9304ae..dcd19e1 160000 --- a/Common-UI +++ b/Common-UI @@ -1 +1 @@ -Subproject commit e9304ae4c85709a82608e6f900429a857fc703ba +Subproject commit dcd19e1105e6adea593752d8c1db6caba52e1c39 From 50670968f4bd5bce70ce825d7f4061960dbb722d Mon Sep 17 00:00:00 2001 From: SnehaRH Date: Thu, 26 Mar 2026 10:25:41 +0530 Subject: [PATCH 3/4] fix: aam-2217 update Common-UI to release-3.6.2 with duplicate submit fix Points Common-UI submodule to latest release-3.6.2 which includes the isSubmitting guard to prevent duplicate beneficiary registration. Co-Authored-By: Claude Opus 4.6 (1M context) --- Common-UI | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Common-UI b/Common-UI index dcd19e1..0742c81 160000 --- a/Common-UI +++ b/Common-UI @@ -1 +1 @@ -Subproject commit dcd19e1105e6adea593752d8c1db6caba52e1c39 +Subproject commit 0742c81ab8efa969b4e868d964fe5fd87031b94b From d990af49595a2ec5ab5186486abc3d619f007d75 Mon Sep 17 00:00:00 2001 From: SnehaRH Date: Thu, 26 Mar 2026 14:00:07 +0530 Subject: [PATCH 4/4] fix: amm-2228 allow multiple diagnosis search in doctor module Row index was incorrectly passed as pageNo to searchDiagnosisBasedOnPageNo(), causing empty results for 2nd+ diagnosis rows. Fixed by always requesting page 0 across all diagnosis components. Co-Authored-By: Claude Opus 4.6 (1M context) --- .../general-opd-diagnosis/general-opd-diagnosis.component.ts | 2 +- .../ncd-care-diagnosis/ncd-care-diagnosis.component.ts | 2 +- .../ncd-screening-diagnosis.component.ts | 2 +- .../diagnosis/pnc-diagnosis/pnc-diagnosis.component.ts | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/app/app-modules/nurse-doctor/case-record/general-case-record/diagnosis/general-opd-diagnosis/general-opd-diagnosis.component.ts b/src/app/app-modules/nurse-doctor/case-record/general-case-record/diagnosis/general-opd-diagnosis/general-opd-diagnosis.component.ts index ca8cd55..6d8a4d9 100644 --- a/src/app/app-modules/nurse-doctor/case-record/general-case-record/diagnosis/general-opd-diagnosis/general-opd-diagnosis.component.ts +++ b/src/app/app-modules/nurse-doctor/case-record/general-case-record/diagnosis/general-opd-diagnosis/general-opd-diagnosis.component.ts @@ -259,7 +259,7 @@ export class GeneralOpdDiagnosisComponent onDiagnosisInputKeyup(value: string, index: number) { if (value.length >= 3) { this.masterdataService - .searchDiagnosisBasedOnPageNo(value, index) + .searchDiagnosisBasedOnPageNo(value, 0) .subscribe((results: any) => { this.suggestedDiagnosisList[index] = results?.data?.sctMaster; }); diff --git a/src/app/app-modules/nurse-doctor/case-record/general-case-record/diagnosis/ncd-care-diagnosis/ncd-care-diagnosis.component.ts b/src/app/app-modules/nurse-doctor/case-record/general-case-record/diagnosis/ncd-care-diagnosis/ncd-care-diagnosis.component.ts index 2a564e7..4c04aae 100644 --- a/src/app/app-modules/nurse-doctor/case-record/general-case-record/diagnosis/ncd-care-diagnosis/ncd-care-diagnosis.component.ts +++ b/src/app/app-modules/nurse-doctor/case-record/general-case-record/diagnosis/ncd-care-diagnosis/ncd-care-diagnosis.component.ts @@ -274,7 +274,7 @@ export class NcdCareDiagnosisComponent implements OnInit, DoCheck { onDiagnosisInputKeyup(value: string, index: number) { if (value.length >= 3) { this.masterdataService - .searchDiagnosisBasedOnPageNo(value, index) + .searchDiagnosisBasedOnPageNo(value, 0) .subscribe((results: any) => { this.suggestedDiagnosisList[index] = results?.data?.sctMaster; }); diff --git a/src/app/app-modules/nurse-doctor/case-record/general-case-record/diagnosis/ncd-screening-diagnosis/ncd-screening-diagnosis.component.ts b/src/app/app-modules/nurse-doctor/case-record/general-case-record/diagnosis/ncd-screening-diagnosis/ncd-screening-diagnosis.component.ts index ac20b76..5d856c5 100644 --- a/src/app/app-modules/nurse-doctor/case-record/general-case-record/diagnosis/ncd-screening-diagnosis/ncd-screening-diagnosis.component.ts +++ b/src/app/app-modules/nurse-doctor/case-record/general-case-record/diagnosis/ncd-screening-diagnosis/ncd-screening-diagnosis.component.ts @@ -330,7 +330,7 @@ export class NcdScreeningDiagnosisComponent onDiagnosisInputKeyup(value: string, index: number) { if (value.length >= 3) { this.masterdataService - .searchDiagnosisBasedOnPageNo(value, index) + .searchDiagnosisBasedOnPageNo(value, 0) .subscribe((results: any) => { this.suggestedDiagnosisList[index] = results?.data?.sctMaster; }); diff --git a/src/app/app-modules/nurse-doctor/case-record/general-case-record/diagnosis/pnc-diagnosis/pnc-diagnosis.component.ts b/src/app/app-modules/nurse-doctor/case-record/general-case-record/diagnosis/pnc-diagnosis/pnc-diagnosis.component.ts index 1880b06..1e341b2 100644 --- a/src/app/app-modules/nurse-doctor/case-record/general-case-record/diagnosis/pnc-diagnosis/pnc-diagnosis.component.ts +++ b/src/app/app-modules/nurse-doctor/case-record/general-case-record/diagnosis/pnc-diagnosis/pnc-diagnosis.component.ts @@ -434,7 +434,7 @@ export class PncDiagnosisComponent onDiagnosisInputKeyup(value: string, index: number) { if (value.length >= 3) { this.masterdataService - .searchDiagnosisBasedOnPageNo(value, index) + .searchDiagnosisBasedOnPageNo(value, 0) .subscribe((results: any) => { this.suggestedDiagnosisList[index] = results?.data?.sctMaster; });