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 c0786a6..6a5bfc1 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 @@ -29,6 +29,7 @@ import { RegistrarService } from 'src/app/app-modules/registrar/shared/services/ import { NurseService, MasterdataService } from '../../../shared/services'; import * as moment from 'moment'; import { SessionStorageService } from 'Common-UI/src/registrar/services/session-storage.service'; +import { map, Observable } from 'rxjs'; @Component({ selector: 'app-doctor-diagnosis-case-sheet', @@ -100,6 +101,7 @@ export class DoctorDiagnosisCaseSheetComponent serviceList = ''; referralReasonList = ''; isCovidVaccinationStatusVisible = false; + userName: any; constructor( private doctorService: DoctorService, @@ -122,6 +124,7 @@ export class DoctorDiagnosisCaseSheetComponent ngDoCheck() { this.assignSelectedLanguage(); } + assignSelectedLanguage() { const getLanguageJson = new SetLanguageComponent(this.httpServiceService); getLanguageJson.setLanguage(); @@ -129,6 +132,7 @@ export class DoctorDiagnosisCaseSheetComponent } ngOnChanges() { + this.ncdScreeningCondition = null; if (this.casesheetData) { console.log('cases'); @@ -137,6 +141,7 @@ export class DoctorDiagnosisCaseSheetComponent if (this.casesheetData.doctorData.diagnosis.doctorDiagnonsis) { this.doctorDiagnosis = this.casesheetData.doctorData.diagnosis.doctorDiagnonsis; + this.userName = this.casesheetData?.doctorData?.diagnosis?.createdBy; this.diagnosisFlag = true; } if (temp2 !== undefined) { @@ -379,22 +384,28 @@ export class DoctorDiagnosisCaseSheetComponent const len = String(10).length - String(this).length + 1; return len > 0 ? new Array(len).join('0') + this : this; } - downloadSign() { - if (this.beneficiaryDetails && this.beneficiaryDetails.tCSpecialistUserID) { - const tCSpecialistUserID = this.beneficiaryDetails.tCSpecialistUserID; - this.doctorService.downloadSign(tCSpecialistUserID).subscribe( - (response) => { + + downloadSign() { + this.getUserId().subscribe((userId) => { + const userIdToUse = this.beneficiaryDetails?.tCSpecialistUserID ?? userId; + this.doctorService.downloadSign(userIdToUse).subscribe( + (response: any) => { const blob = new Blob([response], { type: response.type }); this.showSign(blob); }, - (err) => { - console.log('error'); + (err: any) => { + console.error('Error downloading signature:', err); }, ); - } else { - console.log('No tCSpecialistUserID found'); - } + }); } + + getUserId(): Observable { + return this.doctorService + .getUserId(this.userName) + .pipe(map((res: any) => res?.userId || null)); + } + showSign(blob: any) { const reader = new FileReader(); reader.readAsDataURL(blob); 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 fd44873..5515826 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 @@ -2847,6 +2847,12 @@ export class DoctorService { .get(environment.downloadSignUrl + userID, { responseType: 'blob' }) .pipe(map((res: any) => res.blob())); } + + /* Get UserID using UserName */ + getUserId(userName: any) { + return this.http.get(environment.getUserId + userName); + } + getIDRSDetails(beneficiaryID: string, visitID: string): Observable { const visitCategory = this.sessionstorage.getItem('visitCategory'); const otherDetails = Object.assign({ diff --git a/src/environments/environment.ci.ts.template b/src/environments/environment.ci.ts.template index 3f1c0f4..c95764b 100644 --- a/src/environments/environment.ci.ts.template +++ b/src/environments/environment.ci.ts.template @@ -495,4 +495,6 @@ export const environment = { siteKey: siteKey, captchaChallengeURL: captchaChallengeURL, enableCaptcha: enableCaptcha, + + getUserId: `${COMMON_API}user/userName/`, };