@ovok/core 0.4.37 → 0.4.38

package/dist/client/observation/services/blood-pressure.js

@@ -35,10 +35,7 @@ class BloodPressureService extends base_observation_service_1.BaseObservationSer
             },
             {
                 primaryCode: types_1.ObservationCode.BLOOD_PRESSURE_HEART_RATE,
-                additionalCodes: [
-                    types_1.ObservationCode.HEART_RATE,
-                    types_1.ObservationCode.BLOOD_PRESSURE_HEART_RATE,
-                ],
+                additionalCodes: [types_1.ObservationCode.HEART_RATE],
                 display: "Blood Pressure Heart Rate",
                 unit: "bpm",
                 valueKey: "heartRate",

package/dist/client/observation/services/{baby-sleep.d.ts → component-observation-services.d.ts}

@@ -1,28 +1,33 @@
-import { Observation } from "@medplum/fhirtypes";
-import { BabySleepMeasurement, Measurement, MeasurementTypeKey, ObservationCode } from "../../../types";
+import { CodeableConcept, Observation, ObservationComponent } from "@medplum/fhirtypes";
+import { Measurement, MeasurementTypeKey, ObservationCode } from "../../../types";
 import { RecordResult, RecordType } from "../types/generate-measurement/HealthConnectTypes";
 import { Sample } from "../types/generate-measurement/Sample";
 import { ObservationFragment } from "../types/generate-observation-body/ObservationFragment";
 import { ObservationValue } from "../types/generate-observation-body/ObservationValue";
 import { ObservationMetadata } from "../types/service/ObservationMetadata";
 import { BaseObservationService } from "./base-observation-service";
-export declare class BabySleepService extends BaseObservationService<BabySleepMeasurement> {
+type ComponentMeasurement = Measurement & {
+    components: ObservationComponent[];
+};
+/** One observation that carries the device adapter's coded components as they are. */
+declare class ComponentObservationService extends BaseObservationService<ComponentMeasurement> {
     protected measurementTypeKey: MeasurementTypeKey;
     protected measurementTypeName: string;
-    protected observationMetadata: ObservationMetadata<BabySleepMeasurement>[];
+    private readonly code;
+    protected observationMetadata: ObservationMetadata<ComponentMeasurement>[];
+    private readonly title;
+    constructor(measurementTypeKey: MeasurementTypeKey, measurementTypeName: string, code: ObservationCode);
     generateObservationFragments(measurement: Measurement): ObservationFragment[];
-    getObservationCodes(): {
-        coding: {
-            code: ObservationCode;
-            display: string;
-            system: string;
-        }[];
-    }[];
+    getObservationCodes(): CodeableConcept[];
     getAdditionalProperties(measurement: Measurement): Partial<Observation>[];
     generateValues(_measurement: Measurement): ObservationValue[];
     getUnits(): string[];
     getMeasurementDisplay(measurement: Measurement): string;
     getObservationDisplay(observations: Observation[]): string | undefined;
-    convertSamplesToMeasurement(_samples: Sample[]): BabySleepMeasurement;
-    convertRecordToMeasurement(_record: RecordResult<RecordType>): BabySleepMeasurement;
+    convertSamplesToMeasurement(_samples: Sample[]): ComponentMeasurement;
+    convertRecordToMeasurement(_record: RecordResult<RecordType>): ComponentMeasurement;
+    private codeableConcept;
 }
+export declare const babySleepService: () => ComponentObservationService;
+export declare const respiratoryTherapyService: () => ComponentObservationService;
+export {};

package/dist/client/observation/services/component-observation-services.js

@@ -0,0 +1,69 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.respiratoryTherapyService = exports.babySleepService = void 0;
+const types_1 = require("../../../types");
+const base_observation_service_1 = require("./base-observation-service");
+const measurement_time_1 = require("./measurement-time");
+const MEASUREMENT_TYPE_SYSTEM = "https://sdk.ovok.com/fhir/CodeSystem/measurement-type";
+/** One observation that carries the device adapter's coded components as they are. */
+class ComponentObservationService extends base_observation_service_1.BaseObservationService {
+    constructor(measurementTypeKey, measurementTypeName, code) {
+        super();
+        this.measurementTypeKey = measurementTypeKey;
+        this.measurementTypeName = measurementTypeName;
+        this.code = code;
+        this.observationMetadata = [];
+        this.title = measurementTypeName.charAt(0).toUpperCase() + measurementTypeName.slice(1);
+    }
+    generateObservationFragments(measurement) {
+        const { components, recordedAt } = this.getCastedMeasurement(measurement);
+        if (components.length === 0) {
+            return [];
+        }
+        return [{
+                code: this.codeableConcept(),
+                additionalProperties: {
+                    effectiveDateTime: (0, measurement_time_1.recordedAtOrNow)({ recordedAt }).toISOString(),
+                    component: components,
+                },
+            }];
+    }
+    getObservationCodes() {
+        return [this.codeableConcept()];
+    }
+    getAdditionalProperties(measurement) {
+        return [{ effectiveDateTime: (0, measurement_time_1.recordedAtOrNow)(this.getCastedMeasurement(measurement)).toISOString() }];
+    }
+    generateValues(_measurement) {
+        return [];
+    }
+    getUnits() {
+        return [];
+    }
+    getMeasurementDisplay(measurement) {
+        return `${this.getCastedMeasurement(measurement).components.length} ${this.measurementTypeName} metrics`;
+    }
+    getObservationDisplay(observations) {
+        const count = observations.reduce((total, observation) => { var _a, _b; return total + ((_b = (_a = observation.component) === null || _a === void 0 ? void 0 : _a.length) !== null && _b !== void 0 ? _b : 0); }, 0);
+        return count ? `${count} ${this.measurementTypeName} metrics` : undefined;
+    }
+    convertSamplesToMeasurement(_samples) {
+        throw new Error(`${this.title} samples are not supported.`);
+    }
+    convertRecordToMeasurement(_record) {
+        throw new Error(`${this.title} Health Connect records are not supported.`);
+    }
+    codeableConcept() {
+        return {
+            coding: [{
+                    code: this.code,
+                    display: `${this.title} observation`,
+                    system: MEASUREMENT_TYPE_SYSTEM,
+                }],
+        };
+    }
+}
+const babySleepService = () => new ComponentObservationService(types_1.MeasurementTypeKey.babySleep, "baby sleep", types_1.ObservationCode.BABY_SLEEP);
+exports.babySleepService = babySleepService;
+const respiratoryTherapyService = () => new ComponentObservationService(types_1.MeasurementTypeKey.respiratoryTherapy, "respiratory therapy", types_1.ObservationCode.RESPIRATORY_THERAPY);
+exports.respiratoryTherapyService = respiratoryTherapyService;

package/dist/client/observation/services/creator.d.ts

@@ -2,9 +2,8 @@ import { MeasurementTypeKey } from "../../../types";
 import { IObservationService } from "../types/IObservationService";
 export declare class ObservationServiceCreator {
     private static instance;
-    private services;
+    private readonly services;
     private constructor();
     static getInstance(): ObservationServiceCreator;
-    private initializeServices;
     getService(type: MeasurementTypeKey): IObservationService;
 }

package/dist/client/observation/services/creator.js

@@ -2,19 +2,29 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ObservationServiceCreator = void 0;
 const types_1 = require("../../../types");
-const baby_sleep_1 = require("./baby-sleep");
 const blood_oxygen_1 = require("./blood-oxygen");
 const blood_pressure_1 = require("./blood-pressure");
+const component_observation_services_1 = require("./component-observation-services");
 const ecg_1 = require("./ecg");
 const lipid_panel_1 = require("./lipid-panel");
-const respiratory_therapy_1 = require("./respiratory-therapy");
 const single_value_services_1 = require("./single-value-services");
 const step_count_1 = require("./step-count");
 const uric_acid_service_1 = require("./uric-acid-service");
 class ObservationServiceCreator {
     constructor() {
-        this.services = new Map();
-        this.initializeServices();
+        const uricAcid = new uric_acid_service_1.UricAcidService();
+        this.services = new Map([
+            ...(0, single_value_services_1.singleValueObservationServices)(),
+            [types_1.MeasurementTypeKey.bloodPressure, new blood_pressure_1.BloodPressureService()],
+            [types_1.MeasurementTypeKey.bloodOxygenPulseRate, new blood_oxygen_1.BloodOxygenService()],
+            [types_1.MeasurementTypeKey.ecg, new ecg_1.EcgService()],
+            [types_1.MeasurementTypeKey.stepCount, new step_count_1.StepCountService()],
+            [types_1.MeasurementTypeKey.urineAnalysis, uricAcid],
+            [types_1.MeasurementTypeKey.uricAcid, uricAcid],
+            [types_1.MeasurementTypeKey.lipidPanel, new lipid_panel_1.LipidPanelService()],
+            [types_1.MeasurementTypeKey.respiratoryTherapy, (0, component_observation_services_1.respiratoryTherapyService)()],
+            [types_1.MeasurementTypeKey.babySleep, (0, component_observation_services_1.babySleepService)()],
+        ]);
     }
     static getInstance() {
         if (!ObservationServiceCreator.instance) {
@@ -22,20 +32,6 @@ class ObservationServiceCreator {
         }
         return ObservationServiceCreator.instance;
     }
-    initializeServices() {
-        for (const [type, service] of (0, single_value_services_1.singleValueObservationServices)()) {
-            this.services.set(type, service);
-        }
-        this.services.set(types_1.MeasurementTypeKey.bloodPressure, new blood_pressure_1.BloodPressureService());
-        this.services.set(types_1.MeasurementTypeKey.bloodOxygenPulseRate, new blood_oxygen_1.BloodOxygenService());
-        this.services.set(types_1.MeasurementTypeKey.ecg, new ecg_1.EcgService());
-        this.services.set(types_1.MeasurementTypeKey.stepCount, new step_count_1.StepCountService());
-        this.services.set(types_1.MeasurementTypeKey.urineAnalysis, new uric_acid_service_1.UricAcidService());
-        this.services.set(types_1.MeasurementTypeKey.uricAcid, new uric_acid_service_1.UricAcidService());
-        this.services.set(types_1.MeasurementTypeKey.lipidPanel, new lipid_panel_1.LipidPanelService());
-        this.services.set(types_1.MeasurementTypeKey.respiratoryTherapy, new respiratory_therapy_1.RespiratoryTherapyService());
-        this.services.set(types_1.MeasurementTypeKey.babySleep, new baby_sleep_1.BabySleepService());
-    }
     getService(type) {
         const service = this.services.get(type);
         if (!service) {

package/dist/client/observation/services/ecg-observation-fragments.js

@@ -1,14 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.generateEcgObservationFragments = void 0;
+const fhir_systems_1 = require("../fhir-systems");
+const measurement_time_1 = require("./measurement-time");
 const MAX_SEGMENT_DURATION_SECONDS = 5 * 60;
 const MAX_SAMPLED_DATA_CHARACTERS = 750000;
 const generateEcgObservationFragments = (measurement, observationCodes) => {
     const fragments = [];
     const diagramPoints = measurement.diagramPoints;
-    const recordedAt = isValidDate(measurement.recordedAt)
-        ? measurement.recordedAt
-        : new Date();
+    const recordedAt = (0, measurement_time_1.recordedAtOrNow)(measurement);
     const duration = typeof measurement.duration === "number" &&
         Number.isFinite(measurement.duration) &&
         measurement.duration > 0
@@ -71,7 +71,7 @@ const generateEcgObservationFragments = (measurement, observationCodes) => {
                     value: Number(measurement.heartRate.toFixed(0)),
                     unit: "bpm",
                     code: "8867-4",
-                    system: "http://loinc.org",
+                    system: fhir_systems_1.LOINC_SYSTEM,
                 },
             },
             additionalProperties: {
@@ -92,7 +92,6 @@ const durationComponent = (duration) => ({
         value: duration,
         unit: "s",
         code: "s",
-        system: "http://unitsofmeasure.org",
+        system: fhir_systems_1.UCUM_SYSTEM,
     },
 });
-const isValidDate = (value) => value instanceof Date && !Number.isNaN(value.getTime());

package/dist/client/observation/services/ecg.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.EcgService = void 0;
 const types_1 = require("../../../types");
+const fhir_systems_1 = require("../fhir-systems");
 const base_observation_service_1 = require("./base-observation-service");
 const ecg_observation_fragments_1 = require("./ecg-observation-fragments");
 class EcgService extends base_observation_service_1.BaseObservationService {
@@ -54,7 +55,7 @@ class EcgService extends base_observation_service_1.BaseObservationService {
                     value: Number(fixedValue),
                     unit: "bpm",
                     code: types_1.ObservationCode.ECG_HEART_RATE,
-                    system: "http://loinc.org",
+                    system: fhir_systems_1.LOINC_SYSTEM,
                 },
             });
         }
@@ -90,7 +91,7 @@ class EcgService extends base_observation_service_1.BaseObservationService {
                             value: castedMeasurement.duration,
                             unit: "s",
                             code: "s",
-                            system: "http://unitsofmeasure.org",
+                            system: fhir_systems_1.UCUM_SYSTEM,
                         },
                     },
                 ],

package/dist/client/observation/services/lipid-panel.js

@@ -2,9 +2,9 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.LipidPanelService = void 0;
 const types_1 = require("../../../types");
+const fhir_systems_1 = require("../fhir-systems");
 const base_observation_service_1 = require("./base-observation-service");
-const UCUM_SYSTEM = "http://unitsofmeasure.org";
-const LOINC_SYSTEM = "http://loinc.org";
+const measurement_time_1 = require("./measurement-time");
 const COMPONENTS = [
     {
         key: "totalCholesterol",
@@ -36,10 +36,6 @@ const COMPONENTS = [
         massCode: types_1.ObservationCode.TOTAL_CHOLESTEROL_HDL_RATIO,
     },
 ];
-const recordedAt = (measurement) => measurement.recordedAt instanceof Date &&
-    !Number.isNaN(measurement.recordedAt.getTime())
-    ? measurement.recordedAt.toISOString()
-    : new Date().toISOString();
 class LipidPanelService extends base_observation_service_1.BaseObservationService {
     constructor() {
         super(...arguments);
@@ -61,14 +57,14 @@ class LipidPanelService extends base_observation_service_1.BaseObservationServic
             const unit = item.key === "totalCholesterolHdlRatio" ? "{ratio}" : lipidPanel.unit;
             return [{
                     code: {
-                        coding: [{ code, display: item.display, system: LOINC_SYSTEM }],
+                        coding: [{ code, display: item.display, system: fhir_systems_1.LOINC_SYSTEM }],
                         text: item.display,
                     },
                     valueQuantity: {
                         value,
                         unit,
                         code: unit,
-                        system: UCUM_SYSTEM,
+                        system: fhir_systems_1.UCUM_SYSTEM,
                     },
                 }];
         });
@@ -80,11 +76,11 @@ class LipidPanelService extends base_observation_service_1.BaseObservationServic
                     coding: [{
                             code: types_1.ObservationCode.LIPID_PANEL,
                             display: "Lipid panel - Serum or Plasma",
-                            system: LOINC_SYSTEM,
+                            system: fhir_systems_1.LOINC_SYSTEM,
                         }],
                 },
                 additionalProperties: {
-                    effectiveDateTime: recordedAt(lipidPanel),
+                    effectiveDateTime: (0, measurement_time_1.recordedAtOrNow)(lipidPanel).toISOString(),
                     component: components,
                 },
             }];
