adding popover info for General Practitioner/Primary Care.

fastenhealth · Aug 18, 2023 · 97f15d5 · 97f15d5
1 parent 5b01441
commit 97f15d5
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/frontend/src/app/components/report-header/report-header.component.html b/frontend/src/app/components/report-header/report-header.component.html
@@ -13,7 +13,7 @@ <h6>Oct 10, 2018</h6>
     <div *ngIf="primaryCare" class="media">
       <div class="media-body">
         <label>Primary Care</label>
-        <h6>{{primaryCare | fhirPath: "Practitioner.name.family.first()"}}, {{primaryCare | fhirPath: "Practitioner.name.given.first()"}}</h6>
+        <h6 class="cursor-pointer" [ngbPopover]="primaryCarePopoverContent" placement="bottom" >{{primaryCare?.name?.[0]?.displayName }}</h6>
       </div><!-- media-body -->
     </div><!-- media -->
     <div class="media">
@@ -38,3 +38,7 @@ <h6>All Sources</h6>
     <a class="nav-link" routerLink="/" ngbTooltip="not yet implemented"><i class="fas fa-ellipsis-h"></i></a>
   </nav>
 </div>
+
+<ng-template #primaryCarePopoverContent>
+  <fhir-resource [displayModel]="primaryCare"></fhir-resource>
+</ng-template>
diff --git a/frontend/src/app/components/report-header/report-header.component.ts b/frontend/src/app/components/report-header/report-header.component.ts
@@ -2,6 +2,7 @@ import {Component, Input, OnInit} from '@angular/core';
 import {ResourceFhir} from '../../models/fasten/resource_fhir';
 import {FastenApiService} from '../../services/fasten-api.service';
 import * as fhirpath from 'fhirpath';
+import {PractitionerModel} from '../../../lib/models/resources/practitioner-model';
 
 @Component({
   selector: 'report-header',
@@ -10,7 +11,7 @@ import * as fhirpath from 'fhirpath';
 })
 export class ReportHeaderComponent implements OnInit {
   patient: ResourceFhir = null
-  primaryCare: ResourceFhir = null
+  primaryCare: PractitionerModel = null
   @Input() reportHeaderTitle: string = ""
   @Input() reportHeaderSubTitle: string = "Organized by condition and encounters"
 
@@ -31,7 +32,9 @@ export class ReportHeaderComponent implements OnInit {
         if(primaryCareIdParts.length == 2) {
           console.log(primaryCareIdParts)
           this.fastenApi.getResources(primaryCareIdParts[0], this.patient.source_id,  primaryCareIdParts[1]).subscribe(primaryResults => {
-            this.primaryCare = primaryResults[0]
+            if (primaryResults.length > 0){
+              this.primaryCare = new PractitionerModel(primaryResults[0].resource_raw)
+            }
           })
         }
       }