From e922f4dd7b05e8f04561c286860c5564e612ba8c Mon Sep 17 00:00:00 2001 From: SnehaRH Date: Fri, 9 Jan 2026 20:14:08 +0530 Subject: [PATCH 1/2] fix: amm-1857 signature enhancement for casesheet --- .../doctor-diagnosis-case-sheet.component.ts | 4 +++- .../shared/services/doctor.service.ts | 17 +++++++++++++++++ .../nurse-doctor/workarea/workarea.component.ts | 17 +++++++++++++++++ 3 files changed, 37 insertions(+), 1 deletion(-) diff --git a/src/app/app-modules/nurse-doctor/case-sheet/general-case-sheet/doctor-diagnosis-case-sheet/doctor-diagnosis-case-sheet.component.ts b/src/app/app-modules/nurse-doctor/case-sheet/general-case-sheet/doctor-diagnosis-case-sheet/doctor-diagnosis-case-sheet.component.ts index 7c73f544..fe07f51e 100644 --- a/src/app/app-modules/nurse-doctor/case-sheet/general-case-sheet/doctor-diagnosis-case-sheet/doctor-diagnosis-case-sheet.component.ts +++ b/src/app/app-modules/nurse-doctor/case-sheet/general-case-sheet/doctor-diagnosis-case-sheet/doctor-diagnosis-case-sheet.component.ts @@ -571,7 +571,9 @@ export class DoctorDiagnosisCaseSheetComponent ].join('/'); } - this.downloadSign(); + if (this.casesheetData?.BeneficiaryData?.doctorSignatureFlag) { + this.downloadSign(); + } this.getVaccinationTypeAndDoseMaster(); } } diff --git a/src/app/app-modules/nurse-doctor/shared/services/doctor.service.ts b/src/app/app-modules/nurse-doctor/shared/services/doctor.service.ts index c3064f79..c215ff77 100644 --- a/src/app/app-modules/nurse-doctor/shared/services/doctor.service.ts +++ b/src/app/app-modules/nurse-doctor/shared/services/doctor.service.ts @@ -178,6 +178,7 @@ export class DoctorService { otherDetails: any, tcRequest: any, isSpecialist: any, + doctorSignatureFlag: any, ) { const serviceLineDetails: any = this.sessionstorage.getItem('serviceLineDetails'); @@ -232,6 +233,7 @@ export class DoctorService { createdBy: this.sessionstorage.getItem('userName'), tcRequest: tcRequest, isSpecialist: isSpecialist, + doctorSignatureFlag: doctorSignatureFlag, }; console.log( @@ -350,6 +352,7 @@ export class DoctorService { consultationData: any, tcRequest: any, isSpecialist: any, + doctorSignatureFlag: any, ) { const serviceLineDetails: any = this.sessionstorage.getItem('serviceLineDetails'); @@ -377,6 +380,7 @@ export class DoctorService { {}, consultationData.quickConsultation, temp, + { doctorSignatureFlag: doctorSignatureFlag }, ); console.log('qc', JSON.stringify(quickConsultation, null, 4)); @@ -541,6 +545,7 @@ export class DoctorService { otherDetails: any, tcRequest: any, isSpecialist: any, + doctorSignatureFlag: any, ) { const serviceLineDetails: any = this.sessionstorage.getItem('serviceLineDetails'); @@ -593,6 +598,7 @@ export class DoctorService { createdBy: this.sessionstorage.getItem('userName'), tcRequest: tcRequest, isSpecialist: isSpecialist, + doctorSignatureFlag: doctorSignatureFlag, }; console.log( @@ -682,6 +688,7 @@ export class DoctorService { otherDetails: any, tcRequest: any, isSpecialist: any, + doctorSignatureFlag: any, ) { const serviceLineDetails: any = this.sessionstorage.getItem('serviceLineDetails'); @@ -744,6 +751,7 @@ export class DoctorService { createdBy: this.sessionstorage.getItem('userName'), tcRequest: tcRequest, isSpecialist: isSpecialist, + doctorSignatureFlag: doctorSignatureFlag, }; console.log( @@ -770,6 +778,7 @@ export class DoctorService { otherDetails: any, tcRequest: any, isSpecialist: any, + doctorSignatureFlag: any, ) { const serviceLineDetails: any = this.sessionstorage.getItem('serviceLineDetails'); @@ -824,6 +833,7 @@ export class DoctorService { createdBy: this.sessionstorage.getItem('userName'), tcRequest: tcRequest, isSpecialist: isSpecialist, + doctorSignatureFlag: doctorSignatureFlag, }; console.log( @@ -2358,6 +2368,7 @@ export class DoctorService { otherDetails: any, tcRequest: any, isSpecialist: any, + doctorSignatureFlag: any, ) { const serviceLineDetails: any = this.sessionstorage.getItem('serviceLineDetails'); @@ -2409,6 +2420,7 @@ export class DoctorService { createdBy: this.sessionstorage.getItem('userName'), tcRequest: tcRequest, isSpecialist: isSpecialist, + doctorSignatureFlag: doctorSignatureFlag, }; console.log( @@ -2655,6 +2667,7 @@ export class DoctorService { visitCategory: any, otherDetails: any, tcRequest: any, + doctorSignatureFlag: any, ): Observable { const serviceLineDetails: any = this.sessionstorage.getItem('serviceLineDetails'); @@ -2718,6 +2731,7 @@ export class DoctorService { createdBy: this.sessionstorage.getItem('userName'), tcRequest: tcRequest, isSpecialist: otherDetails.isSpecialist, + doctorSignatureFlag: doctorSignatureFlag, }; console.log( @@ -3973,4 +3987,7 @@ export class DoctorService { getAssessmentDet(assessmentId: any) { return this.http.get(environment.getAssessmentUrl + '/' + assessmentId); } + checkUsersignatureExist(userID: any) { + return this.http.get(environment.checkUsersignExistUrl + userID); + } } diff --git a/src/app/app-modules/nurse-doctor/workarea/workarea.component.ts b/src/app/app-modules/nurse-doctor/workarea/workarea.component.ts index ede188e4..fbba9152 100644 --- a/src/app/app-modules/nurse-doctor/workarea/workarea.component.ts +++ b/src/app/app-modules/nurse-doctor/workarea/workarea.component.ts @@ -202,6 +202,7 @@ export class WorkareaComponent patientQuickConsultForm!: FormGroup; abdmFacilityId: any; abdmFacilityName: any; + doctorSignatureFlag = false; constructor( private router: Router, @@ -329,6 +330,13 @@ export class WorkareaComponent this.enableUpdateButtonOnDoctorInteraction(); this.enableUpdateButtonFamilyPlanning(); this.enableUpdateButtonBirthImmunizationHistory(); + this.doctorService + .checkUsersignatureExist(this.sessionstorage.getItem('userID')) + .subscribe((res: any) => { + if (res.statusCode === 200 && res.data !== null) { + this.doctorSignatureFlag = res.data.signStatus; + } + }); } setVitalsUpdateButtonValue() { this.enableVitalsButtonSubscription = @@ -1718,6 +1726,7 @@ export class WorkareaComponent temp, this.schedulerData, this.isSpecialist, + this.doctorSignatureFlag, ) .subscribe( (res: any) => { @@ -1927,6 +1936,7 @@ export class WorkareaComponent visitCategory, otherDetails, this.schedulerData, + this.doctorSignatureFlag, ) .subscribe( (res: any) => { @@ -2169,6 +2179,7 @@ export class WorkareaComponent visitCategory, otherDetails, this.schedulerData, + this.doctorSignatureFlag, ) .subscribe( (res: any) => { @@ -3736,6 +3747,7 @@ export class WorkareaComponent providerServiceMapID: this.sessionstorage.getItem('providerServiceID'), createdBy: this.sessionstorage.getItem('userName'), isSpecialist: this.isSpecialist, + doctorSignatureFlag: this.doctorSignatureFlag, }; const valid = this.checkQuickConsultDoctorData(this.patientMedicalForm); @@ -3795,6 +3807,7 @@ export class WorkareaComponent { quickConsultation: patientQuickConsultFormValue }, this.schedulerData, this.isSpecialist, + this.doctorSignatureFlag, ) .subscribe( (res: any) => { @@ -4022,6 +4035,7 @@ export class WorkareaComponent temp, this.schedulerData, this.isSpecialist, + this.doctorSignatureFlag, ) .subscribe( (res: any) => { @@ -4230,6 +4244,7 @@ export class WorkareaComponent temp, this.schedulerData, this.isSpecialist, + this.doctorSignatureFlag, ) .subscribe( (res: any) => { @@ -4525,6 +4540,7 @@ export class WorkareaComponent temp, this.schedulerData, this.isSpecialist, + this.doctorSignatureFlag, ) .subscribe( (res: any) => { @@ -4567,6 +4583,7 @@ export class WorkareaComponent temp, this.schedulerData, this.isSpecialist, + this.doctorSignatureFlag, ) .subscribe( (res: any) => { From 7a1a01ca4b6287444a73e8c5584bf2423f8f40ca Mon Sep 17 00:00:00 2001 From: SnehaRH Date: Fri, 9 Jan 2026 20:31:29 +0530 Subject: [PATCH 2/2] fix: amm-1857 added end point --- src/environments/environment.ci.ts.template | 1 + src/environments/environment.dev.ts | 1 + src/environments/environment.development.ts | 1 + src/environments/environment.local.ts | 1 + src/environments/environment.prod.ts | 1 + src/environments/environment.test.ts | 1 + 6 files changed, 6 insertions(+) diff --git a/src/environments/environment.ci.ts.template b/src/environments/environment.ci.ts.template index 8be4f083..2afb14f7 100644 --- a/src/environments/environment.ci.ts.template +++ b/src/environments/environment.ci.ts.template @@ -567,6 +567,7 @@ export const environment = { dhisURL:dhisURL, elasticSearchUrl: `${HWC_API}registrar/quickSearchES`, advanceElasticSearchUrl: `${HWC_API}registrar/advancedSearchES`, + checkUsersignExistUrl: `${ADMIN_API}signature1/signexist/`, }; diff --git a/src/environments/environment.dev.ts b/src/environments/environment.dev.ts index 68c72ac6..cf041b8f 100644 --- a/src/environments/environment.dev.ts +++ b/src/environments/environment.dev.ts @@ -575,6 +575,7 @@ export const environment = { enableCHOReportBtn: enableCHOReportBtn, dhisURL: dhisURL, getUserId: `${COMMON_API}user/userName/`, + checkUsersignExistUrl: `${ADMIN_API}signature1/signexist/`, elasticSearchUrl: `${HWC_API}registrar/quickSearchES`, advanceElasticSearchUrl: `${HWC_API}registrar/advancedSearchES`, }; diff --git a/src/environments/environment.development.ts b/src/environments/environment.development.ts index 0ee8e973..d849b300 100644 --- a/src/environments/environment.development.ts +++ b/src/environments/environment.development.ts @@ -578,4 +578,5 @@ export const environment = { enableCHOReportBtn: enableCHOReportBtn, dhisURL: dhisURL, elasticSearchUrl: `${HWC_API}registrar/quickSearchES`, + checkUsersignExistUrl: `${ADMIN_API}signature1/signexist/`, }; diff --git a/src/environments/environment.local.ts b/src/environments/environment.local.ts index 1ffef178..4fed02f3 100644 --- a/src/environments/environment.local.ts +++ b/src/environments/environment.local.ts @@ -577,4 +577,5 @@ export const environment = { dhisURL: dhisURL, elasticSearchUrl: `${HWC_API}registrar/quickSearchES`, advanceElasticSearchUrl: `${HWC_API}registrar/advancedSearchES`, + checkUsersignExistUrl: `${ADMIN_API}signature1/signexist/`, }; diff --git a/src/environments/environment.prod.ts b/src/environments/environment.prod.ts index c61427c8..c140ca4d 100644 --- a/src/environments/environment.prod.ts +++ b/src/environments/environment.prod.ts @@ -578,4 +578,5 @@ export const environment = { enableCHOReportBtn: enableCHOReportBtn, dhisURL: dhisURL, elasticSearchUrl: `${HWC_API}registrar/quickSearchES`, + checkUsersignExistUrl: `${ADMIN_API}signature1/signexist/`, }; diff --git a/src/environments/environment.test.ts b/src/environments/environment.test.ts index a2e0f3ae..fecac912 100644 --- a/src/environments/environment.test.ts +++ b/src/environments/environment.test.ts @@ -578,4 +578,5 @@ export const environment = { enableCHOReportBtn: enableCHOReportBtn, dhisURL: dhisURL, elasticSearchUrl: `${HWC_API}registrar/quickSearchES`, + checkUsersignExistUrl: `${ADMIN_API}signature1/signexist/`, };