@@ -94,12 +90,12 @@ class LipidPanelService extends base_observation_service_1.BaseObservationServic
                 coding: [{
                         code: types_1.ObservationCode.LIPID_PANEL,
                         display: "Lipid panel - Serum or Plasma",
-                        system: LOINC_SYSTEM,
+                        system: fhir_systems_1.LOINC_SYSTEM,
                     }],
             }];
     }
     getAdditionalProperties(measurement) {
-        return [{ effectiveDateTime: recordedAt(this.getCastedMeasurement(measurement)) }];
+        return [{ effectiveDateTime: (0, measurement_time_1.recordedAtOrNow)(this.getCastedMeasurement(measurement)).toISOString() }];
     }
     generateValues(_measurement) {
         return [];

package/dist/client/observation/services/measurement-time.d.ts

@@ -0,0 +1,4 @@
+/** The measurement's `recordedAt` when it is a valid date, else now. */
+export declare const recordedAtOrNow: ({ recordedAt }: {
+    recordedAt?: Date;
+}) => Date;

package/dist/client/observation/services/measurement-time.js

@@ -0,0 +1,6 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.recordedAtOrNow = void 0;
+/** The measurement's `recordedAt` when it is a valid date, else now. */
+const recordedAtOrNow = ({ recordedAt }) => recordedAt instanceof Date && !Number.isNaN(recordedAt.getTime()) ? recordedAt : new Date();
+exports.recordedAtOrNow = recordedAtOrNow;

package/dist/client/observation/services/single-value-services.d.ts

@@ -28,4 +28,9 @@ declare class SingleValueObservationService extends BaseObservationService<Singl
     private measurement;
 }
 export declare const singleValueObservationServices: () => [MeasurementTypeKey, SingleValueObservationService][];
