@ovok/core 0.4.36 → 0.4.38

package/dist/client/invites/methods.js

@@ -5,6 +5,7 @@ exports.invitePatient = invitePatient;
 exports.acceptPractitionerInvite = acceptPractitionerInvite;
 exports.acceptPatientInvite = acceptPatientInvite;
 exports.acceptInvite = acceptInvite;
+const request_options_1 = require("../request-options");
 function invitePractitioner(body, requestOptions) {
     return this.post("/v1/invites/practitioner", body, undefined, requestOptions);
 }
@@ -20,17 +21,12 @@ function acceptPatientInvite(body, requestOptions) {
 function acceptInvite(body, requestOptions) {
     var _a;
     const resourceType = (_a = this.getProfile()) === null || _a === void 0 ? void 0 : _a.resourceType;
-    if (resourceType === "Practitioner") {
-        return this.acceptPractitionerInvite(body, ...(requestOptions === undefined ? [] : [requestOptions])).then((result) => {
-            this.invalidateUrl("/v1/patient-sharing/shares");
-            return result;
-        });
+    if (resourceType !== "Practitioner" && resourceType !== "Patient") {
+        throw new Error("Accepting an invite requires a signed-in Patient or Practitioner profile.");
     }
-    if (resourceType === "Patient") {
-        return this.acceptPatientInvite(body, ...(requestOptions === undefined ? [] : [requestOptions])).then((result) => {
-            this.invalidateUrl("/v1/patient-sharing/shares");
-            return result;
-        });
-    }
-    throw new Error("Accepting an invite requires a signed-in Patient or Practitioner profile.");
+    const accept = resourceType === "Practitioner" ? this.acceptPractitionerInvite : this.acceptPatientInvite;
+    return accept.call(this, body, ...(0, request_options_1.optionalArg)(requestOptions)).then((result) => {
+        this.invalidateUrl("/v1/patient-sharing/shares");
+        return result;
+    });
 }

package/dist/client/notifications/methods.js

@@ -5,7 +5,7 @@ exports.listNotificationNotes = listNotificationNotes;
 exports.updateNotificationNote = updateNotificationNote;
 exports.patchNotificationNote = patchNotificationNote;
 exports.deleteNotificationNote = deleteNotificationNote;
-const segment = (value) => encodeURIComponent(value);
+const request_options_1 = require("../request-options");
 const TARGET_PATH = {
     oob: "oob",
     alarm: "alarms",
@@ -16,14 +16,14 @@ function createNotificationNote(body, requestOptions) {
     return this.post("/v1/slim/notifications/notes", body, undefined, requestOptions);
 }
 function listNotificationNotes(kind, id, requestOptions) {
-    return this.get(`/v1/slim/notifications/${TARGET_PATH[kind]}/${segment(id)}/notes`, { ...{ cache: "reload" }, ...requestOptions });
+    return this.get(`/v1/slim/notifications/${TARGET_PATH[kind]}/${encodeURIComponent(id)}/notes`, { cache: "reload", ...requestOptions });
 }
 function updateNotificationNote(noteId, body, requestOptions) {
-    return this.put(`/v1/slim/notifications/notes/${segment(noteId)}`, body, undefined, requestOptions);
+    return this.put(`/v1/slim/notifications/notes/${encodeURIComponent(noteId)}`, body, undefined, requestOptions);
 }
 function patchNotificationNote(noteId, body, requestOptions) {
-    return this.patch(`/v1/slim/notifications/notes/${segment(noteId)}`, body, ...(requestOptions === undefined ? [] : [requestOptions]));
+    return this.patch(`/v1/slim/notifications/notes/${encodeURIComponent(noteId)}`, body, ...(0, request_options_1.optionalArg)(requestOptions));
 }
 async function deleteNotificationNote(noteId, requestOptions) {
-    await this.delete(`/v1/slim/notifications/notes/${segment(noteId)}`, ...(requestOptions === undefined ? [] : [requestOptions]));
+    await this.delete(`/v1/slim/notifications/notes/${encodeURIComponent(noteId)}`, ...(0, request_options_1.optionalArg)(requestOptions));
 }

package/dist/client/observation/fhir-systems.d.ts

@@ -0,0 +1,4 @@
+export declare const LOINC_SYSTEM = "http://loinc.org";
+export declare const UCUM_SYSTEM = "http://unitsofmeasure.org";
+/** Identifier system of the device-side reading id that makes a save idempotent. */
+export declare const DEVICE_READING_IDENTIFIER_SYSTEM = "https://api.ovok.com/fhir/StructureDefinition/device-reading-id";

package/dist/client/observation/fhir-systems.js

@@ -0,0 +1,7 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.DEVICE_READING_IDENTIFIER_SYSTEM = exports.UCUM_SYSTEM = exports.LOINC_SYSTEM = void 0;
+exports.LOINC_SYSTEM = "http://loinc.org";
+exports.UCUM_SYSTEM = "http://unitsofmeasure.org";
+/** Identifier system of the device-side reading id that makes a save idempotent. */
+exports.DEVICE_READING_IDENTIFIER_SYSTEM = "https://api.ovok.com/fhir/StructureDefinition/device-reading-id";

package/dist/client/observation/methods/generateObservationBodiesByMeasurement.js

@@ -2,9 +2,9 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.generateObservationBodiesByMeasurement = generateObservationBodiesByMeasurement;
 const core_1 = require("@medplum/core");
+const fhir_systems_1 = require("../fhir-systems");
 const creator_1 = require("../services/creator");
 const getDeviceObject_1 = require("../utils/getDeviceObject");
-const DEVICE_READING_IDENTIFIER_SYSTEM = "https://api.ovok.com/fhir/StructureDefinition/device-reading-id";
 const getPatientReference = async (client, patientId) => {
     if (patientId) {
         return `Patient/${patientId}`;
@@ -20,7 +20,7 @@ const addSourceIdentifier = (observations, patientReference, sourceId) => patien
             identifier: [
                 ...((_a = observation.identifier) !== null && _a !== void 0 ? _a : []),
                 {
-                    system: DEVICE_READING_IDENTIFIER_SYSTEM,
+                    system: fhir_systems_1.DEVICE_READING_IDENTIFIER_SYSTEM,
                     value: `${patientReference}/${sourceId}/${index}`,
                 },
             ],
@@ -28,52 +28,46 @@ const addSourceIdentifier = (observations, patientReference, sourceId) => patien
     })
     : observations;
 async function generateObservationBodiesByMeasurement(params) {
-    var _a;
+    var _a, _b;
     const { device, measurement } = params;
     const measurementTypeKey = measurement.measurementTypeKey;
     const patientReference = await getPatientReference(this, params.patientId);
     const observationService = creator_1.ObservationServiceCreator.getInstance().getService(measurementTypeKey);
     const deviceObject = (0, getDeviceObject_1.getDeviceObject)(device);
-    const observationFragments = (_a = observationService.generateObservationFragments) === null || _a === void 0 ? void 0 : _a.call(observationService, measurement);
     const applyEffectiveDateTime = (observation) => params.effectiveDateTime && !observation.effectivePeriod
         ? {
             ...observation,
             effectiveDateTime: params.effectiveDateTime.toISOString(),
         }
         : observation;
-    if (observationFragments) {
-        const observations = observationFragments
-            .map((fragment) => ({
-            resourceType: "Observation",
-            status: "registered",
-            subject: {
-                reference: patientReference,
-            },
-            device: deviceObject,
-            ...fragment.value,
-            code: fragment.code,
-            ...(fragment.additionalProperties || {}),
-        }))
-            .filter(hasObservationValue)
-            .map(applyEffectiveDateTime);
-        return addSourceIdentifier(observations, patientReference, params.sourceId);
-    }
-    const observationCodes = observationService.getObservationCodes();
-    const values = observationService.generateValues(measurement);
-    const additionalProperties = observationService.getAdditionalProperties(measurement);
-    const observationBodies = observationCodes.map((code, index) => ({
+    const fragments = (_b = (_a = observationService.generateObservationFragments) === null || _a === void 0 ? void 0 : _a.call(observationService, measurement)) !== null && _b !== void 0 ? _b : codeValueFragments(observationService, measurement);
+    const observations = fragments
+        .map((fragment) => ({
         resourceType: "Observation",
         status: "registered",
         subject: {
             reference: patientReference,
         },
         device: deviceObject,
-        ...values[index],
+        ...fragment.value,
+        code: fragment.code,
+        ...(fragment.additionalProperties || {}),
+    }))
+        .filter(hasObservationValue)
+        .map(applyEffectiveDateTime);
+    return addSourceIdentifier(observations, patientReference, params.sourceId);
+}
+/** Services without fragments describe their observations as parallel code, value and property lists. */
+const codeValueFragments = (service, measurement) => {
+    const codes = service.getObservationCodes();
+    const values = service.generateValues(measurement);
+    const additionalProperties = service.getAdditionalProperties(measurement);
+    return codes.map((code, index) => ({
         code,
-        ...(additionalProperties[index] || {}),
+        value: values[index],
+        additionalProperties: additionalProperties[index],
     }));
-    return addSourceIdentifier(observationBodies.filter(hasObservationValue).map(applyEffectiveDateTime), patientReference, params.sourceId);
-}
+};
 const hasObservationValue = (observation) => {
     var _a, _b, _c, _d, _e, _f;
     return ((_a = observation.valueQuantity) === null || _a === void 0 ? void 0 : _a.value) !== undefined ||

package/dist/client/observation/methods/getLatestObservationsByCodes.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getLatestObservationsByCodes = getLatestObservationsByCodes;
+const query_string_1 = require("../../query-string");
 async function getLatestObservationsByCodes(params, requestOptions) {
     var _a;
     let patientId = "patientId" in params ? params.patientId : "";
@@ -8,14 +9,10 @@ async function getLatestObservationsByCodes(params, requestOptions) {
         const currentUser = await this.getProfileAsync();
         patientId = (_a = currentUser === null || currentUser === void 0 ? void 0 : currentUser.id) !== null && _a !== void 0 ? _a : "";
     }
-    const codes = params.codes.join(",");
-    const urlParams = new URLSearchParams({
-        max: "1",
-        code: codes,
+    return this.get(`/fhir/Observation/$lastn${(0, query_string_1.toQueryString)({
+        max: 1,
+        code: params.codes,
         patient: `Patient/${patientId}`,
-        ...(params.date ? { date: `ge${params.date}` } : {}),
-    });
-    return this.get(`/fhir/Observation/$lastn?${urlParams.toString()}`, { ...{
-            cache: "no-cache",
-        }, ...requestOptions });
+        date: params.date ? `ge${params.date}` : undefined,
+    })}`, { cache: "no-cache", ...requestOptions });
 }

package/dist/client/observation/methods/observationsToMeasurements.js

@@ -3,10 +3,12 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.observationsToMeasurements = exports.observationCodesForTypes = void 0;
 const types_1 = require("../../../types");
+const fhir_systems_1 = require("../fhir-systems");
+const single_value_services_1 = require("../services/single-value-services");
 const DEFAULT_OBSERVATION_TIME_TOLERANCE_MS = 1000;
 const codeOf = (observation) => {
     var _a, _b, _c, _d, _e, _f, _g;
-    return (_d = (_c = (_b = (_a = observation.code) === null || _a === void 0 ? void 0 : _a.coding) === null || _b === void 0 ? void 0 : _b.find((coding) => coding.system === "http://loinc.org")) === null || _c === void 0 ? void 0 : _c.code) !== null && _d !== void 0 ? _d : (_g = (_f = (_e = observation.code) === null || _e === void 0 ? void 0 : _e.coding) === null || _f === void 0 ? void 0 : _f[0]) === null || _g === void 0 ? void 0 : _g.code;
+    return (_d = (_c = (_b = (_a = observation.code) === null || _a === void 0 ? void 0 : _a.coding) === null || _b === void 0 ? void 0 : _b.find((coding) => coding.system === fhir_systems_1.LOINC_SYSTEM)) === null || _c === void 0 ? void 0 : _c.code) !== null && _d !== void 0 ? _d : (_g = (_f = (_e = observation.code) === null || _e === void 0 ? void 0 : _e.coding) === null || _f === void 0 ? void 0 : _f[0]) === null || _g === void 0 ? void 0 : _g.code;
 };
 const valueOf = (observation) => {
     var _a;
@@ -199,9 +201,10 @@ const groupObservations = (observations, options, legacyKey) => {
     }
     return [...groups.values()].sort((left, right) => left.firstIndex - right.firstIndex);
 };
-const firstValue = (observations, code) => observations.find((observation) => codeOf(observation) === code)
-    ? valueOf(observations.find((observation) => codeOf(observation) === code))
-    : undefined;
+const firstValue = (observations, code) => {
+    const match = observations.find((observation) => codeOf(observation) === code);
+    return match ? valueOf(match) : undefined;
+};
 const LIPID_FIELDS = [
     { key: "totalCholesterol", codes: [types_1.ObservationCode.TOTAL_CHOLESTEROL_MASS, types_1.ObservationCode.TOTAL_CHOLESTEROL_MOLAR] },
     { key: "hdlCholesterol", codes: [types_1.ObservationCode.HDL_CHOLESTEROL_MASS, types_1.ObservationCode.HDL_CHOLESTEROL_MOLAR] },
@@ -220,40 +223,45 @@ const lipidValue = (observations, field) => {
     }
     return undefined;
 };
+const MOLAR_LIPID_CODES = [
+    types_1.ObservationCode.TOTAL_CHOLESTEROL_MOLAR,
+    types_1.ObservationCode.HDL_CHOLESTEROL_MOLAR,
+    types_1.ObservationCode.LDL_CHOLESTEROL_MOLAR,
+    types_1.ObservationCode.TRIGLYCERIDES_MOLAR,
+];
+const MASS_LIPID_CODES = [
+    types_1.ObservationCode.TOTAL_CHOLESTEROL_MASS,
+    types_1.ObservationCode.HDL_CHOLESTEROL_MASS,
+    types_1.ObservationCode.LDL_CHOLESTEROL_MASS,
+    types_1.ObservationCode.TRIGLYCERIDES_MASS,
+];
+/** The unit a lipid code implies, else the quantity's own unit when it is a lipid unit. */
+const lipidUnitOf = (code, unit) => {
+    if (code && MOLAR_LIPID_CODES.includes(code)) {
+        return "mmol/L";
+    }
+    if (code && MASS_LIPID_CODES.includes(code)) {
+        return "mg/dL";
+    }
+    return unit === "mmol/L" || unit === "mg/dL" ? unit : undefined;
+};
 const lipidUnit = (observations) => {
-    var _a, _b, _c, _d, _e, _f;
+    var _a, _b, _c, _d, _e;
     for (const observation of observations) {
         for (const component of (_a = observation.component) !== null && _a !== void 0 ? _a : []) {
-            const code = (_c = (_b = component.code.coding) === null || _b === void 0 ? void 0 : _b[0]) === null || _c === void 0 ? void 0 : _c.code;
-            if ([types_1.ObservationCode.TOTAL_CHOLESTEROL_MOLAR, types_1.ObservationCode.HDL_CHOLESTEROL_MOLAR,
-                types_1.ObservationCode.LDL_CHOLESTEROL_MOLAR, types_1.ObservationCode.TRIGLYCERIDES_MOLAR].includes(code)) {
-                return "mmol/L";
+            const unit = lipidUnitOf((_c = (_b = component.code.coding) === null || _b === void 0 ? void 0 : _b[0]) === null || _c === void 0 ? void 0 : _c.code, (_d = component.valueQuantity) === null || _d === void 0 ? void 0 : _d.unit);
+            if (unit) {
+                return unit;
             }
-            if ([types_1.ObservationCode.TOTAL_CHOLESTEROL_MASS, types_1.ObservationCode.HDL_CHOLESTEROL_MASS,
-                types_1.ObservationCode.LDL_CHOLESTEROL_MASS, types_1.ObservationCode.TRIGLYCERIDES_MASS].includes(code)) {
-                return "mg/dL";
-            }
-            if (((_d = component.valueQuantity) === null || _d === void 0 ? void 0 : _d.unit) === "mmol/L" || ((_e = component.valueQuantity) === null || _e === void 0 ? void 0 : _e.unit) === "mg/dL") {
-                return component.valueQuantity.unit;
-            }
-        }
-        const code = codeOf(observation);
-        const unit = (_f = observation.valueQuantity) === null || _f === void 0 ? void 0 : _f.unit;
-        if (code && [types_1.ObservationCode.TOTAL_CHOLESTEROL_MOLAR, types_1.ObservationCode.HDL_CHOLESTEROL_MOLAR,
-            types_1.ObservationCode.LDL_CHOLESTEROL_MOLAR, types_1.ObservationCode.TRIGLYCERIDES_MOLAR].includes(code)) {
-            return "mmol/L";
         }
-        if (code && [types_1.ObservationCode.TOTAL_CHOLESTEROL_MASS, types_1.ObservationCode.HDL_CHOLESTEROL_MASS,
-            types_1.ObservationCode.LDL_CHOLESTEROL_MASS, types_1.ObservationCode.TRIGLYCERIDES_MASS].includes(code)) {
-            return "mg/dL";
-        }
-        if (unit === "mmol/L" || unit === "mg/dL") {
+        const unit = lipidUnitOf(codeOf(observation), (_e = observation.valueQuantity) === null || _e === void 0 ? void 0 : _e.unit);
+        if (unit) {
             return unit;
         }
     }
     return "mg/dL";
 };
-const respiratoryComponents = (observations) => observations.flatMap((observation) => { var _a; return (_a = observation.component) !== null && _a !== void 0 ? _a : []; });
+const componentsOf = (observations) => observations.flatMap((observation) => { var _a; return (_a = observation.component) !== null && _a !== void 0 ? _a : []; });
 const baseMeasurement = (measurementTypeKey, observation) => ({
     measurementTypeKey,
     ...(observation.id ? { id: observation.id } : {}),
@@ -269,6 +277,10 @@ const inverseGroup = (type, observations) => {
     })[0];
     const measurement = baseMeasurement(type, first);
     const value = (code) => firstValue(observations, code);
+    const single = single_value_services_1.singleValueFields.get(type);
+    if (single) {
+        return { ...measurement, measurementTypeKey: type, [single.valueKey]: value(single.code) };
+    }
     switch (type) {
         case types_1.MeasurementTypeKey.bloodPressure:
             return {
@@ -280,12 +292,6 @@ const inverseGroup = (type, observations) => {
                 heartRate: value(types_1.ObservationCode.BLOOD_PRESSURE_HEART_RATE),
                 irregularHeartbeat: irregularHeartbeatOf(observations),
             };
-        case types_1.MeasurementTypeKey.bloodGlucose:
-            return { ...measurement, measurementTypeKey: type, bloodGlucose: value(types_1.ObservationCode.BLOOD_GLUCOSE) };
-        case types_1.MeasurementTypeKey.bodyWeight:
-            return { ...measurement, measurementTypeKey: type, bodyWeight: value(types_1.ObservationCode.BODY_WEIGHT) };
-        case types_1.MeasurementTypeKey.temperature:
-            return { ...measurement, measurementTypeKey: type, bodyTemp: value(types_1.ObservationCode.BODY_TEMPERATURE) };
         case types_1.MeasurementTypeKey.bloodOxygenPulseRate:
             return {
                 ...measurement,
@@ -293,42 +299,6 @@ const inverseGroup = (type, observations) => {
                 bloodOxygen: value(types_1.ObservationCode.OXYGEN_SATURATION),
                 pulseRate: value(types_1.ObservationCode.OXYGEN_SATURATION_HEART_RATE),
             };
-        case types_1.MeasurementTypeKey.heartRate:
-            return {
-                ...measurement,
-                measurementTypeKey: type,
-                heartRate: value(types_1.ObservationCode.HEART_RATE),
-            };
-        case types_1.MeasurementTypeKey.heartRateVariability:
-            return {
-                ...measurement,
-                measurementTypeKey: type,
-                heartRateVariability: value(types_1.ObservationCode.HEART_RATE_VARIABILITY),
-            };
-        case types_1.MeasurementTypeKey.respiratoryRate:
-            return {
-                ...measurement,
-                measurementTypeKey: type,
-                respiratoryRate: value(types_1.ObservationCode.RESPIRATORY_RATE),
-            };
-        case types_1.MeasurementTypeKey.restingHeartRate:
-            return {
-                ...measurement,
-                measurementTypeKey: type,
-                restingHeartRate: value(types_1.ObservationCode.RESTING_HEART_RATE),
-            };
-        case types_1.MeasurementTypeKey.walkingHeartRateAverage:
-            return {
-                ...measurement,
-                measurementTypeKey: type,
-                walkingHeartRateAverage: value(types_1.ObservationCode.WALKING_HEART_RATE_AVERAGE),
-            };
-        case types_1.MeasurementTypeKey.vo2Max:
-            return {
-                ...measurement,
-                measurementTypeKey: type,
-                vo2Max: value(types_1.ObservationCode.VO2_MAX),
-            };
         case types_1.MeasurementTypeKey.stepCount:
             return {
                 ...measurement,
@@ -395,34 +365,22 @@ const inverseGroup = (type, observations) => {
                 })),
             };
         case types_1.MeasurementTypeKey.respiratoryTherapy:
-            return {
-                ...measurement,
-                measurementTypeKey: type,
-                components: respiratoryComponents(observations),
-            };
         case types_1.MeasurementTypeKey.babySleep:
             return {
                 ...measurement,
                 measurementTypeKey: type,
-                components: respiratoryComponents(observations),
+                components: componentsOf(observations),
             };
         default:
             return measurement;
     }
 };
+const COMPONENT_TYPES = new Set([types_1.MeasurementTypeKey.respiratoryTherapy, types_1.MeasurementTypeKey.babySleep]);
 const codesForType = {
+    ...Object.fromEntries([...single_value_services_1.singleValueFields].map(([type, { code }]) => [type, [code]])),
     [types_1.MeasurementTypeKey.bloodPressure]: [types_1.ObservationCode.SYSTOLIC_BLOOD_PRESSURE, types_1.ObservationCode.DIASTOLIC_BLOOD_PRESSURE, types_1.ObservationCode.MEAN_BLOOD_PRESSURE, types_1.ObservationCode.BLOOD_PRESSURE_HEART_RATE, types_1.PulseRhythmCoding.observation],
-    [types_1.MeasurementTypeKey.bloodGlucose]: [types_1.ObservationCode.BLOOD_GLUCOSE],
-    [types_1.MeasurementTypeKey.bodyWeight]: [types_1.ObservationCode.BODY_WEIGHT],
-    [types_1.MeasurementTypeKey.temperature]: [types_1.ObservationCode.BODY_TEMPERATURE],
     [types_1.MeasurementTypeKey.bloodOxygenPulseRate]: [types_1.ObservationCode.OXYGEN_SATURATION, types_1.ObservationCode.OXYGEN_SATURATION_HEART_RATE],
     [types_1.MeasurementTypeKey.stepCount]: [types_1.ObservationCode.STEPS],
-    [types_1.MeasurementTypeKey.heartRate]: [types_1.ObservationCode.HEART_RATE],
-    [types_1.MeasurementTypeKey.heartRateVariability]: [types_1.ObservationCode.HEART_RATE_VARIABILITY],
-    [types_1.MeasurementTypeKey.respiratoryRate]: [types_1.ObservationCode.RESPIRATORY_RATE],
-    [types_1.MeasurementTypeKey.restingHeartRate]: [types_1.ObservationCode.RESTING_HEART_RATE],
-    [types_1.MeasurementTypeKey.walkingHeartRateAverage]: [types_1.ObservationCode.WALKING_HEART_RATE_AVERAGE],
-    [types_1.MeasurementTypeKey.vo2Max]: [types_1.ObservationCode.VO2_MAX],
     [types_1.MeasurementTypeKey.ecg]: [types_1.ObservationCode.ECG, types_1.ObservationCode.ECG_HEART_RATE, types_1.ObservationCode.HEART_RATE],
     [types_1.MeasurementTypeKey.uricAcid]: [
         types_1.ObservationCode.URIC_ACID,
@@ -456,12 +414,7 @@ const observationsToMeasurements = (observations, types, options = {}) => {
                 !LIPID_FIELDS.some((field) => lipidValue(group.observations, field) !== undefined)) {
                 return;
             }
-            if (type === types_1.MeasurementTypeKey.respiratoryTherapy &&
-                respiratoryComponents(group.observations).length === 0) {
-                return;
-            }
-            if (type === types_1.MeasurementTypeKey.babySleep &&
-                respiratoryComponents(group.observations).length === 0) {
+            if (COMPONENT_TYPES.has(type) && componentsOf(group.observations).length === 0) {
                 return;
             }
             output.push(inverseGroup(type, group.observations));

package/dist/client/observation/services/base-observation-service.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.BaseObservationService = void 0;
+const fhir_systems_1 = require("../fhir-systems");
 class BaseObservationService {
     getCastedMeasurement(measurement) {
         if (measurement.measurementTypeKey !== this.measurementTypeKey) {
@@ -25,7 +26,7 @@ class BaseObservationService {
                     value: Number(fixedValue),
                     unit: metadata.unit,
                     code: metadata.primaryCode,
-                    system: "http://loinc.org",
+                    system: fhir_systems_1.LOINC_SYSTEM,
                 },
             };
         });
@@ -36,12 +37,12 @@ class BaseObservationService {
                 {
                     code: metadata.primaryCode,
                     display: metadata.display,
-                    system: "http://loinc.org",
+                    system: fhir_systems_1.LOINC_SYSTEM,
                 },
                 ...metadata.additionalCodes.map((code) => ({
                     code,
                     display: metadata.display,
-                    system: "http://loinc.org",
+                    system: fhir_systems_1.LOINC_SYSTEM,
                 })),
             ],
             text: metadata.display,

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;
 }