Enhance death registration flow with loading state and condition handling

alopezo · alopezo · commit 72c7a74e09ff · 2026-04-15T13:51:42.000+02:00
diff --git a/src/app/benefits-demo/benefits-demo.component.html b/src/app/benefits-demo/benefits-demo.component.html
@@ -411,10 +411,10 @@ <h4>Demographics</h4>
                 color="primary"
                 (click)="openDeathRegistration()"
                 class="death-button"
-                [disabled]="isDeletingPatient"
+                [disabled]="isDeletingPatient || isOpeningDeathDialog"
                 >
-                <mat-icon>bed</mat-icon>
-                {{ getDeathActionLabel(selectedPatient) }}
+                <mat-icon>{{ isOpeningDeathDialog ? 'hourglass_empty' : 'bed' }}</mat-icon>
+                {{ isOpeningDeathDialog ? 'Loading...' : getDeathActionLabel(selectedPatient) }}
               </button>
               <button
                 mat-flat-button
diff --git a/src/app/benefits-demo/benefits-demo.component.ts b/src/app/benefits-demo/benefits-demo.component.ts
@@ -51,6 +51,7 @@ export class BenefitsDemoComponent implements OnInit, OnDestroy {
   isCreatingPatient = false;
   creatingPatientMessage = 'Creating patient...';
   isDeletingPatient = false;
+  isOpeningDeathDialog = false;
   isSearchingPatients = false;
   remoteSearchTotal: number | null = null;
   private subscriptions: Subscription[] = [];
@@ -562,11 +563,18 @@ export class BenefitsDemoComponent implements OnInit, OnDestroy {
     this.router.navigate(['/clinical-record', this.selectedPatient.id]);
   }
 
-  openDeathRegistration(): void {
-    if (!this.selectedPatient) {
+  async openDeathRegistration(): Promise<void> {
+    if (!this.selectedPatient || this.isOpeningDeathDialog) {
       return;
     }
 
+    this.isOpeningDeathDialog = true;
+    try {
+      await this.patientService.ensureConditionsAndDeathRecordLoaded(this.selectedPatient.id);
+    } finally {
+      this.isOpeningDeathDialog = false;
+    }
+
     const existingRecord = this.patientService.getPatientDeathRecord(this.selectedPatient.id);
     const conditions = this.patientService.getPatientConditions(this.selectedPatient.id);
 
diff --git a/src/app/benefits-demo/clinical-record/clinical-record.component.ts b/src/app/benefits-demo/clinical-record/clinical-record.component.ts
@@ -450,6 +450,7 @@ export class ClinicalRecordComponent implements OnInit, OnDestroy, AfterViewInit
   }
 
   async loadClinicalData(patientId: string): Promise<void> {
+    console.trace(`[loadClinicalData] called for patient ${patientId}`);
     if (this.patientService.getCurrentPersistenceMode() === 'fhir') {
       this.isLoadingClinicalData = true;
 
diff --git a/src/app/benefits-demo/death-registration-dialog/death-registration-dialog.component.html b/src/app/benefits-demo/death-registration-dialog/death-registration-dialog.component.html
@@ -64,7 +64,7 @@ <h2>{{ getDialogTitle() }}</h2>
             <mat-select [(value)]="line.selectedConditionId" (selectionChange)="onExistingConditionSelected(line)">
               <mat-option [value]="''">Select condition</mat-option>
               <mat-option *ngFor="let condition of data.conditions" [value]="condition.id">
-                {{ condition.code.text }}
+                {{ getConditionDisplayText(condition) }}
               </mat-option>
             </mat-select>
           </mat-form-field>
@@ -117,7 +117,7 @@ <h2>{{ getDialogTitle() }}</h2>
             <mat-select [(value)]="line.selectedConditionId" (selectionChange)="onExistingConditionSelected(line)">
               <mat-option [value]="''">Select condition</mat-option>
               <mat-option *ngFor="let condition of data.conditions" [value]="condition.id">
-                {{ condition.code.text }}
+                {{ getConditionDisplayText(condition) }}
               </mat-option>
             </mat-select>
           </mat-form-field>
diff --git a/src/app/benefits-demo/death-registration-dialog/death-registration-dialog.component.ts b/src/app/benefits-demo/death-registration-dialog/death-registration-dialog.component.ts
@@ -93,7 +93,6 @@ export class DeathRegistrationDialogComponent {
       return;
     }
 
-    this.removeExistingDerivedConditions();
     this.patientService.deletePatientDeathRecord(this.data.patient.id);
 
     const revivedPatient: Patient = {
@@ -183,8 +182,6 @@ export class DeathRegistrationDialogComponent {
         return;
       }
 
-      this.removeExistingDerivedConditions();
-
       const enrichedPart1 = await this.createDerivedConditions(
         serializedPart1.map(entry => ({ ...entry })),
         deceasedDateTime
@@ -248,12 +245,14 @@ export class DeathRegistrationDialogComponent {
     this.deceasedTime = existingDateTime;
 
     const part1LineCodes: Part1LineCode[] = ['a', 'b', 'c', 'd'];
+    const part1Diagnoses = this.getBundleDiagnoses(this.data.existingRecord, 'part1');
+    const part2Diagnoses = this.getBundleDiagnoses(this.data.existingRecord, 'part2');
+
     this.part1Lines = part1LineCodes.map(lineCode => {
-      const existingLine = this.getBundleDiagnoses(this.data.existingRecord!, 'part1').find(line => line.line === lineCode);
+      const existingLine = part1Diagnoses.find(line => line.line === lineCode);
       return existingLine ? this.mapDiagnosisToLine(existingLine, lineCode) : this.createPart1Line(lineCode);
     });
 
-    const part2Diagnoses = this.getBundleDiagnoses(this.data.existingRecord, 'part2');
     this.part2Lines = part2Diagnoses.length > 0
       ? part2Diagnoses.map(line => this.mapDiagnosisToLine(line))
       : [this.createPart2Line()];
@@ -284,7 +283,7 @@ export class DeathRegistrationDialogComponent {
     return {
       line,
       sourceType: diagnosis.sourceType,
-      selectedConditionId: diagnosis.sourceConditionId || '',
+      selectedConditionId: this.resolveConditionId(diagnosis),
       selectedConcept: diagnosis.snomedConceptId
         ? { code: diagnosis.snomedConceptId, display: diagnosis.snomedDisplay || diagnosis.text }
         : null,
@@ -294,6 +293,22 @@ export class DeathRegistrationDialogComponent {
     };
   }
 
+  private resolveConditionId(diagnosis: DeathRecordDiagnosis): string {
+    if (diagnosis.sourceConditionId && this.data.conditions.some(c => c.id === diagnosis.sourceConditionId)) {
+      return diagnosis.sourceConditionId;
+    }
+    if (diagnosis.snomedConceptId) {
+      const match = this.data.conditions.find(c => {
+        const coding = this.patientService.getConditionSnomedCoding(c);
+        return coding?.code === diagnosis.snomedConceptId;
+      });
+      if (match) {
+        return match.id;
+      }
+    }
+    return diagnosis.sourceConditionId || '';
+  }
+
   private async serializePart1(): Promise<Array<DeathRecordDiagnosis & { line: Part1LineCode }>> {
     const results: Array<DeathRecordDiagnosis & { line: Part1LineCode }> = [];
 
@@ -418,30 +433,15 @@ export class DeathRegistrationDialogComponent {
         }
       ];
 
-      await this.patientService.addPatientConditionAllowDuplicatesEnriched(this.data.patient.id, condition);
-      diagnosis.derivedConditionId = condition.id;
+      const savedCondition = await this.patientService.addPatientConditionAllowDuplicatesEnriched(this.data.patient.id, condition);
+      diagnosis.sourceType = 'existing-condition';
+      diagnosis.sourceConditionId = savedCondition.id;
+      diagnosis.derivedConditionId = undefined;
     }
 
     return diagnoses;
   }
 
-  private removeExistingDerivedConditions(): void {
-    if (!this.data.existingRecord) {
-      return;
-    }
-
-    const previousDiagnoses = [
-      ...this.getBundleDiagnoses(this.data.existingRecord, 'part1'),
-      ...this.getBundleDiagnoses(this.data.existingRecord, 'part2')
-    ];
-
-    previousDiagnoses.forEach(diagnosis => {
-      if (diagnosis.derivedConditionId) {
-        this.patientService.deletePatientCondition(this.data.patient.id, diagnosis.derivedConditionId);
-      }
-    });
-  }
-
   private getConditionById(conditionId?: string): Condition | undefined {
     if (!conditionId) {
       return undefined;
@@ -450,6 +450,17 @@ export class DeathRegistrationDialogComponent {
     return this.data.conditions.find(condition => condition.id === conditionId);
   }
 
+  getConditionDisplayText(condition: Condition): string {
+    if (condition.code?.text) {
+      return condition.code.text;
+    }
+    const snomed = this.patientService.getConditionSnomedCoding(condition);
+    if (snomed?.display) {
+      return snomed.display;
+    }
+    return condition.code?.coding?.find(c => c.display)?.display || condition.id || '';
+  }
+
   private getConditionSnomed(condition: Condition): { code?: string; display?: string } {
     const coding = this.patientService.getConditionSnomedCoding(condition) || condition.code?.coding?.[0];
 
@@ -506,7 +517,7 @@ export class DeathRegistrationDialogComponent {
 
     const entries = [
       { fullUrl: `urn:uuid:${compositionId}`, resource: compositionResource },
-      { fullUrl: `urn:uuid:${this.data.patient.id}`, resource: patientResource },
+      { fullUrl: `Patient/${this.data.patient.id}`, resource: patientResource },
       { fullUrl: `urn:uuid:${practitionerId}`, resource: practitionerResource },
       { fullUrl: `urn:uuid:${procedureId}`, resource: procedureResource },
       ...part1Observations.map(resource => ({ fullUrl: `urn:uuid:${resource.id}`, resource })),
@@ -570,7 +581,7 @@ export class DeathRegistrationDialogComponent {
         text: 'Death certification'
       },
       subject: {
-        reference: `urn:uuid:${this.data.patient.id}`
+        reference: `Patient/${this.data.patient.id}`
       },
       performedDateTime: deceasedDateTime,
       performer: [
@@ -609,7 +620,7 @@ export class DeathRegistrationDialogComponent {
         text: 'Death certificate'
       },
       subject: {
-        reference: `urn:uuid:${this.data.patient.id}`
+        reference: `Patient/${this.data.patient.id}`
       },
       date: deceasedDateTime,
       author: [
@@ -672,7 +683,7 @@ export class DeathRegistrationDialogComponent {
         ]
       },
       subject: {
-        reference: `urn:uuid:${this.data.patient.id}`
+        reference: `Patient/${this.data.patient.id}`
       },
       performer: [
         {
@@ -737,7 +748,7 @@ export class DeathRegistrationDialogComponent {
         ]
       },
       subject: {
-        reference: `urn:uuid:${this.data.patient.id}`
+        reference: `Patient/${this.data.patient.id}`
       },
       performer: [
         {
diff --git a/src/app/services/patient-fhir-storage.service.ts b/src/app/services/patient-fhir-storage.service.ts
@@ -35,6 +35,8 @@ import {
 export class PatientFhirStorageService implements PatientStorageBackend {
   private readonly patientPageSize = 20;
   private static readonly BUNDLE_PATIENT_REFERENCE_EXTENSION_URL = 'http://snomed.org/fhir/StructureDefinition/patient-reference';
+  private static readonly DEATH_CERTIFICATE_IDENTIFIER_SYSTEM = 'http://example.org/fhir/identifiers/death-certificate-document';
+  private static readonly BUNDLE_PATIENT_TAG_SYSTEM = 'http://snomed.org/fhir/tags/patient';
 
   constructor(private fhirService: FhirService) {}
 
@@ -395,9 +397,9 @@ export class PatientFhirStorageService implements PatientStorageBackend {
   async updateServiceRequest(patientId: string, requestId: string, serviceRequest: ServiceRequest): Promise<ServiceRequest> { return await firstValueFrom(this.fhirService.update('ServiceRequest', requestId, serviceRequest)); }
   async deleteServiceRequest(patientId: string, requestId: string): Promise<void> { await firstValueFrom(this.fhirService.delete('ServiceRequest', requestId)); }
 
-  async getLabOrders(patientId: string): Promise<LaboratoryOrderGroup[]> {
-    const bundles = await this.fetchPatientBundles(patientId, 'document');
-    return bundles.map((bundle: any) => ({
+  async getLabOrders(patientId: string, prefetchedBundles?: any[]): Promise<LaboratoryOrderGroup[]> {
+    const bundles = prefetchedBundles ?? await this.fetchPatientBundles(patientId, 'document');
+    return bundles.filter((bundle: any) => !this.isDeathCertificateBundle(bundle)).map((bundle: any) => ({
       id: bundle.id,
       patientId,
       patientDisplay: this.getPatientDisplay(bundle, patientId),
@@ -441,8 +443,7 @@ export class PatientFhirStorageService implements PatientStorageBackend {
   async deleteQuestionnaireResponse(patientId: string, responseId: string): Promise<void> { await firstValueFrom(this.fhirService.delete('QuestionnaireResponse', responseId)); }
 
   async getDeathRecord(patientId: string): Promise<DeathRecord | null> {
-    const bundles = await this.fetchPatientBundles(patientId, 'document');
-    return (bundles[0] as DeathRecord) || null;
+    return this.fetchDeathRecordBundle(patientId);
   }
 
   async saveDeathRecord(patientId: string, record: DeathRecord): Promise<DeathRecord> {
@@ -503,11 +504,12 @@ export class PatientFhirStorageService implements PatientStorageBackend {
       .filter((resource: any) => resource?.resourceType === 'Encounter')
       .map((encounter: any) => this.hydrateEncounterFreeText(encounter)) as Encounter[];
 
-    const [labOrders, provenance, deathRecord] = await Promise.all([
-      this.getLabOrders(patientId),
+    const [documentBundles, provenance, deathRecord] = await Promise.all([
+      this.fetchPatientBundles(patientId, 'document'),
       this.getProvenance(patientId),
-      this.getDeathRecord(patientId)
+      this.fetchDeathRecordBundle(patientId)
     ]);
+    const labOrders = await this.getLabOrders(patientId, documentBundles);
 
     return {
       conditions,
@@ -722,14 +724,43 @@ export class PatientFhirStorageService implements PatientStorageBackend {
   }
 
   private async fetchPatientBundles(patientId: string, bundleType?: string): Promise<any[]> {
+    const patientRef = this.getPatientReference(patientId);
     const initialBundle = await firstValueFrom(this.fhirService.search('Bundle', {
       type: bundleType,
-      'composition.patient': this.getPatientReference(patientId),
+      _tag: `${PatientFhirStorageService.BUNDLE_PATIENT_TAG_SYSTEM}|${patientRef}`,
       _count: 200
     }));
 
     const combinedBundle = await this.collectPagedBundle(initialBundle);
-    return this.extractBundleResources<any>(combinedBundle, 'Bundle');
+    const bundles = this.extractBundleResources<any>(combinedBundle, 'Bundle');
+    return bundles.filter((bundle) => this.bundleBelongsToPatient(bundle, patientRef));
+  }
+
+  private isDeathCertificateBundle(bundle: any): boolean {
+    return bundle?.identifier?.system === PatientFhirStorageService.DEATH_CERTIFICATE_IDENTIFIER_SYSTEM;
+  }
+
+  private async fetchDeathRecordBundle(patientId: string): Promise<DeathRecord | null> {
+    const patientRef = this.getPatientReference(patientId);
+    const result = await firstValueFrom(this.fhirService.search('Bundle', {
+      _tag: `${PatientFhirStorageService.BUNDLE_PATIENT_TAG_SYSTEM}|${patientRef}`,
+      identifier: `${PatientFhirStorageService.DEATH_CERTIFICATE_IDENTIFIER_SYSTEM}|`,
+      _count: 5
+    }));
+    const bundles = this.extractBundleResources<any>(result, 'Bundle');
+    return (bundles.find(bundle =>
+      this.isDeathCertificateBundle(bundle) && this.bundleBelongsToPatient(bundle, patientRef)
+    ) as DeathRecord) ?? null;
+  }
+
+  private bundleBelongsToPatient(bundle: any, patientRef: string): boolean {
+    const extension = (bundle.extension || []).find(
+      (ext: any) => ext.url === PatientFhirStorageService.BUNDLE_PATIENT_REFERENCE_EXTENSION_URL
+    );
+    if (extension?.valueReference?.reference === patientRef) {
+      return true;
+    }
+    return this.getBundlePatientReference(bundle) === patientRef;
   }
 
   private extractBundleResources<T>(bundle: any, resourceType?: string): T[] {
@@ -982,18 +1013,33 @@ export class PatientFhirStorageService implements PatientStorageBackend {
     }
   }
 
-  private withBundlePatientReference<T extends Record<string, any>>(resource: T, patientId: string): T & { extension: any[] } {
+  private withBundlePatientReference<T extends Record<string, any>>(resource: T, patientId: string): T & { extension: any[]; meta: any } {
     const extensions = Array.isArray(resource['extension']) ? [...resource['extension']] : [];
     const otherExtensions = extensions.filter((extension: any) => extension.url !== PatientFhirStorageService.BUNDLE_PATIENT_REFERENCE_EXTENSION_URL);
 
+    const patientRef = this.getPatientReference(patientId);
+    const existingMeta = resource['meta'] || {};
+    const existingTags: any[] = Array.isArray(existingMeta.tag) ? existingMeta.tag : [];
+    const otherTags = existingTags.filter((tag: any) => tag.system !== PatientFhirStorageService.BUNDLE_PATIENT_TAG_SYSTEM);
+
     return {
       ...resource,
+      meta: {
+        ...existingMeta,
+        tag: [
+          ...otherTags,
+          {
+            system: PatientFhirStorageService.BUNDLE_PATIENT_TAG_SYSTEM,
+            code: patientRef
+          }
+        ]
+      },
       extension: [
         ...otherExtensions,
         {
           url: PatientFhirStorageService.BUNDLE_PATIENT_REFERENCE_EXTENSION_URL,
           valueReference: {
-            reference: this.getPatientReference(patientId)
+            reference: patientRef
           }
         }
       ]
diff --git a/src/app/services/patient.service.ts b/src/app/services/patient.service.ts

Original file line number	Diff line number	Diff line change
`@@ -450,6 +450,7 @@ export class ClinicalRecordComponent implements OnInit, OnDestroy, AfterViewInit`
`450`	`450`	`}`
`451`	`451`
`452`	`452`	`async loadClinicalData(patientId: string): Promise<void> {`
	`453`	+ console.trace(`[loadClinicalData] called for patient ${patientId}`);
`453`	`454`	`if (this.patientService.getCurrentPersistenceMode() === 'fhir') {`
`454`	`455`	`this.isLoadingClinicalData = true;`
`455`	`456`