+/** Value key and LOINC code of each single-value type, for reading observations back into measurements. */
+export declare const singleValueFields: ReadonlyMap<MeasurementTypeKey, {
+    valueKey: string;
+    code: string;
+}>;
 export {};

package/dist/client/observation/services/single-value-services.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.singleValueObservationServices = void 0;
+exports.singleValueFields = exports.singleValueObservationServices = void 0;
 const types_1 = require("../../../types");
 const base_observation_service_1 = require("./base-observation-service");
 /** An observation with one value: what varies per measurement is data, not code. */
@@ -93,3 +93,8 @@ const specs = [
 ];
 const singleValueObservationServices = () => specs.map((spec) => [spec.measurementTypeKey, new SingleValueObservationService(spec)]);
 exports.singleValueObservationServices = singleValueObservationServices;
+/** Value key and LOINC code of each single-value type, for reading observations back into measurements. */
+exports.singleValueFields = new Map(specs.map(({ measurementTypeKey, metadata }) => [
+    measurementTypeKey,
+    { valueKey: String(metadata.valueKey), code: metadata.primaryCode },
+]));

package/dist/client/observation/services/uric-acid-service.js

@@ -3,7 +3,9 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.UricAcidService = void 0;
 const types_1 = require("../../../types");
+const fhir_systems_1 = require("../fhir-systems");
 const base_observation_service_1 = require("./base-observation-service");
