diff --git a/Common-UI b/Common-UI index 209356cf..a5b78ec4 160000 --- a/Common-UI +++ b/Common-UI @@ -1 +1 @@ -Subproject commit 209356cf324fb19ca5705e62c58931062468147f +Subproject commit a5b78ec4b7ce8bfc369a88d23ccecce9c345e0e1 diff --git a/src/app/app-modules/nurse-doctor/refer/cancer-refer/cancer-refer.component.ts b/src/app/app-modules/nurse-doctor/refer/cancer-refer/cancer-refer.component.ts index 7b298056..b0965aa2 100644 --- a/src/app/app-modules/nurse-doctor/refer/cancer-refer/cancer-refer.component.ts +++ b/src/app/app-modules/nurse-doctor/refer/cancer-refer/cancer-refer.component.ts @@ -107,7 +107,11 @@ export class CancerReferComponent implements OnInit, DoCheck, OnDestroy { this.masterdataService.doctorMasterData$.subscribe(masterData => { if (masterData) { this.higherHealthcareCenter = masterData.higherHealthCare; - this.additionalServices = masterData.additionalServices; + this.additionalServices = ( + masterData.additionalServices || [] + ).filter((s: any) => + ['104', '1097'].includes(String(s?.serviceName).trim()) + ); this.referralReason = masterData.referralReason; console.log(masterData.revisitDate); console.log('hi'); diff --git a/src/app/app-modules/nurse-doctor/refer/general-refer/general-refer.component.ts b/src/app/app-modules/nurse-doctor/refer/general-refer/general-refer.component.ts index b862e534..7afa0bf8 100644 --- a/src/app/app-modules/nurse-doctor/refer/general-refer/general-refer.component.ts +++ b/src/app/app-modules/nurse-doctor/refer/general-refer/general-refer.component.ts @@ -187,7 +187,11 @@ export class GeneralReferComponent implements OnInit, DoCheck, OnDestroy { this.instituteFlag = true; sessionStorage.setItem('instFlag', 'true'); } - this.additionalServices = masterData.additionalServices; + this.additionalServices = ( + masterData.additionalServices || [] + ).filter((s: any) => + ['104', '1097'].includes(String(s?.serviceName).trim()) + ); console.log(masterData.revisitDate); console.log('hi'); this.revisitDate = masterData.revisitDate;