- Under Construction Fasten does not currently support adding lab results manually.
This feature is expected to be available in the next release. +
+
+
+
+
+
+
+
+
diff --git a/frontend/src/app/components/medical-record-wizard/medical-record-wizard.component.ts b/frontend/src/app/components/medical-record-wizard/medical-record-wizard.component.ts
index 934f8918..d91c611c 100644
--- a/frontend/src/app/components/medical-record-wizard/medical-record-wizard.component.ts
+++ b/frontend/src/app/components/medical-record-wizard/medical-record-wizard.component.ts
@@ -38,9 +38,13 @@ import {
import {generateReferenceUriFromResourceOrReference, internalResourceReferenceUri} from '../../../lib/utils/bundle_references';
import {
+ Bundle,
FhirResource,
List, Reference
} from 'fhir/r4';
+import {
+ MedicalRecordWizardAddLabResultsComponent
+} from '../medical-record-wizard-add-lab-results/medical-record-wizard-add-lab-results.component';
@Component({
standalone: true,
@@ -91,6 +95,7 @@ export class MedicalRecordWizardComponent implements OnInit {
procedures: new FormArray([]),
practitioners: new FormArray([]),
organizations: new FormArray([]),
+ labresults: new FormArray([]),
attachments: new FormArray([]),
});
@@ -112,6 +117,9 @@ export class MedicalRecordWizardComponent implements OnInit {
get organizations(): FormArray {
return this.form.controls["organizations"] as FormArray;
}
+ get labresults(): FormArray {
+ return this.form.controls["labresults"] as FormArray;
+ }
get attachments(): FormArray {
return this.form.controls["attachments"] as FormArray;
}
@@ -130,6 +138,9 @@ export class MedicalRecordWizardComponent implements OnInit {
deleteOrganization(index: number) {
this.organizations.removeAt(index);
}
+ deleteLabResults(index: number) {
+ this.labresults.removeAt(index);
+ }
deleteAttachment(index: number) {
this.attachments.removeAt(index);
}
@@ -209,6 +220,14 @@ export class MedicalRecordWizardComponent implements OnInit {
this.attachments.push(attachmentGroup);
}
+
+ addLabResultsBundle(diagnosticReportBundle: WizardFhirResourceWrapper){
+ const diagnosticReportGroup = new FormGroup({
+ data: new FormControl(diagnosticReportBundle.data),
+ action: new FormControl(diagnosticReportBundle.action),
+ });
+ this.labresults.push(diagnosticReportGroup);
+ }
//
//
@@ -287,6 +306,23 @@ export class MedicalRecordWizardComponent implements OnInit {
},
);
}
+ openLabResultsModal() {
+ let modalRef = this.modalService.open(MedicalRecordWizardAddLabResultsComponent, {
+ ariaLabelledBy: 'modal-labresults',
+ size: 'lg'
+ })
+ modalRef.componentInstance.debugMode = this.debugMode;
+ modalRef.result.then(
+ (result) => {
+ console.log('Closing, saving form', result);
+ //add this to the list of organization
+ this.addLabResultsBundle(result);
+ },
+ (err) => {
+ console.log('Closed without saving', err);
+ },
+ );
+ }
openAttachmentModal(formGroup?: AbstractControl, controlName?: string) {
let modalRef = this.modalService.open(MedicalRecordWizardAddAttachmentComponent, {
diff --git a/frontend/src/app/components/medical-record-wizard/medical-record-wizard.utilities.ts b/frontend/src/app/components/medical-record-wizard/medical-record-wizard.utilities.ts
index aa8a67ca..80569ee2 100644
--- a/frontend/src/app/components/medical-record-wizard/medical-record-wizard.utilities.ts
+++ b/frontend/src/app/components/medical-record-wizard/medical-record-wizard.utilities.ts
@@ -13,7 +13,7 @@ import {
Resource,
Bundle,
Organization,
- Practitioner, MedicationRequest, Patient, Encounter, DocumentReference, Media, DiagnosticReport, Reference, Binary, HumanName
+ Practitioner, MedicationRequest, Patient, Encounter, DocumentReference, Media, DiagnosticReport, Reference, Binary, HumanName, Observation
} from 'fhir/r4';
import {uuidV4} from '../../../lib/utils/uuid';
import {OrganizationModel} from '../../../lib/models/resources/organization-model';
@@ -24,14 +24,14 @@ import {FastenDisplayModel} from '../../../lib/models/fasten/fasten-display-mode
import {generateReferenceUriFromResourceOrReference} from '../../../lib/utils/bundle_references';
import {HumanNameModel} from '../../../lib/models/datatypes/human-name-model';
-export interface WizardFhirResourceWrapper {
+export interface WizardFhirResourceWrapper {
data: T,
action: 'find'|'create'
}
interface ResourceStorage {
[resourceType: string]: {
- [resourceId: string]: Condition | Patient | MedicationRequest | Organization | FhirLocation | Practitioner | Procedure | Encounter | DocumentReference | Media | DiagnosticReport | Binary | Reference
+ [resourceId: string]: Condition | Patient | MedicationRequest | Organization | FhirLocation | Practitioner | Procedure | Encounter | DocumentReference | Media | DiagnosticReport | Binary | Observation | Reference
}
}
@@ -72,6 +72,9 @@ export function GenerateR4ResourceLookup(resourceCreate: MedicalRecordWizardForm
//DocumentReference -> (Optional) Binary
//DiagnosticReport -> Media
+ for(let labresult of resourceCreate.labresults) {
+ resourceStorage = resourceCreateLabResultsToR4DiagnosticReports(resourceStorage, labresult)
+ }
//ImagingStudy
//ImagingSelection
@@ -436,6 +439,24 @@ function resourceAttachmentToR4DiagnosticReport(resourceStorage: ResourceStorage
return resourceStorage
}
+function resourceCreateLabResultsToR4DiagnosticReports(resourceStorage: ResourceStorage, resourceLabResult: WizardFhirResourceWrapper): ResourceStorage {
+ resourceLabResult.data.entry.forEach((entry) => {
+
+ if (entry.resource.resourceType === 'Observation') {
+ resourceStorage['Observation'] = resourceStorage['Observation'] || {}
+ let resource = entry.resource as Observation
+ resourceStorage['Observation'][resource.id] = resource
+ } else if (entry.resource.resourceType === 'DiagnosticReport') {
+ resourceStorage['DiagnosticReport'] = resourceStorage['DiagnosticReport'] || {}
+ let resource = entry.resource as DiagnosticReport
+ resourceStorage['DiagnosticReport'][resource.id] = resource
+ } else {
+ console.log('Unknown resource type: ', entry.resource.resourceType)
+ }
+ })
+ return resourceStorage
+}
+
function findEncounter(resourceStorage: ResourceStorage): Encounter | Reference {
let [encounterId] = Object.keys(resourceStorage['Encounter'])
diff --git a/frontend/src/app/components/nlm-typeahead/nlm-typeahead.component.ts b/frontend/src/app/components/nlm-typeahead/nlm-typeahead.component.ts
index 4a5a8981..54b82143 100644
--- a/frontend/src/app/components/nlm-typeahead/nlm-typeahead.component.ts
+++ b/frontend/src/app/components/nlm-typeahead/nlm-typeahead.component.ts
@@ -22,6 +22,7 @@ export enum NlmSearchType {
MedicationWhyStopped = 'MedicationWhyStopped',
Procedure = 'Procedure',
Vaccine = 'Vaccine',
+ LabPanels = 'LabPanels',
Countries = 'Countries',
AttachmentFileType = 'AttachmentFileType',
@@ -146,6 +147,10 @@ export class NlmTypeaheadComponent implements ControlValueAccessor {
case NlmSearchType.Procedure:
searchOpFn = this.nlmClinicalTableSearchService.searchProcedure
break
+ case NlmSearchType.LabPanels:
+ searchOpFn = this.nlmClinicalTableSearchService.searchLabPanels
+ this.editable = false
+ break
case NlmSearchType.Vaccine:
searchOpFn = this.nlmClinicalTableSearchService.searchVaccine
this.openOnFocus = true
diff --git a/frontend/src/app/components/shared.module.ts b/frontend/src/app/components/shared.module.ts
index d24ef2e8..a6dbfca4 100644
--- a/frontend/src/app/components/shared.module.ts
+++ b/frontend/src/app/components/shared.module.ts
@@ -35,6 +35,7 @@ import { MedicalRecordWizardAddAttachmentComponent } from './medical-record-wiza
import {FhirCardModule} from './fhir-card/fhir-card.module';
import {FhirDatatableModule} from './fhir-datatable/fhir-datatable.module';
import { MedicalRecordWizardAddEncounterComponent } from './medical-record-wizard-add-encounter/medical-record-wizard-add-encounter.component';
+import { MedicalRecordWizardAddLabResultsComponent } from './medical-record-wizard-add-lab-results/medical-record-wizard-add-lab-results.component';
@NgModule({
imports: [
@@ -68,6 +69,7 @@ import { MedicalRecordWizardAddEncounterComponent } from './medical-record-wizar
MedicalRecordWizardAddOrganizationComponent,
MedicalRecordWizardAddAttachmentComponent,
MedicalRecordWizardAddEncounterComponent,
+ MedicalRecordWizardAddLabResultsComponent,
],
declarations: [
@@ -111,6 +113,7 @@ import { MedicalRecordWizardAddEncounterComponent } from './medical-record-wizar
MedicalRecordWizardAddOrganizationComponent,
MedicalRecordWizardAddPractitionerComponent,
MedicalRecordWizardComponent,
+ MedicalRecordWizardAddLabResultsComponent,
MedicalSourcesCategoryLookupPipe,
NlmTypeaheadComponent,
]
diff --git a/frontend/src/app/models/fasten/labresults-questionnaire.ts b/frontend/src/app/models/fasten/labresults-questionnaire.ts
new file mode 100644
index 00000000..3328b098
--- /dev/null
+++ b/frontend/src/app/models/fasten/labresults-questionnaire.ts
@@ -0,0 +1,11 @@
+
+export interface LabresultsQuestionnaire {
+ type: string
+ code: string
+ name: string
+ codingInstructions: any
+ copyrightNotice: any
+ items: any[]
+ lformsVersion: string
+ codeSystem: string
+}
diff --git a/frontend/src/app/models/fasten/resource_create.ts b/frontend/src/app/models/fasten/resource_create.ts
index 3830f5dd..45de1097 100644
--- a/frontend/src/app/models/fasten/resource_create.ts
+++ b/frontend/src/app/models/fasten/resource_create.ts
@@ -5,6 +5,7 @@ import {WizardFhirResourceWrapper} from '../../components/medical-record-wizard/
import {EncounterModel} from '../../../lib/models/resources/encounter-model';
import {PractitionerModel} from '../../../lib/models/resources/practitioner-model';
import {OrganizationModel} from '../../../lib/models/resources/organization-model';
+import {Bundle} from 'fhir/r4';
//
@@ -134,6 +135,7 @@ export interface MedicalRecordWizardFormCreate {
"procedures": ResourceCreateProcedure[],
"practitioners": WizardFhirResourceWrapper[],
"organizations": WizardFhirResourceWrapper[],
+ "labresults": WizardFhirResourceWrapper[],
"attachments": ResourceCreateAttachment[],
}
diff --git a/frontend/src/app/pages/medical-history/medical-history.component.html b/frontend/src/app/pages/medical-history/medical-history.component.html
index 8e18d794..3d7e2bfd 100644
--- a/frontend/src/app/pages/medical-history/medical-history.component.html
+++ b/frontend/src/app/pages/medical-history/medical-history.component.html
@@ -47,6 +47,7 @@
[collectionSize]="allEncountersIds.length"
[(page)]="currentPage"
[pageSize]="pageSize"
+ [maxSize]="15"
(pageChange)="pageChange()"
>
diff --git a/frontend/src/app/pages/report-labs/report-labs.component.html b/frontend/src/app/pages/report-labs/report-labs.component.html
index 3d9dba3e..0404d5d6 100644
--- a/frontend/src/app/pages/report-labs/report-labs.component.html
+++ b/frontend/src/app/pages/report-labs/report-labs.component.html
@@ -71,6 +71,7 @@
{
+ it('create an instance', () => {
+ const pipe = new FastenDisplayModelPipe();
+ expect(pipe).toBeTruthy();
+ });
+});
diff --git a/frontend/src/app/pipes/fasten-display-model.pipe.ts b/frontend/src/app/pipes/fasten-display-model.pipe.ts
new file mode 100644
index 00000000..21438eae
--- /dev/null
+++ b/frontend/src/app/pipes/fasten-display-model.pipe.ts
@@ -0,0 +1,30 @@
+import { Pipe, PipeTransform } from '@angular/core';
+import {DomainResource} from 'fhir/r4';
+import {ResourceFhir} from '../models/fasten/resource_fhir';
+import {FastenDisplayModel} from '../../lib/models/fasten/fasten-display-model';
+import {fhirModelFactory, wrapFhirModel} from '../../lib/models/factory';
+import {ResourceType} from '../../lib/models/constants';
+
+@Pipe({
+ name: 'fastenDisplayModel'
+})
+export class FastenDisplayModelPipe implements PipeTransform {
+
+ transform(fhirResourceOrWrapper: any, ...args: unknown[]): FastenDisplayModel | any {
+ if(!fhirResourceOrWrapper) {
+ throw new Error("resource data cannot be empty")
+ }
+
+ if((fhirResourceOrWrapper as DomainResource).resourceType && (fhirResourceOrWrapper as DomainResource).id) {
+ //wrap
+ fhirResourceOrWrapper = wrapFhirModel(fhirResourceOrWrapper as DomainResource)
+ }
+
+ if((fhirResourceOrWrapper as ResourceFhir).resource_raw) {
+ return fhirModelFactory((fhirResourceOrWrapper as ResourceFhir).source_resource_type as ResourceType, fhirResourceOrWrapper as ResourceFhir)
+ } else {
+ throw new Error("resource data must be a valid wrapped FHIR resource")
+ }
+ }
+
+}
diff --git a/frontend/src/app/pipes/pipes.module.ts b/frontend/src/app/pipes/pipes.module.ts
index f95f1441..745e3a5e 100644
--- a/frontend/src/app/pipes/pipes.module.ts
+++ b/frontend/src/app/pipes/pipes.module.ts
@@ -8,6 +8,7 @@ import { ShortDomainPipe } from './short-domain.pipe';
import { DatasetLatestEntryPipe } from './dataset-latest-entry.pipe';
import { HumanNamePipe } from './human-name.pipe';
import { ReferenceUriPipe } from './reference-uri.pipe';
+import { FastenDisplayModelPipe } from './fasten-display-model.pipe';
@NgModule({
declarations: [
@@ -18,6 +19,7 @@ import { ReferenceUriPipe } from './reference-uri.pipe';
DatasetLatestEntryPipe,
HumanNamePipe,
ReferenceUriPipe,
+ FastenDisplayModelPipe,
],
imports: [
@@ -28,7 +30,8 @@ import { ReferenceUriPipe } from './reference-uri.pipe';
ShortDomainPipe,
DatasetLatestEntryPipe,
HumanNamePipe,
- ReferenceUriPipe
+ ReferenceUriPipe,
+ FastenDisplayModelPipe
]
})
export class PipesModule {}
diff --git a/frontend/src/app/services/nlm-clinical-table-search.service.ts b/frontend/src/app/services/nlm-clinical-table-search.service.ts
index e25a4196..c9949fe4 100644
--- a/frontend/src/app/services/nlm-clinical-table-search.service.ts
+++ b/frontend/src/app/services/nlm-clinical-table-search.service.ts
@@ -4,6 +4,7 @@ import {map} from 'rxjs/operators';
import {Observable, of} from 'rxjs';
import {CodingModel} from '../../lib/models/datatypes/coding-model';
import {HTTP_CLIENT_TOKEN} from "../dependency-injection";
+import {LabresultsQuestionnaire} from '../models/fasten/labresults-questionnaire';
export interface NlmSearchResults {
id: string
@@ -689,6 +690,44 @@ export class NlmClinicalTableSearchService {
)
}
+ //https://lforms-service.nlm.nih.gov/api/loinc_items/v3/search?type=form&available=true&terms=Diabetes
+ searchLabPanels(searchTerm: string): Observable {
+ let queryParams = {
+ 'type':'form',
+ 'available':'true',
+ 'terms':searchTerm
+ }
+ return this._httpClient.get(`https://lforms-service.nlm.nih.gov/api/loinc_items/v3/search`, {params: queryParams})
+ .pipe(
+ map((response) => {
+
+ return response[3].map((panelName, ndx):NlmSearchResults => {
+ return {
+ id: response[1][ndx],
+ text: panelName,
+ identifier: [{
+ system: 'http://loinc.org',
+ code: response[1][ndx],
+ display: panelName
+ }]
+ }
+ })
+ })
+ )
+ }
+
+ searchLabPanelQuestionnaire(panelLoincCode: string): Observable {
+ let queryParams = {
+ 'loinc_num': panelLoincCode,
+ }
+ return this._httpClient.get(`https://lforms-service.nlm.nih.gov/loinc_form_definitions`, {params: queryParams})
+ .pipe(
+ map((response: LabresultsQuestionnaire) => {
+ return response
+ })
+ );
+ }
+
//see https://lhcforms.nlm.nih.gov/phr.json
//see https://build.fhir.org/valueset-provider-taxonomy.html
// ideally we'd use http://www.hl7.org/fhir/valueset-performer-role.html
diff --git a/frontend/src/custom.scss b/frontend/src/custom.scss
index 703fc22d..38f96e10 100644
--- a/frontend/src/custom.scss
+++ b/frontend/src/custom.scss
@@ -300,3 +300,26 @@ app-medical-sources-filter > .az-content-left-components:hover{
.fhir-card-callout-warning .card, .bd-callout-warning { @include bs-callout-variant($yellow); }
.fhir-card-callout-danger .card, .bd-callout-danger { @include bs-callout-variant($red); }
+
+// lhc-autocomplete fixes - if we dont set this z-index, the autocomplete results are hidden behind the modal
+#searchResults {
+ z-index: 9999 !important;
+}
+
+// LHC Forms
+.lhc-form-title {
+ border-radius: inherit;
+ background-color: $indigo;
+}
+
+.lhc-item.lhc-tree-line::before {
+ border-top: 2px solid $indigo;
+}
+
+.lhc-item.lhc-tree-line::after {
+ border-left: 2px solid $indigo;
+}
+
+.lhc-item-question.lhc-active-row {
+ background-color: $primary;
+}
diff --git a/frontend/src/index.html b/frontend/src/index.html
index 0c4e4088..e180b7cb 100644
--- a/frontend/src/index.html
+++ b/frontend/src/index.html
@@ -12,6 +12,8 @@
+
+
+
+
+
+
+
This feature is expected to be available in the next release. +
+ Lab Results Status: {{labresultsGroup.status}}
+
+
+
+
+
+
-
+
+