From 236907055efdd296050ab957e5f14ad575c11844 Mon Sep 17 00:00:00 2001 From: SnehaRH Date: Mon, 25 Aug 2025 17:25:03 +0530 Subject: [PATCH 01/19] fix:not able to view case sheet in previous history module --- src/environments/environment.ci.ts.template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/environments/environment.ci.ts.template b/src/environments/environment.ci.ts.template index 3f1c0f4..39b4871 100644 --- a/src/environments/environment.ci.ts.template +++ b/src/environments/environment.ci.ts.template @@ -38,7 +38,7 @@ const ADMIN_API = '<%= ADMIN_API_BASE %>'; const biologicalScreeningDeviceAPI = `${ADMIN_API}/diagnostics/biologicalScreeningDevice`; const IOT_API = '<%= IOT_API_BASE %>'; const FHIR_API = '<%= FHIR_API_BASE %>'; -const mmuUICasesheet = '<%= TM_API_BASE %>'; +const mmuUICasesheet = '<%= TM_UI %>'; const SCHEDULER_UI = '<%= SCHEDULER_UI_BASE %>'; const INVENTORY_UI = '<%= INVENTORY_UI %>'; const IDENTITY_API = `<%= IDENTITY_API_BASE %>`; From a0c3ae2625052660af9f38c22d5e1584d3122393 Mon Sep 17 00:00:00 2001 From: SnehaRH <77656297+snehar-nd@users.noreply.github.com> Date: Mon, 25 Aug 2025 18:18:04 +0530 Subject: [PATCH 02/19] fix:not able to view case sheet in previous history module (#82) --- src/environments/environment.ci.ts.template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/environments/environment.ci.ts.template b/src/environments/environment.ci.ts.template index 3f1c0f4..39b4871 100644 --- a/src/environments/environment.ci.ts.template +++ b/src/environments/environment.ci.ts.template @@ -38,7 +38,7 @@ const ADMIN_API = '<%= ADMIN_API_BASE %>'; const biologicalScreeningDeviceAPI = `${ADMIN_API}/diagnostics/biologicalScreeningDevice`; const IOT_API = '<%= IOT_API_BASE %>'; const FHIR_API = '<%= FHIR_API_BASE %>'; -const mmuUICasesheet = '<%= TM_API_BASE %>'; +const mmuUICasesheet = '<%= TM_UI %>'; const SCHEDULER_UI = '<%= SCHEDULER_UI_BASE %>'; const INVENTORY_UI = '<%= INVENTORY_UI %>'; const IDENTITY_API = `<%= IDENTITY_API_BASE %>`; From 48e48de856c85f8cc1651fbbffa2412b0ea1fc91 Mon Sep 17 00:00:00 2001 From: SnehaRH Date: Tue, 26 Aug 2025 18:10:44 +0530 Subject: [PATCH 03/19] fix: amm-1478 previous visit casesheet keys are not loading issue --- .../core/services/http-service.service.ts | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/src/app/app-modules/core/services/http-service.service.ts b/src/app/app-modules/core/services/http-service.service.ts index 63259ef..8e5d7f7 100644 --- a/src/app/app-modules/core/services/http-service.service.ts +++ b/src/app/app-modules/core/services/http-service.service.ts @@ -21,8 +21,15 @@ export class HttpServiceService { constructor( private _http: HttpClient, - private http: HttpClient, - ) {} + private http: HttpClient + ) + { + const storedLang = localStorage.getItem('appLanguage'); + this.language = storedLang ? JSON.parse(storedLang) : null; + + this.appCurrentLanguge = new BehaviorSubject(this.language); + this.currentLangugae$ = this.appCurrentLanguge.asObservable(); + } fetchLanguageSet() { console.log('Here i come'); @@ -34,6 +41,8 @@ export class HttpServiceService { getCurrentLanguage(response: any) { console.log('here at one', response); this.language = response; + localStorage.setItem('appLanguage', JSON.stringify(response)); + console.log('teste', this.language); this.appCurrentLanguge.next(response); console.log('here at two', this.appCurrentLanguge.value); From 74dceabadcf0315cd018b1806e80305a64bed3de Mon Sep 17 00:00:00 2001 From: SnehaRH <77656297+snehar-nd@users.noreply.github.com> Date: Mon, 1 Sep 2025 09:39:10 +0530 Subject: [PATCH 04/19] AMM-1478- previous visit case sheet fix (#84) * fix:not able to view case sheet in previous history module * fix: amm-1478 previous visit casesheet keys are not loading issue --- .../core/services/http-service.service.ts | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/src/app/app-modules/core/services/http-service.service.ts b/src/app/app-modules/core/services/http-service.service.ts index 63259ef..8e5d7f7 100644 --- a/src/app/app-modules/core/services/http-service.service.ts +++ b/src/app/app-modules/core/services/http-service.service.ts @@ -21,8 +21,15 @@ export class HttpServiceService { constructor( private _http: HttpClient, - private http: HttpClient, - ) {} + private http: HttpClient + ) + { + const storedLang = localStorage.getItem('appLanguage'); + this.language = storedLang ? JSON.parse(storedLang) : null; + + this.appCurrentLanguge = new BehaviorSubject(this.language); + this.currentLangugae$ = this.appCurrentLanguge.asObservable(); + } fetchLanguageSet() { console.log('Here i come'); @@ -34,6 +41,8 @@ export class HttpServiceService { getCurrentLanguage(response: any) { console.log('here at one', response); this.language = response; + localStorage.setItem('appLanguage', JSON.stringify(response)); + console.log('teste', this.language); this.appCurrentLanguge.next(response); console.log('here at two', this.appCurrentLanguge.value); From 9133ebb6eed2135b95dd0cdc63b2039a6f308368 Mon Sep 17 00:00:00 2001 From: SnehaRH Date: Fri, 5 Sep 2025 18:21:32 +0530 Subject: [PATCH 05/19] fix: amm-1806 doctor signature in casesheet --- .../doctor-diagnosis-case-sheet.component.ts | 28 +++++++++---------- .../shared/services/doctor.service.ts | 6 ++-- 2 files changed, 17 insertions(+), 17 deletions(-) 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..9d79534 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 @@ -380,20 +380,20 @@ export class DoctorDiagnosisCaseSheetComponent 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) => { - const blob = new Blob([response], { type: response.type }); - this.showSign(blob); - }, - (err) => { - console.log('error'); - }, - ); - } else { - console.log('No tCSpecialistUserID found'); - } + + const userId = + this.beneficiaryDetails?.tCSpecialistUserID ?? + this.sessionstorage.getItem('userID'); + + this.doctorService.downloadSign(userId).subscribe( + (response: any) => { + const blob = new Blob([response], { type: response.type }); + this.showSign(blob); + }, + (err: any) => { + console.error('Error downloading signature:', err); + } + ); } showSign(blob: any) { const reader = new FileReader(); 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..52352bd 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 @@ -2843,9 +2843,9 @@ export class DoctorService { } /* Doctor Signature download */ downloadSign(userID: any) { - return this.http - .get(environment.downloadSignUrl + userID, { responseType: 'blob' }) - .pipe(map((res: any) => res.blob())); + return this.http.get(environment.downloadSignUrl + userID, { + responseType: 'blob' as 'json', + }); } getIDRSDetails(beneficiaryID: string, visitID: string): Observable { const visitCategory = this.sessionstorage.getItem('visitCategory'); From f818b51bc8538f413d6a6a4a9743df08388b262f Mon Sep 17 00:00:00 2001 From: SnehaRH <77656297+snehar-nd@users.noreply.github.com> Date: Tue, 9 Sep 2025 13:25:09 +0530 Subject: [PATCH 06/19] fix: update pom.xml 3.4.0 to 3.4.1 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index b9fddb4..76e173a 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ 4.0.0 com.iemr.tm-ui tm-ui - 3.4.0 + 3.4.1 TM-UI Piramal - tm: Module ui war From ec15d930c72c3d118e963dea2808f55fe3940606 Mon Sep 17 00:00:00 2001 From: SnehaRH Date: Tue, 9 Sep 2025 14:05:09 +0530 Subject: [PATCH 07/19] fix: amm-1785 issue --- ...r-doctor-diagnosis-case-sheet.component.ts | 27 +++++++++---------- 1 file changed, 13 insertions(+), 14 deletions(-) diff --git a/src/app/app-modules/nurse-doctor/case-sheet/cancer-case-sheet/cancer-doctor-diagnosis-case-sheet/cancer-doctor-diagnosis-case-sheet.component.ts b/src/app/app-modules/nurse-doctor/case-sheet/cancer-case-sheet/cancer-doctor-diagnosis-case-sheet/cancer-doctor-diagnosis-case-sheet.component.ts index 322fa9b..961f30f 100644 --- a/src/app/app-modules/nurse-doctor/case-sheet/cancer-case-sheet/cancer-doctor-diagnosis-case-sheet/cancer-doctor-diagnosis-case-sheet.component.ts +++ b/src/app/app-modules/nurse-doctor/case-sheet/cancer-case-sheet/cancer-doctor-diagnosis-case-sheet/cancer-doctor-diagnosis-case-sheet.component.ts @@ -177,20 +177,19 @@ export class CancerDoctorDiagnosisCaseSheetComponent 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) => { - const blob = new Blob([response], { type: response.type }); - this.showSign(blob); - }, - (err) => { - console.log('error'); - }, - ); - } else { - console.log('No tCSpecialistUserID found'); - } + const userId = + this.beneficiaryDetails?.tCSpecialistUserID ?? + this.sessionstorage.getItem('userID'); + + this.doctorService.downloadSign(userId).subscribe( + (response: any) => { + const blob = new Blob([response], { type: response.type }); + this.showSign(blob); + }, + (err: any) => { + console.error('Error downloading signature:', err); + } + ); } showSign(blob: any) { const reader = new FileReader(); From bfe8fa810b4ea792d40358aa1068a7be9a4695c7 Mon Sep 17 00:00:00 2001 From: Amoghavarsh <93114621+5Amogh@users.noreply.github.com> Date: Thu, 25 Sep 2025 12:05:29 +0530 Subject: [PATCH 08/19] Update pom.xml --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 76e173a..266eeac 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ 4.0.0 com.iemr.tm-ui tm-ui - 3.4.1 + 3.5.1 TM-UI Piramal - tm: Module ui war From cea587a0143b1b7637f9a62b30ba05e18d848a2b Mon Sep 17 00:00:00 2001 From: SnehaRH Date: Tue, 30 Sep 2025 17:30:40 +0530 Subject: [PATCH 09/19] fix: 1859 Signature in casesheet enhancement --- .../doctor-diagnosis-case-sheet.component.ts | 28 ++++++++++++------- .../shared/services/doctor.service.ts | 6 ++++ src/environments/environment.ci.ts.template | 2 ++ 3 files changed, 26 insertions(+), 10 deletions(-) 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..cb10842 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, @@ -379,22 +381,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..f7b870a 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/`, }; From 6d83725c24ef177fc5306c831522bf987358b58d Mon Sep 17 00:00:00 2001 From: SnehaRH Date: Tue, 30 Sep 2025 18:33:09 +0530 Subject: [PATCH 10/19] fix: resolved coderabit comments --- .../doctor-diagnosis-case-sheet.component.ts | 3 +++ .../app-modules/nurse-doctor/shared/services/doctor.service.ts | 2 +- 2 files changed, 4 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 cb10842..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 @@ -124,6 +124,7 @@ export class DoctorDiagnosisCaseSheetComponent ngDoCheck() { this.assignSelectedLanguage(); } + assignSelectedLanguage() { const getLanguageJson = new SetLanguageComponent(this.httpServiceService); getLanguageJson.setLanguage(); @@ -131,6 +132,7 @@ export class DoctorDiagnosisCaseSheetComponent } ngOnChanges() { + this.ncdScreeningCondition = null; if (this.casesheetData) { console.log('cases'); @@ -139,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) { 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 f7b870a..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 @@ -2852,7 +2852,7 @@ export class DoctorService { 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({ From 443a203a355582e4621a48c6c609d7b0dd010e60 Mon Sep 17 00:00:00 2001 From: SnehaRH Date: Wed, 1 Oct 2025 01:11:08 +0530 Subject: [PATCH 11/19] fix: resolved coderabit comments --- .../doctor-diagnosis-case-sheet.component.ts | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) 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 6a5bfc1..e460958 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 @@ -135,13 +135,11 @@ export class DoctorDiagnosisCaseSheetComponent this.ncdScreeningCondition = null; if (this.casesheetData) { - console.log('cases'); - console.log(this.casesheetData); + this.userName = this.casesheetData?.doctorData?.diagnosis?.createdBy; const temp2 = this.casesheetData.nurseData.covidDetails; 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) { @@ -387,7 +385,8 @@ export class DoctorDiagnosisCaseSheetComponent downloadSign() { this.getUserId().subscribe((userId) => { - const userIdToUse = this.beneficiaryDetails?.tCSpecialistUserID ?? userId; + const tcSpecId = this.beneficiaryDetails?.tCSpecialistUserID; + const userIdToUse = tcSpecId && tcSpecId !== 0 ? tcSpecId : userId; this.doctorService.downloadSign(userIdToUse).subscribe( (response: any) => { const blob = new Blob([response], { type: response.type }); From 769e8413caf73429401ff25906a93b95a582465b Mon Sep 17 00:00:00 2001 From: SnehaRH Date: Mon, 6 Oct 2025 17:45:01 +0530 Subject: [PATCH 12/19] fix: removed mandatory for provisional diagnosis for ncdcare and screening --- .../ncd-care-diagnosis/ncd-care-diagnosis.component.html | 2 +- .../ncd-screening-diagnosis.component.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/app/app-modules/nurse-doctor/case-record/general-case-record/diagnosis/ncd-care-diagnosis/ncd-care-diagnosis.component.html b/src/app/app-modules/nurse-doctor/case-record/general-case-record/diagnosis/ncd-care-diagnosis/ncd-care-diagnosis.component.html index 207558c..9806866 100644 --- a/src/app/app-modules/nurse-doctor/case-record/general-case-record/diagnosis/ncd-care-diagnosis/ncd-care-diagnosis.component.html +++ b/src/app/app-modules/nurse-doctor/case-record/general-case-record/diagnosis/ncd-care-diagnosis/ncd-care-diagnosis.component.html @@ -129,7 +129,7 @@

{{ current_language_set?.casesheet?.provisionalDiag }}

{{ current_language_set?.casesheet?.provisionalDiag }} diff --git a/src/app/app-modules/nurse-doctor/case-record/general-case-record/diagnosis/ncd-screening-diagnosis/ncd-screening-diagnosis.component.html b/src/app/app-modules/nurse-doctor/case-record/general-case-record/diagnosis/ncd-screening-diagnosis/ncd-screening-diagnosis.component.html index bfdb32b..205c023 100644 --- a/src/app/app-modules/nurse-doctor/case-record/general-case-record/diagnosis/ncd-screening-diagnosis/ncd-screening-diagnosis.component.html +++ b/src/app/app-modules/nurse-doctor/case-record/general-case-record/diagnosis/ncd-screening-diagnosis/ncd-screening-diagnosis.component.html @@ -22,7 +22,7 @@

{{ current_language_set?.casesheet?.provisionalDiag }} From 1b0dcc7f9b0969225b150a8487f2ef7f78509427 Mon Sep 17 00:00:00 2001 From: SnehaRH Date: Thu, 9 Oct 2025 19:52:29 +0530 Subject: [PATCH 13/19] fix: provisional diagnosis issue --- .../general-case-record/findings/findings.component.ts | 9 ++++++--- .../nurse-doctor/workarea/workarea.component.ts | 5 +++++ 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/src/app/app-modules/nurse-doctor/case-record/general-case-record/findings/findings.component.ts b/src/app/app-modules/nurse-doctor/case-record/general-case-record/findings/findings.component.ts index b37db54..de0762f 100644 --- a/src/app/app-modules/nurse-doctor/case-record/general-case-record/findings/findings.component.ts +++ b/src/app/app-modules/nurse-doctor/case-record/general-case-record/findings/findings.component.ts @@ -204,7 +204,7 @@ export class FindingsComponent implements OnInit, OnDestroy, DoCheck { } doctorMasterDataSubscription: any; - getDoctorMasterData() { + getDoctorMasterData() { this.doctorMasterDataSubscription = this.masterdataService.nurseMasterData$.subscribe((masterData) => { if (masterData) { @@ -212,7 +212,7 @@ export class FindingsComponent implements OnInit, OnDestroy, DoCheck { this.chiefComplaintTemporarayList[0] = this.chiefComplaintMaster.slice(); - if (this.caseRecordMode === 'view') { + if (String(this.caseRecordMode) === 'view') { this.beneficiaryRegID = this.sessionstorage.getItem('beneficiaryRegID'); this.visitID = this.sessionstorage.getItem('visitID'); @@ -220,11 +220,14 @@ export class FindingsComponent implements OnInit, OnDestroy, DoCheck { const specialistFlagString = this.sessionstorage.getItem('specialist_flag'); + if ( this.sessionstorage.getItem('referredVisitCode') === 'undefined' || - this.sessionstorage.getItem('referredVisitCode') === null + this.sessionstorage.getItem('referredVisitCode') === null || + this.sessionstorage.getItem('referredVisitCode') === '' ) { + this.getFindingDetails( this.beneficiaryRegID, this.visitID, 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 79bb379..b353b73 100644 --- a/src/app/app-modules/nurse-doctor/workarea/workarea.component.ts +++ b/src/app/app-modules/nurse-doctor/workarea/workarea.component.ts @@ -1679,6 +1679,11 @@ export class WorkareaComponent ); const diagForm3 = diagForm2.controls[0]; + if (diagForm3.controls['provisionalDiagnosis'].errors) { + required.push( + this.current_language_set.DiagnosisDetails.provisionaldiagnosis + ); + } if (!diagForm3.controls['viewProvisionalDiagnosisProvided'].errors) { diagForm2.value.filter((item: any) => { From 47e82e7852c91e2f34546f5287c96ad847a878c2 Mon Sep 17 00:00:00 2001 From: SnehaRH Date: Fri, 10 Oct 2025 19:16:38 +0530 Subject: [PATCH 14/19] fix: pnc form was not submitting --- .../diagnosis/pnc-diagnosis/pnc-diagnosis.component.ts | 1 + 1 file changed, 1 insertion(+) 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 e77880e..34c8e7d 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 @@ -448,6 +448,7 @@ export class PncDiagnosisComponent // Set the nested and top-level fields diagnosisFormGroup.patchValue({ + provisionalDiagnosis: selected?.term || null, viewProvisionalDiagnosisProvided: selected, conceptID: selected?.conceptID || null, term: selected?.term || null, From 6823f1a77d5767d3440376cf4f63337439567839 Mon Sep 17 00:00:00 2001 From: SnehaRH <77656297+snehar-nd@users.noreply.github.com> Date: Mon, 13 Oct 2025 10:28:17 +0530 Subject: [PATCH 15/19] Update pom.xml --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 266eeac..76e173a 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ 4.0.0 com.iemr.tm-ui tm-ui - 3.5.1 + 3.4.1 TM-UI Piramal - tm: Module ui war From 4356891cdba46a2c278203c200efea5c3e0acf1e Mon Sep 17 00:00:00 2001 From: SnehaRH Date: Mon, 13 Oct 2025 17:18:28 +0530 Subject: [PATCH 16/19] fix: aam 1895 reports tabular fix --- .../test-and-radiology.component.html | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/src/app/app-modules/nurse-doctor/case-record/general-case-record/test-and-radiology/test-and-radiology.component.html b/src/app/app-modules/nurse-doctor/case-record/general-case-record/test-and-radiology/test-and-radiology.component.html index d730bff..cfbbac2 100644 --- a/src/app/app-modules/nurse-doctor/case-record/general-case-record/test-and-radiology/test-and-radiology.component.html +++ b/src/app/app-modules/nurse-doctor/case-record/general-case-record/test-and-radiology/test-and-radiology.component.html @@ -85,17 +85,23 @@

vertical-align: middle; " > - {{ component?.componentName }} +
+ {{ component?.componentName }} +
- {{ component?.testResultValue }} +
+ {{ component?.testResultValue }} +
- {{ component?.testResultUnit }} +
+ {{ component?.testResultUnit }} +
vertical-align: middle; " > - {{ component?.remarks }} +
+ {{ component?.remarks }} +
From 13caf5cafd48b54b5bed5b4fb57e3c96899fa1a2 Mon Sep 17 00:00:00 2001 From: SnehaRH Date: Mon, 13 Oct 2025 19:39:22 +0530 Subject: [PATCH 17/19] fix: rovisional diagnosis fix --- .../general-opd-diagnosis.component.ts | 5 ++++- .../ncd-care-diagnosis.component.ts | 4 +++- .../ncd-screening-diagnosis.component.ts | 4 +++- .../pnc-diagnosis/pnc-diagnosis.component.ts | 22 +++++++++++++------ .../test-and-radiology.component.html | 10 +-------- .../workarea/workarea.component.ts | 2 +- 6 files changed, 27 insertions(+), 20 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 6f1bb21..ca8cd55 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 @@ -189,7 +189,10 @@ export class GeneralOpdDiagnosisComponent (diagnosisArrayList.at(i)).controls[ 'viewProvisionalDiagnosisProvided' ].disable(); - this.addDiagnosis(); + + if (diagnosisArrayList.length < savedDiagnosisData.length) { + this.addDiagnosis(); + } } } } 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 0bc6ef3..2a564e7 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 @@ -181,7 +181,9 @@ export class NcdCareDiagnosisComponent implements OnInit, DoCheck { (diagnosisArrayList.at(i)).controls[ 'viewProvisionalDiagnosisProvided' ].disable(); - this.addDiagnosis(); + if (diagnosisArrayList.length < savedDiagnosisData.length) { + this.addDiagnosis(); + } } } } 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 02e6e2b..ac20b76 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 @@ -220,7 +220,9 @@ export class NcdScreeningDiagnosisComponent (diagnosisArrayList.at(i)).controls[ 'viewProvisionalDiagnosisProvided' ].disable(); - this.addDiagnosis(); + if (diagnosisArrayList.length < savedDiagnosisData.length) { + this.addDiagnosis(); + } } } } 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 34c8e7d..1880b06 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 @@ -281,9 +281,9 @@ export class PncDiagnosisComponent .subscribe((res: any) => { if (res && res.statusCode === 200 && res.data && res.data.diagnosis) { this.generalDiagnosisForm.patchValue(res.data.diagnosis); - if (res.data.diagnosis.provisionalDiagnosisList) { + if (res.data.diagnosis) { this.patchDiagnosisDetails( - res.data.diagnosis.provisionalDiagnosisList, + res.data.diagnosis ); } } @@ -297,6 +297,8 @@ export class PncDiagnosisComponent this.handleDiagnosisData(diagnosis); } handleDiagnosisData(diagnosis: any) { + console.log("provisionalDiagnosisDataList dia", diagnosis.provisionalDiagnosisList); + if ( diagnosis.provisionalDiagnosisList && diagnosis.provisionalDiagnosisList.length > 0 @@ -315,8 +317,13 @@ export class PncDiagnosisComponent const provisionalDiagnosisList = this.generalDiagnosisForm.controls[ 'provisionalDiagnosisList' ] as FormArray; + + console.log("provisionalDiagnosisDataList", provisionalDiagnosisDataList); + + for (let i = 0; i < provisionalDiagnosisDataList.length; i++) { provisionalDiagnosisList.at(i).patchValue({ + provisionalDiagnosis: provisionalDiagnosisDataList[i].term, viewProvisionalDiagnosisProvided: provisionalDiagnosisDataList[i].term, term: provisionalDiagnosisDataList[i].term, conceptID: provisionalDiagnosisDataList[i].conceptID, @@ -324,14 +331,17 @@ export class PncDiagnosisComponent (provisionalDiagnosisList.at(i)).controls[ 'viewProvisionalDiagnosisProvided' ].disable(); - this.addProvisionalDiagnosis(); - } + if (provisionalDiagnosisList.length < provisionalDiagnosisDataList.length) + this.addProvisionalDiagnosis(); + } } handleConfirmatoryDiagnosisData(confirmatoryDiagnosisDataList: any) { const confirmatoryDiagnosisList = this.generalDiagnosisForm.controls[ 'confirmatoryDiagnosisList' ] as FormArray; + console.log("confirmatoryDiagnosisDataList", confirmatoryDiagnosisDataList); + for (let i = 0; i < confirmatoryDiagnosisDataList.length; i++) { confirmatoryDiagnosisList.at(i).patchValue({ viewConfirmatoryDiagnosisProvided: @@ -342,9 +352,7 @@ export class PncDiagnosisComponent (confirmatoryDiagnosisList.at(i)).controls[ 'viewConfirmatoryDiagnosisProvided' ].disable(); - if ( - confirmatoryDiagnosisList.length < confirmatoryDiagnosisDataList.length - ) + if (confirmatoryDiagnosisList.length < confirmatoryDiagnosisDataList.length) this.addConfirmatoryDiagnosis(); } } diff --git a/src/app/app-modules/nurse-doctor/case-record/general-case-record/test-and-radiology/test-and-radiology.component.html b/src/app/app-modules/nurse-doctor/case-record/general-case-record/test-and-radiology/test-and-radiology.component.html index cfbbac2..29addd1 100644 --- a/src/app/app-modules/nurse-doctor/case-record/general-case-record/test-and-radiology/test-and-radiology.component.html +++ b/src/app/app-modules/nurse-doctor/case-record/general-case-record/test-and-radiology/test-and-radiology.component.html @@ -85,23 +85,17 @@

vertical-align: middle; " > -
{{ component?.componentName }} -
-
{{ component?.testResultValue }} -
-
{{ component?.testResultUnit }} -
vertical-align: middle; " > -
- {{ component?.remarks }} -
+ {{ component?.remarks }} 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 b353b73..558c691 100644 --- a/src/app/app-modules/nurse-doctor/workarea/workarea.component.ts +++ b/src/app/app-modules/nurse-doctor/workarea/workarea.component.ts @@ -1679,7 +1679,7 @@ export class WorkareaComponent ); const diagForm3 = diagForm2.controls[0]; - if (diagForm3.controls['provisionalDiagnosis'].errors) { + if (diagForm3.controls['viewProvisionalDiagnosisProvided'].errors) { required.push( this.current_language_set.DiagnosisDetails.provisionaldiagnosis ); From 2dbe70254eb942e2bab2ebc303a6e210f97de239 Mon Sep 17 00:00:00 2001 From: SnehaRH <77656297+snehar-nd@users.noreply.github.com> Date: Mon, 13 Oct 2025 19:48:30 +0530 Subject: [PATCH 18/19] Update pom.xml --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 266eeac..76e173a 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ 4.0.0 com.iemr.tm-ui tm-ui - 3.5.1 + 3.4.1 TM-UI Piramal - tm: Module ui war From f4980d40e5fc0bdf5910a57f333dccfca9ebd607 Mon Sep 17 00:00:00 2001 From: SnehaRH Date: Thu, 16 Oct 2025 15:25:12 +0530 Subject: [PATCH 19/19] fix: aam-1898 next button not working, along with this fixed data is was not displying --- .../test-and-radiology/test-and-radiology.component.html | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/app/app-modules/nurse-doctor/case-record/general-case-record/test-and-radiology/test-and-radiology.component.html b/src/app/app-modules/nurse-doctor/case-record/general-case-record/test-and-radiology/test-and-radiology.component.html index 29addd1..4680ab7 100644 --- a/src/app/app-modules/nurse-doctor/case-record/general-case-record/test-and-radiology/test-and-radiology.component.html +++ b/src/app/app-modules/nurse-doctor/case-record/general-case-record/test-and-radiology/test-and-radiology.component.html @@ -52,7 +52,9 @@

- + +