From f0d77c43bbc21705035fe2f30b3d0a722d369040 Mon Sep 17 00:00:00 2001 From: vanitha1822 Date: Wed, 1 Apr 2026 15:13:40 +0530 Subject: [PATCH 1/7] fix: km view file issue --- Common-UI | 2 +- src/app/app-modules/lab/workarea/workarea.component.ts | 2 +- .../test-and-radiology/test-and-radiology.component.ts | 2 +- .../visit-details/upload-files/upload-files.component.ts | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Common-UI b/Common-UI index 0742c81a..9189f4d5 160000 --- a/Common-UI +++ b/Common-UI @@ -1 +1 @@ -Subproject commit 0742c81ab8efa969b4e868d964fe5fd87031b94b +Subproject commit 9189f4d53e73011197606d850b6e321fd53522bf diff --git a/src/app/app-modules/lab/workarea/workarea.component.ts b/src/app/app-modules/lab/workarea/workarea.component.ts index e15dd4ba..a22cbb3f 100644 --- a/src/app/app-modules/lab/workarea/workarea.component.ts +++ b/src/app/app-modules/lab/workarea/workarea.component.ts @@ -1016,7 +1016,7 @@ export class WorkareaComponent this.labService.viewFileContent(fileID).subscribe((res: any) => { if (res && res.data && res.data.statusCode === 200) { const fileContent = res.data.data?.response; - location.href = fileContent; + window.open(fileContent, '_blank'); } }); } diff --git a/src/app/app-modules/nurse-doctor/case-record/general-case-record/test-and-radiology/test-and-radiology.component.ts b/src/app/app-modules/nurse-doctor/case-record/general-case-record/test-and-radiology/test-and-radiology.component.ts index 2c3c9ff2..ca4aebe9 100644 --- a/src/app/app-modules/nurse-doctor/case-record/general-case-record/test-and-radiology/test-and-radiology.component.ts +++ b/src/app/app-modules/nurse-doctor/case-record/general-case-record/test-and-radiology/test-and-radiology.component.ts @@ -507,7 +507,7 @@ export class TestAndRadiologyComponent implements OnInit, OnDestroy, DoCheck { (res: any) => { if (res.data.statusCode === 200) { const fileContent = res.data.data.response; - location.href = fileContent; + window.open(fileContent, '_blank'); } }, (err) => { diff --git a/src/app/app-modules/nurse-doctor/visit-details/upload-files/upload-files.component.ts b/src/app/app-modules/nurse-doctor/visit-details/upload-files/upload-files.component.ts index 0ca9ce57..1aec9d17 100644 --- a/src/app/app-modules/nurse-doctor/visit-details/upload-files/upload-files.component.ts +++ b/src/app/app-modules/nurse-doctor/visit-details/upload-files/upload-files.component.ts @@ -318,7 +318,7 @@ export class UploadFilesComponent implements OnInit, DoCheck, OnChanges { this.labService.viewFileContent(fileID).subscribe((res: any) => { if (res && res.data && res.data.statusCode === 200) { const fileContent = res.data.data?.response; - location.href = fileContent; + window.open(fileContent, '_blank'); } }); } From d0e3af15063593bc821cb403b633ce171781e972 Mon Sep 17 00:00:00 2001 From: vanitha1822 Date: Wed, 1 Apr 2026 15:54:15 +0530 Subject: [PATCH 2/7] fix: update release --- Common-UI | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Common-UI b/Common-UI index 9189f4d5..93c91570 160000 --- a/Common-UI +++ b/Common-UI @@ -1 +1 @@ -Subproject commit 9189f4d53e73011197606d850b6e321fd53522bf +Subproject commit 93c915707165d8ebeefa5c62cc087b08184b261a From 051fdb1323500db47f299907960cd8ae2ded821f Mon Sep 17 00:00:00 2001 From: vanitha1822 Date: Wed, 1 Apr 2026 22:05:01 +0530 Subject: [PATCH 3/7] fix: km file download --- src/app/app-modules/lab/workarea/workarea.component.ts | 7 ++++++- .../test-and-radiology/test-and-radiology.component.ts | 7 ++++++- .../visit-details/upload-files/upload-files.component.ts | 7 ++++++- 3 files changed, 18 insertions(+), 3 deletions(-) diff --git a/src/app/app-modules/lab/workarea/workarea.component.ts b/src/app/app-modules/lab/workarea/workarea.component.ts index a22cbb3f..4aebe70c 100644 --- a/src/app/app-modules/lab/workarea/workarea.component.ts +++ b/src/app/app-modules/lab/workarea/workarea.component.ts @@ -1016,7 +1016,12 @@ export class WorkareaComponent this.labService.viewFileContent(fileID).subscribe((res: any) => { if (res && res.data && res.data.statusCode === 200) { const fileContent = res.data.data?.response; - window.open(fileContent, '_blank'); + const a = document.createElement('a'); + a.href = fileContent; + a.target = '_blank'; + document.body.appendChild(a); + a.click(); + document.body.removeChild(a); } }); } diff --git a/src/app/app-modules/nurse-doctor/case-record/general-case-record/test-and-radiology/test-and-radiology.component.ts b/src/app/app-modules/nurse-doctor/case-record/general-case-record/test-and-radiology/test-and-radiology.component.ts index ca4aebe9..dafa4c27 100644 --- a/src/app/app-modules/nurse-doctor/case-record/general-case-record/test-and-radiology/test-and-radiology.component.ts +++ b/src/app/app-modules/nurse-doctor/case-record/general-case-record/test-and-radiology/test-and-radiology.component.ts @@ -507,7 +507,12 @@ export class TestAndRadiologyComponent implements OnInit, OnDestroy, DoCheck { (res: any) => { if (res.data.statusCode === 200) { const fileContent = res.data.data.response; - window.open(fileContent, '_blank'); + const a = document.createElement('a'); + a.href = fileContent; + a.target = '_blank'; + document.body.appendChild(a); + a.click(); + document.body.removeChild(a); } }, (err) => { diff --git a/src/app/app-modules/nurse-doctor/visit-details/upload-files/upload-files.component.ts b/src/app/app-modules/nurse-doctor/visit-details/upload-files/upload-files.component.ts index 1aec9d17..f10cc5a5 100644 --- a/src/app/app-modules/nurse-doctor/visit-details/upload-files/upload-files.component.ts +++ b/src/app/app-modules/nurse-doctor/visit-details/upload-files/upload-files.component.ts @@ -318,7 +318,12 @@ export class UploadFilesComponent implements OnInit, DoCheck, OnChanges { this.labService.viewFileContent(fileID).subscribe((res: any) => { if (res && res.data && res.data.statusCode === 200) { const fileContent = res.data.data?.response; - window.open(fileContent, '_blank'); + const a = document.createElement('a'); + a.href = fileContent; + a.target = '_blank'; + document.body.appendChild(a); + a.click(); + document.body.removeChild(a); } }); } From eadd8cacf95a5cdf5286695cbdef3d2bac16e52c Mon Sep 17 00:00:00 2001 From: vanitha1822 Date: Thu, 2 Apr 2026 10:06:55 +0530 Subject: [PATCH 4/7] fix: replace duplicate http --- src/app/app-modules/lab/workarea/workarea.component.ts | 2 +- .../test-and-radiology/test-and-radiology.component.ts | 2 +- .../visit-details/upload-files/upload-files.component.ts | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/app/app-modules/lab/workarea/workarea.component.ts b/src/app/app-modules/lab/workarea/workarea.component.ts index 4aebe70c..42aa8409 100644 --- a/src/app/app-modules/lab/workarea/workarea.component.ts +++ b/src/app/app-modules/lab/workarea/workarea.component.ts @@ -1015,7 +1015,7 @@ export class WorkareaComponent }; this.labService.viewFileContent(fileID).subscribe((res: any) => { if (res && res.data && res.data.statusCode === 200) { - const fileContent = res.data.data?.response; + const fileContent = res.data.data?.response?.replace(/^(https?:\/\/)+/, '$1'); const a = document.createElement('a'); a.href = fileContent; a.target = '_blank'; diff --git a/src/app/app-modules/nurse-doctor/case-record/general-case-record/test-and-radiology/test-and-radiology.component.ts b/src/app/app-modules/nurse-doctor/case-record/general-case-record/test-and-radiology/test-and-radiology.component.ts index dafa4c27..49fc7566 100644 --- a/src/app/app-modules/nurse-doctor/case-record/general-case-record/test-and-radiology/test-and-radiology.component.ts +++ b/src/app/app-modules/nurse-doctor/case-record/general-case-record/test-and-radiology/test-and-radiology.component.ts @@ -506,7 +506,7 @@ export class TestAndRadiologyComponent implements OnInit, OnDestroy, DoCheck { this.labService.viewFileContent(fileID).subscribe( (res: any) => { if (res.data.statusCode === 200) { - const fileContent = res.data.data.response; + const fileContent = res.data.data.response?.replace(/^(https?:\/\/)+/, '$1'); const a = document.createElement('a'); a.href = fileContent; a.target = '_blank'; diff --git a/src/app/app-modules/nurse-doctor/visit-details/upload-files/upload-files.component.ts b/src/app/app-modules/nurse-doctor/visit-details/upload-files/upload-files.component.ts index f10cc5a5..1cb6818e 100644 --- a/src/app/app-modules/nurse-doctor/visit-details/upload-files/upload-files.component.ts +++ b/src/app/app-modules/nurse-doctor/visit-details/upload-files/upload-files.component.ts @@ -317,7 +317,7 @@ export class UploadFilesComponent implements OnInit, DoCheck, OnChanges { }; this.labService.viewFileContent(fileID).subscribe((res: any) => { if (res && res.data && res.data.statusCode === 200) { - const fileContent = res.data.data?.response; + const fileContent = res.data.data?.response?.replace(/^(https?:\/\/)+/, '$1'); const a = document.createElement('a'); a.href = fileContent; a.target = '_blank'; From acc6074f4d87b23539eebe171b0930911dbe8453 Mon Sep 17 00:00:00 2001 From: vanitha1822 Date: Mon, 6 Apr 2026 10:34:27 +0530 Subject: [PATCH 5/7] fix: update the response structure --- src/app/app-modules/lab/workarea/workarea.component.ts | 4 ++-- .../test-and-radiology/test-and-radiology.component.ts | 4 ++-- .../visit-details/upload-files/upload-files.component.ts | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/app/app-modules/lab/workarea/workarea.component.ts b/src/app/app-modules/lab/workarea/workarea.component.ts index 42aa8409..480b9297 100644 --- a/src/app/app-modules/lab/workarea/workarea.component.ts +++ b/src/app/app-modules/lab/workarea/workarea.component.ts @@ -1014,8 +1014,8 @@ export class WorkareaComponent fileID: result, }; this.labService.viewFileContent(fileID).subscribe((res: any) => { - if (res && res.data && res.data.statusCode === 200) { - const fileContent = res.data.data?.response?.replace(/^(https?:\/\/)+/, '$1'); + if (res && res.statusCode === 200) { + const fileContent = res.data?.response; const a = document.createElement('a'); a.href = fileContent; a.target = '_blank'; diff --git a/src/app/app-modules/nurse-doctor/case-record/general-case-record/test-and-radiology/test-and-radiology.component.ts b/src/app/app-modules/nurse-doctor/case-record/general-case-record/test-and-radiology/test-and-radiology.component.ts index 49fc7566..c636ec8b 100644 --- a/src/app/app-modules/nurse-doctor/case-record/general-case-record/test-and-radiology/test-and-radiology.component.ts +++ b/src/app/app-modules/nurse-doctor/case-record/general-case-record/test-and-radiology/test-and-radiology.component.ts @@ -505,8 +505,8 @@ export class TestAndRadiologyComponent implements OnInit, OnDestroy, DoCheck { }; this.labService.viewFileContent(fileID).subscribe( (res: any) => { - if (res.data.statusCode === 200) { - const fileContent = res.data.data.response?.replace(/^(https?:\/\/)+/, '$1'); + if (res.statusCode === 200) { + const fileContent = res.data.response; const a = document.createElement('a'); a.href = fileContent; a.target = '_blank'; diff --git a/src/app/app-modules/nurse-doctor/visit-details/upload-files/upload-files.component.ts b/src/app/app-modules/nurse-doctor/visit-details/upload-files/upload-files.component.ts index 1cb6818e..ada81d80 100644 --- a/src/app/app-modules/nurse-doctor/visit-details/upload-files/upload-files.component.ts +++ b/src/app/app-modules/nurse-doctor/visit-details/upload-files/upload-files.component.ts @@ -316,8 +316,8 @@ export class UploadFilesComponent implements OnInit, DoCheck, OnChanges { fileID: result, }; this.labService.viewFileContent(fileID).subscribe((res: any) => { - if (res && res.data && res.data.statusCode === 200) { - const fileContent = res.data.data?.response?.replace(/^(https?:\/\/)+/, '$1'); + if (res && res.statusCode === 200) { + const fileContent = res.data?.response; const a = document.createElement('a'); a.href = fileContent; a.target = '_blank'; From 05afaa709b0acea23e2a6e18bd9ad4620e05294c Mon Sep 17 00:00:00 2001 From: vanitha1822 Date: Tue, 7 Apr 2026 14:27:22 +0530 Subject: [PATCH 6/7] fix: revert back common-ui --- Common-UI | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Common-UI b/Common-UI index 93c91570..e1f37135 160000 --- a/Common-UI +++ b/Common-UI @@ -1 +1 @@ -Subproject commit 93c915707165d8ebeefa5c62cc087b08184b261a +Subproject commit e1f371353bf9d805a663507482055199d7bafd6c From 3066078c0034031106774d15d7965b65c2707d62 Mon Sep 17 00:00:00 2001 From: vanitha1822 Date: Tue, 7 Apr 2026 14:34:31 +0530 Subject: [PATCH 7/7] fix: reverted common-ui --- Common-UI | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Common-UI b/Common-UI index e1f37135..0742c81a 160000 --- a/Common-UI +++ b/Common-UI @@ -1 +1 @@ -Subproject commit e1f371353bf9d805a663507482055199d7bafd6c +Subproject commit 0742c81ab8efa969b4e868d964fe5fd87031b94b