diff --git a/containers/ecr-viewer/src/app/services/formatService.tsx b/containers/ecr-viewer/src/app/services/formatService.tsx index 138216ac04..dabe0ddfab 100644 --- a/containers/ecr-viewer/src/app/services/formatService.tsx +++ b/containers/ecr-viewer/src/app/services/formatService.tsx @@ -581,6 +581,13 @@ export const formatContactPoint = ( ); } else if (contactPoint.system === "email" && contactPoint.value) { contactArr.push(contactPoint.value); + } else if (contactPoint.system === "fax" && contactPoint.value) { + const faxNumberUse = toSentenceCase(contactPoint.use ?? ""); + contactArr.push( + [faxNumberUse, "Fax:", formatPhoneNumber(contactPoint.value ?? "")] + .join(" ") + .trim(), + ); } } return contactArr; diff --git a/containers/ecr-viewer/src/app/tests/services/formatService.test.tsx b/containers/ecr-viewer/src/app/tests/services/formatService.test.tsx index 7ff7e345b7..d9121b91ee 100644 --- a/containers/ecr-viewer/src/app/tests/services/formatService.test.tsx +++ b/containers/ecr-viewer/src/app/tests/services/formatService.test.tsx @@ -519,6 +519,21 @@ describe("formatContactPoint", () => { const actual = formatContactPoint(contactPoints); expect(actual).toEqual(["me@example.com", "medicine@example.com"]); }); + it("should return fax information ", () => { + const contactPoints: ContactPoint[] = [ + { + system: "fax", + value: "+13135551234", + use: "work", + }, + { + system: "fax", + value: "+1 313 555-1235", + }, + ]; + const actual = formatContactPoint(contactPoints); + expect(actual).toEqual(["Work Fax: 313-555-1234", "Fax: 313-555-1235"]); + }); }); describe("formatPhoneNumber", () => { diff --git a/containers/fhir-converter/Dockerfile b/containers/fhir-converter/Dockerfile index 75ec6f2c0e..55b7bbe720 100644 --- a/containers/fhir-converter/Dockerfile +++ b/containers/fhir-converter/Dockerfile @@ -1,7 +1,7 @@ FROM mcr.microsoft.com/dotnet/sdk:6.0 AS build # Download FHIR-Converter -RUN git clone https://github.com/skylight-hq/FHIR-Converter.git --branch v7.0-skylight-4 --single-branch /build/FHIR-Converter +RUN git clone https://github.com/skylight-hq/FHIR-Converter.git --branch v7.0-skylight-5 --single-branch /build/FHIR-Converter WORKDIR /build/FHIR-Converter diff --git a/containers/fhir-converter/tests/integration/__snapshots__/test_FHIR-Converter.ambr b/containers/fhir-converter/tests/integration/__snapshots__/test_FHIR-Converter.ambr index 33b2437957..b81e4c5a14 100644 --- a/containers/fhir-converter/tests/integration/__snapshots__/test_FHIR-Converter.ambr +++ b/containers/fhir-converter/tests/integration/__snapshots__/test_FHIR-Converter.ambr @@ -1869,6 +1869,11 @@ 'use': 'work', 'value': '(661)382-5000', }), + dict({ + 'system': 'fax', + 'use': 'work', + 'value': '(661)382-5001', + }), ]), }), }), diff --git a/containers/fhir-converter/tests/test_files/snapshot/5370592c-6dd3-4de5-b4f6-8a2f4b0253aa/CDA_eICR.xml b/containers/fhir-converter/tests/test_files/snapshot/5370592c-6dd3-4de5-b4f6-8a2f4b0253aa/CDA_eICR.xml index 5dc971c119..2ee7c41757 100644 --- a/containers/fhir-converter/tests/test_files/snapshot/5370592c-6dd3-4de5-b4f6-8a2f4b0253aa/CDA_eICR.xml +++ b/containers/fhir-converter/tests/test_files/snapshot/5370592c-6dd3-4de5-b4f6-8a2f4b0253aa/CDA_eICR.xml @@ -1 +1 @@ -Initial Public Health Case Report37490 SHEFFIELD DRPALMDALECA93550-6865USCASSANDRAARONOFFPRM- Palmdale Regional Medical Center38600 Medical Center DrivePalmdaleCA93551USAJuichungHungPRM- Palmdale Regional Medical Center38600 Medical Center DrivePalmdaleCA93551USA38600 Medical Center DrivePalmdaleCA93551USRajanChahal38600 Medical Center DrivePalmdaleCA93551USAPRM- Palmdale Regional Medical Center38600 Medical Center DrivePalmdaleCA93551USA
PROBLEMS - DIAGNOSES
Problem or DiagnosisProblem Status
Morbid obesity (disorder)Active
Bronchitis (disorder)Active
Hypertensive disorder, systemic arterial (disorder)Active
Disease caused by 2019-nCoVActive
Sleep apnea (finding)Active
ENCOUNTERS
Encounter ReasonDate of Encounter
Outpatient20220407123000+0000
RESULTS
Lab Test NameLab Test Result ValueLab Test Result Date
Hct43.2|http://unitsofmeasure.org|%2022-04-19T17:38:00.000Z
U Beta hCG QlNegative2022-04-19T13:01:00.000Z
Medications Administered
Medication NameMedication Start Date
ergocalciferol (ergocalciferol 1.25 mg (50,000 intl units) oral capsule)20220414172400+0000
lisinopril (lisinopril 10 mg oral tablet)20220414172700+0000
acetaminophen (Ofirmev)20220419153100+0000
ceFAZolin (Ancef/Kefzol)20220419140000+0000
hydrocodone-acetaminophen (Norco 5 mg-325 mg oral tablet)20220419153100+0000
ondansetron (Zofran)20220419153100+0000
pantoprazole (Protonix)20220419153500+0000
prochlorperazine (Compazine)20220419153100+0000
LORazepam20220419151900+0000
ondansetron20220419151900+0000
diphenhydrAMINE20220419151900+0000
fentaNYL20220419151900+0000
fentaNYL20220419151900+0000
morphine20220419151900+0000
morphine20220419151900+0000
naloxone (Narcan)20220419151900+0000
glycopyrrolate (glycopyrrolate (ANES))20220419155600+0000
labetalol (labetalol (ANES))20220419155600+0000
neostigmine (neostigmine (ANES))20220419155600+0000
ondansetron (ondansetron (ANES))20220419155600+0000
ceFAZolin 1 g injection (ANES) 1 gm20220419145100+0000
phenylephrine (phenylephrine (ANES))20220419153300+0000
Lactated Ringers (ANES) 1000 mL20220419142700+0000
propofol20220419152300+0000
bupivacaine-epinephrine20220419151700+0000
dexamethasone (dexAMETHasone 4 mg/mL injectable solution (ANES))20220419150700+0000
esmolol (esmolol (ANES))20220419150700+0000
etomidate (etomidate (ANES))20220419150200+0000
lidocaine (Xylocaine-MPF 1% injectable solution (ANES))20220419150200+0000
propofol (Diprivan 10 mg/mL intravenous emulsion (ANES))20220419150200+0000
rocuronium (rocuronium (ANES))20220419150200+0000
midazolam (midazolam 1 mg/mL injectable solution (ANES))20220419145700+0000
morphine (morphine (ANES))20220419145700+0000
ceFAZolin20220419145000+0000
dexamethasone (dexAMETHasone)20220419145000+0000
esmolol20220419144800+0000
etomidate20220419144800+0000
rocuronium (rocuronium/isoosmotic)20220419144800+0000
lidocaine (lidocaine PF 1% (50mg/5ml))20220419143700+0000
lidocaine (lidocaine PF 2%)20220419143700+0000
morphine20220419143700+0000
propofol20220419143700+0000
midazolam20220419143600+0000
scopolamine (scopolamine 1 mg/72 hr transdermal film, extended release)20220419140000+0000
acetaminophen (Ofirmev)20220419140000+0000
enoxaparin (Lovenox)20220419140000+0000
azithromycin (azithromycin 250 mg oral tablet)20220414172800+0000
benzonatate (benzonatate 100 mg oral capsule)20220414172700+0000
predniSONE (predniSONE 5 mg oral tablet)20220414172600+0000
bupivacaine-epinephrine (bupivacaine-EPINEPHrine 0.25%)20220419133800+0000
IMMUNIZATIONS
Vaccine NameVaccination Date
SARS-COV-2 (COVID-19 MODERNA) mRNA-1273Tue Mar 15 00:00:00 GMT 2022
SARS-COV-2 (COVID-19 MODERNA) mRNA-1273Tue Apr 27 00:00:00 GMT 2021
SARS-COV-2 (COVID-19 MODERNA) mRNA-1273Tue Mar 30 00:00:00 GMT 2021
SOCIAL HISTORY
Social History ObservationSocial History Observation Result
Birth SexF
Travel HistoryCOVID-19 Test Date-
Travel HistoryCOVID-19 Previously tested-Yes, negative result
Travel HistoryTB Risk Score-
Travel HistorySymptoms of TB-No symptoms of TB
Travel HistoryHistory of tuberculosis (situation)-No known history of exposure to TB
Travel HistoryC.diff Screening-No (qualifier value)
Travel HistoryRecent Exposure to Communicable Disease-No (qualifier value)
Travel HistoryPregnancy Status-Negative HCG result
Travel HistoryCOVID-19 Test Date-
Travel HistoryCOVID-19 Previously tested-Yes, result pending
Travel HistoryExposure to severe acute respiratory syndrome coronavirus 2 (event)-Yes (qualifier value)
Travel HistoryMERS-CoV Travel History-Yes (qualifier value)
Travel HistoryTB Risk Score-
Travel HistorySymptoms of TB-No symptoms of TB
Travel HistoryHistory of tuberculosis (situation)-No known history of exposure to TB
Travel HistoryC.diff Screening-No (qualifier value)
Travel HistoryMERS-CoV Symptoms-Cough (finding)
Travel HistoryMRSA Screen Hx MRSA-No (qualifier value)
Travel HistoryMRSA Sceen Dialysis or Venous Access-No (qualifier value)
Travel HistoryMRSA Screen Admit From Non-home Loc-No (qualifier value)
Travel HistoryRecent countries visited (observable entity)-Mexico (geographic location)
Travel HistoryRecent Exposure to Communicable Disease-No (qualifier value)
Travel HistoryRecent countries visited (observable entity)-Mexico (geographic location)
COVID-19 Test Date-COVID-19 Previously tested-Yes, negative resultTB Risk Score-Symptoms of TB-No symptoms of TBHistory of tuberculosis (situation)-No known history of exposure to TBC.diff Screening-No (qualifier value)Recent Exposure to Communicable Disease-No (qualifier value)Pregnancy Status-Negative HCG resultCOVID-19 Test Date-COVID-19 Previously tested-Yes, result pendingExposure to severe acute respiratory syndrome coronavirus 2 (event)-Yes (qualifier value)MERS-CoV Travel History-Yes (qualifier value)TB Risk Score-Symptoms of TB-No symptoms of TBHistory of tuberculosis (situation)-No known history of exposure to TBC.diff Screening-No (qualifier value)MERS-CoV Symptoms-Cough (finding)MRSA Screen Hx MRSA-No (qualifier value)MRSA Sceen Dialysis or Venous Access-No (qualifier value)MRSA Screen Admit From Non-home Loc-No (qualifier value)Recent countries visited (observable entity)-Mexico (geographic location)Recent Exposure to Communicable Disease-No (qualifier value)Recent countries visited (observable entity)-Mexico (geographic location)
Plan of TreatmentNo Plan Of Treatment Information
History of Present Illness
Narrative Text
Unknown History of Present Illness
Reason For Visit
text
SEVERE OBESITY
 \ No newline at end of file +Initial Public Health Case Report37490 SHEFFIELD DRPALMDALECA93550-6865USCASSANDRAARONOFFPRM- Palmdale Regional Medical Center38600 Medical Center DrivePalmdaleCA93551USAJuichungHungPRM- Palmdale Regional Medical Center38600 Medical Center DrivePalmdaleCA93551USA38600 Medical Center DrivePalmdaleCA93551USRajanChahal38600 Medical Center DrivePalmdaleCA93551USAPRM- Palmdale Regional Medical Center38600 Medical Center DrivePalmdaleCA93551USA
PROBLEMS - DIAGNOSES
Problem or DiagnosisProblem Status
Morbid obesity (disorder)Active
Bronchitis (disorder)Active
Hypertensive disorder, systemic arterial (disorder)Active
Disease caused by 2019-nCoVActive
Sleep apnea (finding)Active
ENCOUNTERS
Encounter ReasonDate of Encounter
Outpatient20220407123000+0000
RESULTS
Lab Test NameLab Test Result ValueLab Test Result Date
Hct43.2|http://unitsofmeasure.org|%2022-04-19T17:38:00.000Z
U Beta hCG QlNegative2022-04-19T13:01:00.000Z
Medications Administered
Medication NameMedication Start Date
ergocalciferol (ergocalciferol 1.25 mg (50,000 intl units) oral capsule)20220414172400+0000
lisinopril (lisinopril 10 mg oral tablet)20220414172700+0000
acetaminophen (Ofirmev)20220419153100+0000
ceFAZolin (Ancef/Kefzol)20220419140000+0000
hydrocodone-acetaminophen (Norco 5 mg-325 mg oral tablet)20220419153100+0000
ondansetron (Zofran)20220419153100+0000
pantoprazole (Protonix)20220419153500+0000
prochlorperazine (Compazine)20220419153100+0000
LORazepam20220419151900+0000
ondansetron20220419151900+0000
diphenhydrAMINE20220419151900+0000
fentaNYL20220419151900+0000
fentaNYL20220419151900+0000
morphine20220419151900+0000
morphine20220419151900+0000
naloxone (Narcan)20220419151900+0000
glycopyrrolate (glycopyrrolate (ANES))20220419155600+0000
labetalol (labetalol (ANES))20220419155600+0000
neostigmine (neostigmine (ANES))20220419155600+0000
ondansetron (ondansetron (ANES))20220419155600+0000
ceFAZolin 1 g injection (ANES) 1 gm20220419145100+0000
phenylephrine (phenylephrine (ANES))20220419153300+0000
Lactated Ringers (ANES) 1000 mL20220419142700+0000
propofol20220419152300+0000
bupivacaine-epinephrine20220419151700+0000
dexamethasone (dexAMETHasone 4 mg/mL injectable solution (ANES))20220419150700+0000
esmolol (esmolol (ANES))20220419150700+0000
etomidate (etomidate (ANES))20220419150200+0000
lidocaine (Xylocaine-MPF 1% injectable solution (ANES))20220419150200+0000
propofol (Diprivan 10 mg/mL intravenous emulsion (ANES))20220419150200+0000
rocuronium (rocuronium (ANES))20220419150200+0000
midazolam (midazolam 1 mg/mL injectable solution (ANES))20220419145700+0000
morphine (morphine (ANES))20220419145700+0000
ceFAZolin20220419145000+0000
dexamethasone (dexAMETHasone)20220419145000+0000
esmolol20220419144800+0000
etomidate20220419144800+0000
rocuronium (rocuronium/isoosmotic)20220419144800+0000
lidocaine (lidocaine PF 1% (50mg/5ml))20220419143700+0000
lidocaine (lidocaine PF 2%)20220419143700+0000
morphine20220419143700+0000
propofol20220419143700+0000
midazolam20220419143600+0000
scopolamine (scopolamine 1 mg/72 hr transdermal film, extended release)20220419140000+0000
acetaminophen (Ofirmev)20220419140000+0000
enoxaparin (Lovenox)20220419140000+0000
azithromycin (azithromycin 250 mg oral tablet)20220414172800+0000
benzonatate (benzonatate 100 mg oral capsule)20220414172700+0000
predniSONE (predniSONE 5 mg oral tablet)20220414172600+0000
bupivacaine-epinephrine (bupivacaine-EPINEPHrine 0.25%)20220419133800+0000
IMMUNIZATIONS
Vaccine NameVaccination Date
SARS-COV-2 (COVID-19 MODERNA) mRNA-1273Tue Mar 15 00:00:00 GMT 2022
SARS-COV-2 (COVID-19 MODERNA) mRNA-1273Tue Apr 27 00:00:00 GMT 2021
SARS-COV-2 (COVID-19 MODERNA) mRNA-1273Tue Mar 30 00:00:00 GMT 2021
SOCIAL HISTORY
Social History ObservationSocial History Observation Result
Birth SexF
Travel HistoryCOVID-19 Test Date-
Travel HistoryCOVID-19 Previously tested-Yes, negative result
Travel HistoryTB Risk Score-
Travel HistorySymptoms of TB-No symptoms of TB
Travel HistoryHistory of tuberculosis (situation)-No known history of exposure to TB
Travel HistoryC.diff Screening-No (qualifier value)
Travel HistoryRecent Exposure to Communicable Disease-No (qualifier value)
Travel HistoryPregnancy Status-Negative HCG result
Travel HistoryCOVID-19 Test Date-
Travel HistoryCOVID-19 Previously tested-Yes, result pending
Travel HistoryExposure to severe acute respiratory syndrome coronavirus 2 (event)-Yes (qualifier value)
Travel HistoryMERS-CoV Travel History-Yes (qualifier value)
Travel HistoryTB Risk Score-
Travel HistorySymptoms of TB-No symptoms of TB
Travel HistoryHistory of tuberculosis (situation)-No known history of exposure to TB
Travel HistoryC.diff Screening-No (qualifier value)
Travel HistoryMERS-CoV Symptoms-Cough (finding)
Travel HistoryMRSA Screen Hx MRSA-No (qualifier value)
Travel HistoryMRSA Sceen Dialysis or Venous Access-No (qualifier value)
Travel HistoryMRSA Screen Admit From Non-home Loc-No (qualifier value)
Travel HistoryRecent countries visited (observable entity)-Mexico (geographic location)
Travel HistoryRecent Exposure to Communicable Disease-No (qualifier value)
Travel HistoryRecent countries visited (observable entity)-Mexico (geographic location)
COVID-19 Test Date-COVID-19 Previously tested-Yes, negative resultTB Risk Score-Symptoms of TB-No symptoms of TBHistory of tuberculosis (situation)-No known history of exposure to TBC.diff Screening-No (qualifier value)Recent Exposure to Communicable Disease-No (qualifier value)Pregnancy Status-Negative HCG resultCOVID-19 Test Date-COVID-19 Previously tested-Yes, result pendingExposure to severe acute respiratory syndrome coronavirus 2 (event)-Yes (qualifier value)MERS-CoV Travel History-Yes (qualifier value)TB Risk Score-Symptoms of TB-No symptoms of TBHistory of tuberculosis (situation)-No known history of exposure to TBC.diff Screening-No (qualifier value)MERS-CoV Symptoms-Cough (finding)MRSA Screen Hx MRSA-No (qualifier value)MRSA Sceen Dialysis or Venous Access-No (qualifier value)MRSA Screen Admit From Non-home Loc-No (qualifier value)Recent countries visited (observable entity)-Mexico (geographic location)Recent Exposure to Communicable Disease-No (qualifier value)Recent countries visited (observable entity)-Mexico (geographic location)
Plan of TreatmentNo Plan Of Treatment Information
History of Present Illness
Narrative Text
Unknown History of Present Illness
Reason For Visit
text
SEVERE OBESITY