+const measurement_time_1 = require("./measurement-time");
 class UricAcidService extends base_observation_service_1.BaseObservationService {
     constructor() {
         super(...arguments);
@@ -36,7 +38,7 @@ class UricAcidService extends base_observation_service_1.BaseObservationService
                 value: problemCount,
                 unit: "problems",
                 code: types_1.ObservationCode.URIC_ACID,
-                system: "http://loinc.org",
+                system: fhir_systems_1.LOINC_SYSTEM,
             },
         });
         return values;
@@ -63,10 +65,7 @@ class UricAcidService extends base_observation_service_1.BaseObservationService
      */
     generateObservationFragments(measurement) {
         const castedMeasurement = this.getCastedMeasurement(measurement);
-        const effectiveDateTime = castedMeasurement.recordedAt instanceof Date &&
-            !Number.isNaN(castedMeasurement.recordedAt.getTime())
-            ? castedMeasurement.recordedAt.toISOString()
-            : new Date().toISOString();
+        const effectiveDateTime = (0, measurement_time_1.recordedAtOrNow)(castedMeasurement).toISOString();
         return types_1.URINE_ANALYTE_DEFINITIONS.flatMap((analyte) => {
             const value = castedMeasurement[analyte.key];
             if (value === undefined || value === null || !Number.isFinite(value)) {
@@ -79,7 +78,7 @@ class UricAcidService extends base_observation_service_1.BaseObservationService
                             {
                                 code: analyte.code,
                                 display: analyte.display,
-                                system: "http://loinc.org",
+                                system: fhir_systems_1.LOINC_SYSTEM,
                             },
                         ],
                         text: analyte.display,
@@ -91,7 +90,7 @@ class UricAcidService extends base_observation_service_1.BaseObservationService
                             ...(analyte.unitCode
                                 ? {
                                     code: analyte.unitCode,
-                                    system: "http://unitsofmeasure.org",
+                                    system: fhir_systems_1.UCUM_SYSTEM,
                                 }
                                 : {}),
                         },