diff --git a/frontend/src/app/commonComponents/TestResultsList.tsx b/frontend/src/app/commonComponents/TestResultsList.tsx index 8f29a239ae..bff495f2bb 100644 --- a/frontend/src/app/commonComponents/TestResultsList.tsx +++ b/frontend/src/app/commonComponents/TestResultsList.tsx @@ -33,6 +33,7 @@ const diseaseResultTitlePxpMap: Record = { [MULTIPLEX_DISEASES.SYPHILIS]: "constants.diseaseResultTitle.SYPHILIS", [MULTIPLEX_DISEASES.HEPATITIS_C]: "constants.diseaseResultTitle.HEPATITIS_C", [MULTIPLEX_DISEASES.GONORRHEA]: "constants.diseaseResultTitle.GONORRHEA", + [MULTIPLEX_DISEASES.CHLAMYDIA]: "constants.diseaseResultTitle.CHLAMYDIA", }; const diseaseResultReportingAppMap: Record = { @@ -45,6 +46,7 @@ const diseaseResultReportingAppMap: Record = { [MULTIPLEX_DISEASES.SYPHILIS]: "constants.disease.SYPHILIS", [MULTIPLEX_DISEASES.HEPATITIS_C]: "constants.disease.HEPATITIS_C", [MULTIPLEX_DISEASES.GONORRHEA]: "constants.disease.GONORRHEA", + [MULTIPLEX_DISEASES.CHLAMYDIA]: "constants.disease.CHLAMYDIA", }; const setResult = (result: string, t: translateFn) => { diff --git a/frontend/src/app/supportAdmin/DeviceType/mocks/mockSupportedDiseaseTestPerformedChlamydia.ts b/frontend/src/app/supportAdmin/DeviceType/mocks/mockSupportedDiseaseTestPerformedChlamydia.ts new file mode 100644 index 0000000000..6bffd238a2 --- /dev/null +++ b/frontend/src/app/supportAdmin/DeviceType/mocks/mockSupportedDiseaseTestPerformedChlamydia.ts @@ -0,0 +1,15 @@ +const mockSupportedDiseaseTestPerformedChlamydia = [ + { + supportedDisease: { + internalId: "6517fcbd-e094-4384-9eef-a5c7f373a015", + loinc: "LP14298-1", + name: "Chlamydia", + }, + testPerformedLoincCode: "80124-8", + equipmentUid: "ChlamydiaEquipmentUid123", + testkitNameId: "ChlamydiaTestkitNameId123", + testOrderedLoincCode: "80124-8", + }, +]; + +export default mockSupportedDiseaseTestPerformedChlamydia; diff --git a/frontend/src/app/testQueue/TestCard/TestCard.test.tsx b/frontend/src/app/testQueue/TestCard/TestCard.test.tsx index 50a053a838..3b403cde2a 100644 --- a/frontend/src/app/testQueue/TestCard/TestCard.test.tsx +++ b/frontend/src/app/testQueue/TestCard/TestCard.test.tsx @@ -9,7 +9,7 @@ import { within, } from "@testing-library/react"; import moment from "moment"; -import userEvent from "@testing-library/user-event"; +import userEvent, { UserEvent } from "@testing-library/user-event"; import * as flaggedMock from "flagged"; import { getAppInsights } from "../../TelemetryService"; @@ -71,6 +71,8 @@ import { baseStiAoeUpdateMock, device10Id, device10Name, + chlamydiaDeviceId, + chlamydiaDeviceName, } from "../testCardTestConstants"; import { QueriedFacility } from "../TestCardForm/types"; import mockSupportedDiseaseMultiplex, { @@ -81,6 +83,7 @@ import mockSupportedDiseaseTestPerformedSyphilis from "../../supportAdmin/Device import { UpdateTestOrderTimerStartedAtDocument } from "../../../generated/graphql"; import mockSupportedDiseaseTestPerformedHepatitisC from "../../supportAdmin/DeviceType/mocks/mockSupportedDiseaseTestPerformedHepatitisC"; import mockSupportedDiseaseTestPerformedGonorrhea from "../../supportAdmin/DeviceType/mocks/mockSupportedDiseaseTestPerformedGonorrhea"; +import mockSupportedDiseaseTestPerformedChlamydia from "../../supportAdmin/DeviceType/mocks/mockSupportedDiseaseTestPerformedChlamydia"; import { TestCard, TestCardProps } from "./TestCard"; @@ -295,6 +298,21 @@ const facilityInfo: QueriedFacility = { }, ], }, + { + internalId: chlamydiaDeviceId, + name: chlamydiaDeviceName, + testLength: 15, + supportedDiseaseTestPerformed: [ + ...mockSupportedDiseaseTestPerformedChlamydia, + ], + swabTypes: [ + { + name: specimen3Name, + internalId: specimen3Id, + typeCode: "122555007", + }, + ], + }, ], }; export const devicesMap = new Map(); @@ -328,6 +346,49 @@ describe("TestCard", () => { }); }; + const expectRequiredAOEQuestionsForPositiveGenericSTI = async ( + user: UserEvent + ) => { + await user.click( + screen.getByLabelText("Positive", { + exact: false, + }) + ); + + expect(screen.getByText("Is the patient pregnant?")).toBeInTheDocument(); + expect( + screen.getByText( + "Is the patient currently experiencing or showing signs of symptoms?" + ) + ).toBeInTheDocument(); + expect( + screen.getByText("What is the gender of their sexual partners?") + ).toBeInTheDocument(); + + const symptomFieldSet = screen.getByTestId( + `has-any-symptoms-${sharedTestOrderInfo.internalId}` + ); + await user.click(within(symptomFieldSet).getByLabelText("Yes")); + + expect( + screen.getByText("Select any symptoms the patient is experiencing") + ).toBeInTheDocument(); + }; + + const expectHiddenAOEQuestionsForNonPositiveGenericSTI = () => { + expect( + screen.queryByText("Is the patient pregnant?") + ).not.toBeInTheDocument(); + expect( + screen.queryByText( + "Is the patient currently experiencing or showing signs of symptoms?" + ) + ).not.toBeInTheDocument(); + expect( + screen.queryByText("What is the gender of their sexual partners?") + ).not.toBeInTheDocument(); + }; + const devicesMap = new Map(); facilityInfo.deviceTypes.map((d) => devicesMap.set(d.internalId, d)); @@ -1295,17 +1356,9 @@ describe("TestCard", () => { await user.selectOptions(deviceDropdown, device8Name); expect(screen.getByText("Syphilis result")).toBeInTheDocument(); - expect( - screen.queryByText("Is the patient pregnant?") - ).not.toBeInTheDocument(); - expect( - screen.queryByText( - "Is the patient currently experiencing or showing signs of symptoms?" - ) - ).not.toBeInTheDocument(); - expect( - screen.queryByText("What is the gender of their sexual partners?") - ).not.toBeInTheDocument(); + + expectHiddenAOEQuestionsForNonPositiveGenericSTI(); + expect( screen.queryByText( "Has the patient been told they have syphilis before?" @@ -1317,17 +1370,9 @@ describe("TestCard", () => { exact: false, }) ); - expect( - screen.queryByText("Is the patient pregnant?") - ).not.toBeInTheDocument(); - expect( - screen.queryByText( - "Is the patient currently experiencing or showing signs of symptoms?" - ) - ).not.toBeInTheDocument(); - expect( - screen.queryByText("What is the gender of their sexual partners?") - ).not.toBeInTheDocument(); + + expectHiddenAOEQuestionsForNonPositiveGenericSTI(); + expect( screen.queryByText( "Has the patient been told they have syphilis before?" @@ -1381,30 +1426,7 @@ describe("TestCard", () => { await user.selectOptions(deviceDropdown, device9Name); expect(screen.getByText("Hepatitis C result")).toBeInTheDocument(); - await user.click( - screen.getByLabelText("Positive", { - exact: false, - }) - ); - - expect(screen.getByText("Is the patient pregnant?")).toBeInTheDocument(); - expect( - screen.getByText( - "Is the patient currently experiencing or showing signs of symptoms?" - ) - ).toBeInTheDocument(); - expect( - screen.getByText("What is the gender of their sexual partners?") - ).toBeInTheDocument(); - - const symptomFieldSet = screen.getByTestId( - `has-any-symptoms-${sharedTestOrderInfo.internalId}` - ); - await user.click(within(symptomFieldSet).getByLabelText("Yes")); - - expect( - screen.getByText("Select any symptoms the patient is experiencing") - ).toBeInTheDocument(); + await expectRequiredAOEQuestionsForPositiveGenericSTI(user); }); it("hides AOE questions when there is no positive Hepatitis C result", async function () { @@ -1423,34 +1445,16 @@ describe("TestCard", () => { await user.selectOptions(deviceDropdown, device9Name); expect(screen.getByText("Hepatitis C result")).toBeInTheDocument(); - expect( - screen.queryByText("Is the patient pregnant?") - ).not.toBeInTheDocument(); - expect( - screen.queryByText( - "Is the patient currently experiencing or showing signs of symptoms?" - ) - ).not.toBeInTheDocument(); - expect( - screen.queryByText("What is the gender of their sexual partners?") - ).not.toBeInTheDocument(); + + expectHiddenAOEQuestionsForNonPositiveGenericSTI(); await user.click( screen.getByLabelText("Inconclusive", { exact: false, }) ); - expect( - screen.queryByText("Is the patient pregnant?") - ).not.toBeInTheDocument(); - expect( - screen.queryByText( - "Is the patient currently experiencing or showing signs of symptoms?" - ) - ).not.toBeInTheDocument(); - expect( - screen.queryByText("What is the gender of their sexual partners?") - ).not.toBeInTheDocument(); + + expectHiddenAOEQuestionsForNonPositiveGenericSTI(); }); it("checks that Hep C submission only works if AOE questions are valid", async function () { @@ -1550,38 +1554,91 @@ describe("TestCard", () => { await user.selectOptions(deviceDropdown, device10Name); expect(screen.getByText("Gonorrhea result")).toBeInTheDocument(); + await expectRequiredAOEQuestionsForPositiveGenericSTI(user); + }); + + it("hides AOE questions when there is no positive Gonorrhea result", async function () { + mockDiseaseEnabledFlag("gonorrhea"); + + const mocks = [ + generateEditQueueMock( + MULTIPLEX_DISEASES.GONORRHEA, + TEST_RESULTS.POSITIVE + ), + blankUpdateAoeEventMock, + ]; + + const { user } = await renderQueueItem({ mocks }); + const deviceDropdown = await getDeviceTypeDropdown(); + + await user.selectOptions(deviceDropdown, device10Name); + expect(screen.getByText("Gonorrhea result")).toBeInTheDocument(); + expectHiddenAOEQuestionsForNonPositiveGenericSTI(); + await user.click( - screen.getByLabelText("Positive", { + screen.getByLabelText("Inconclusive", { exact: false, }) ); - expect(screen.getByText("Is the patient pregnant?")).toBeInTheDocument(); - expect( - screen.getByText( - "Is the patient currently experiencing or showing signs of symptoms?" - ) - ).toBeInTheDocument(); - expect( - screen.getByText("What is the gender of their sexual partners?") - ).toBeInTheDocument(); + expectHiddenAOEQuestionsForNonPositiveGenericSTI(); + }); - const symptomFieldSet = screen.getByTestId( - `has-any-symptoms-${sharedTestOrderInfo.internalId}` + it("shows radio buttons for Chlamydia when a Chlamydia device is chosen", async function () { + mockDiseaseEnabledFlag("chlamydia"); + + const mocks = [ + generateEditQueueMock( + MULTIPLEX_DISEASES.CHLAMYDIA, + TEST_RESULTS.POSITIVE + ), + blankUpdateAoeEventMock, + ]; + + const { user } = await renderQueueItem({ mocks }); + expect(screen.queryByText("Chlamydia result")).not.toBeInTheDocument(); + + const deviceDropdown = await getDeviceTypeDropdown(); + + await user.selectOptions(deviceDropdown, chlamydiaDeviceName); + expect(screen.getByText("Chlamydia result")).toBeInTheDocument(); + }); + + it("shows required Chlamydia AOE questions when a positive Chlamydia result is present", async function () { + mockDiseaseEnabledFlag("chlamydia"); + + const mocks = [ + generateEditQueueMock( + MULTIPLEX_DISEASES.CHLAMYDIA, + TEST_RESULTS.POSITIVE + ), + blankUpdateAoeEventMock, + { + ...baseStiAoeUpdateMock({ + ...NO_SYMPTOMS_FALSE_OVERRIDE, + }), + ...mutationResponse, + }, + ]; + + const { user } = await renderQueueItem({ mocks }); + const deviceDropdown = await getDeviceTypeDropdown(); + expect(deviceDropdown.options.length).toEqual( + DEFAULT_DEVICE_OPTIONS_LENGTH + 1 ); - await user.click(within(symptomFieldSet).getByLabelText("Yes")); - expect( - screen.getByText("Select any symptoms the patient is experiencing") - ).toBeInTheDocument(); + await user.selectOptions(deviceDropdown, chlamydiaDeviceName); + expect(screen.getByText("Chlamydia result")).toBeInTheDocument(); + + await expectRequiredAOEQuestionsForPositiveGenericSTI(user); }); - it("hides AOE questions when there is no positive Gonorrhea result", async function () { - mockDiseaseEnabledFlag("gonorrhea"); + it("hides AOE questions when there is no positive Chlamydia result", async function () { + mockDiseaseEnabledFlag("chlamydia"); const mocks = [ generateEditQueueMock( - MULTIPLEX_DISEASES.GONORRHEA, + MULTIPLEX_DISEASES.CHLAMYDIA, TEST_RESULTS.POSITIVE ), blankUpdateAoeEventMock, @@ -1590,36 +1647,18 @@ describe("TestCard", () => { const { user } = await renderQueueItem({ mocks }); const deviceDropdown = await getDeviceTypeDropdown(); - await user.selectOptions(deviceDropdown, device10Name); - expect(screen.getByText("Gonorrhea result")).toBeInTheDocument(); - expect( - screen.queryByText("Is the patient pregnant?") - ).not.toBeInTheDocument(); - expect( - screen.queryByText( - "Is the patient currently experiencing or showing signs of symptoms?" - ) - ).not.toBeInTheDocument(); - expect( - screen.queryByText("What is the gender of their sexual partners?") - ).not.toBeInTheDocument(); + await user.selectOptions(deviceDropdown, chlamydiaDeviceName); + expect(screen.getByText("Chlamydia result")).toBeInTheDocument(); + + expectHiddenAOEQuestionsForNonPositiveGenericSTI(); await user.click( screen.getByLabelText("Inconclusive", { exact: false, }) ); - expect( - screen.queryByText("Is the patient pregnant?") - ).not.toBeInTheDocument(); - expect( - screen.queryByText( - "Is the patient currently experiencing or showing signs of symptoms?" - ) - ).not.toBeInTheDocument(); - expect( - screen.queryByText("What is the gender of their sexual partners?") - ).not.toBeInTheDocument(); + + expectHiddenAOEQuestionsForNonPositiveGenericSTI(); }); it("checks that submission only works if AOE questions are valid", async function () { diff --git a/frontend/src/app/testQueue/TestCardForm/TestCardForm.test.tsx b/frontend/src/app/testQueue/TestCardForm/TestCardForm.test.tsx index 0952cb6071..5f960d3f4a 100644 --- a/frontend/src/app/testQueue/TestCardForm/TestCardForm.test.tsx +++ b/frontend/src/app/testQueue/TestCardForm/TestCardForm.test.tsx @@ -5,6 +5,8 @@ import { MockedProvider } from "@apollo/client/testing"; import { MULTIPLEX_DISEASES, TEST_RESULTS } from "../../testResults/constants"; import { asymptomaticTestOrderInfo, + chlamydiaDeviceId, + chlamydiaDeviceName, covidDeviceId, covidDeviceName, devicesMap, @@ -225,6 +227,24 @@ describe("TestCardForm", () => { expect(await renderTestCardForm({ props })).toMatchSnapshot(); }); + + it("matches snapshot for chlamydia device", async () => { + const props = { + ...testProps, + testOrder: { + ...testProps.testOrder, + results: [{ testResult: "POSITIVE", disease: { name: "CHLAMYDIA" } }], + deviceType: { + internalId: chlamydiaDeviceId, + name: chlamydiaDeviceName, + model: chlamydiaDeviceName, + testLength: 15, + }, + }, + }; + + expect(await renderTestCardForm({ props })).toMatchSnapshot(); + }); }); describe("error handling", () => { diff --git a/frontend/src/app/testQueue/TestCardForm/TestCardForm.tsx b/frontend/src/app/testQueue/TestCardForm/TestCardForm.tsx index fa7c10a166..389551b7bd 100644 --- a/frontend/src/app/testQueue/TestCardForm/TestCardForm.tsx +++ b/frontend/src/app/testQueue/TestCardForm/TestCardForm.tsx @@ -27,6 +27,7 @@ import { TestCorrectionReasons, } from "../../testResults/viewResults/actionMenuModals/TestResultCorrectionModal"; import { + chlamydiaSymptomDefinitions, gonorrheaSymptomDefinitions, hepatitisCSymptomDefinitions, PregnancyCode, @@ -640,6 +641,23 @@ const TestCardForm = ({ /> )} + {whichAoeFormOption === AOEFormOption.CHLAMYDIA && ( +
+ { + dispatch({ + type: TestFormActionCase.UPDATE_AOE_RESPONSES, + payload: responses, + }); + }} + diseaseSymptomDefinitions={chlamydiaSymptomDefinitions} + diseaseNameForFormIds={"chlamydia"} + /> +
+ )}
+ + + + + * + + + +
+
+
+
+ + +
+
+ +
+
+
+
+

+ This device doesn't have any supported disease tests configured. Please ask your organization admin to add the correct test. +

+
+
+
+
+
+
+
+
+
+ + + + +
+ + +   + + + + + +
+
+
+ + Selected [object Object] + +
+
+
+
+
+
+
+
+ + Is the patient pregnant? + + + * + + +
+
+ + +
+
+ + +
+
+ + +
+
+
+
+
+
+
+
+
+
+ + Is the patient currently experiencing or showing signs of symptoms? + + + * + + +
+
+ + +
+
+ + +
+
+
+
+
+
+
+
+
+
+ +
+
+
+ +
+
+ +
+
+
+ , + "container":
+ +
+
+
+ +
+ + +
+
+
+
+
+
+ + +
+
+
+
+ + +
+
+
+
+
+
+
+

+ This device doesn't have any supported disease tests configured. Please ask your organization admin to add the correct test. +

+
+
+
+
+
+
+
+
+
+ + + + +
+ + +   + + + + + +
+
+
+ + Selected [object Object] + +
+
+
+
+
+
+
+
+ + Is the patient pregnant? + + + * + + +
+
+ + +
+
+ + +
+
+ + +
+
+
+
+
+
+
+
+
+
+ + Is the patient currently experiencing or showing signs of symptoms? + + + * + + +
+
+ + +
+
+ + +
+
+
+
+
+
+
+
+
+
+ +
+
+
+ +
+
+
, + "debug": [Function], + "findAllByAltText": [Function], + "findAllByDisplayValue": [Function], + "findAllByLabelText": [Function], + "findAllByPlaceholderText": [Function], + "findAllByRole": [Function], + "findAllByTestId": [Function], + "findAllByText": [Function], + "findAllByTitle": [Function], + "findByAltText": [Function], + "findByDisplayValue": [Function], + "findByLabelText": [Function], + "findByPlaceholderText": [Function], + "findByRole": [Function], + "findByTestId": [Function], + "findByText": [Function], + "findByTitle": [Function], + "getAllByAltText": [Function], + "getAllByDisplayValue": [Function], + "getAllByLabelText": [Function], + "getAllByPlaceholderText": [Function], + "getAllByRole": [Function], + "getAllByTestId": [Function], + "getAllByText": [Function], + "getAllByTitle": [Function], + "getByAltText": [Function], + "getByDisplayValue": [Function], + "getByLabelText": [Function], + "getByPlaceholderText": [Function], + "getByRole": [Function], + "getByTestId": [Function], + "getByText": [Function], + "getByTitle": [Function], + "queryAllByAltText": [Function], + "queryAllByDisplayValue": [Function], + "queryAllByLabelText": [Function], + "queryAllByPlaceholderText": [Function], + "queryAllByRole": [Function], + "queryAllByTestId": [Function], + "queryAllByText": [Function], + "queryAllByTitle": [Function], + "queryByAltText": [Function], + "queryByDisplayValue": [Function], + "queryByLabelText": [Function], + "queryByPlaceholderText": [Function], + "queryByRole": [Function], + "queryByTestId": [Function], + "queryByText": [Function], + "queryByTitle": [Function], + "rerender": [Function], + "unmount": [Function], + "user": Object { + "clear": [Function], + "click": [Function], + "copy": [Function], + "cut": [Function], + "dblClick": [Function], + "deselectOptions": [Function], + "hover": [Function], + "keyboard": [Function], + "paste": [Function], + "pointer": [Function], + "selectOptions": [Function], + "setup": [Function], + "tab": [Function], + "tripleClick": [Function], + "type": [Function], + "unhover": [Function], + "upload": [Function], + }, +} +`; + exports[`TestCardForm initial state matches snapshot for covid device 1`] = ` Object { "asFragment": [Function], diff --git a/frontend/src/app/testQueue/TestCardForm/diseaseSpecificComponents/aoeUtils.test.ts b/frontend/src/app/testQueue/TestCardForm/diseaseSpecificComponents/aoeUtils.test.ts index 5ac1cd96ac..7f2e2a9925 100644 --- a/frontend/src/app/testQueue/TestCardForm/diseaseSpecificComponents/aoeUtils.test.ts +++ b/frontend/src/app/testQueue/TestCardForm/diseaseSpecificComponents/aoeUtils.test.ts @@ -1,4 +1,6 @@ import { + chlamydiaSymptomDefinitions, + chlamydiaSymptomOrder, gonorrheaSymptomDefinitions, gonorrheaSymptomOrder, hepatitisCSymptomDefinitions, @@ -43,4 +45,15 @@ describe("mapSymptomBoolLiteralsToBool", () => { expect(parsedPayload[symptomKey]).toEqual(false); }); }); + it("takes a JSON payload of {'Chlamydia symptom SNOMEDS' : boolean strings} and parses the strings into booleans", () => { + const chlamydiaSymptomPayload = + '{"77880009":false,"405729008":false,"301822002":false,"249301002":false,"49650001":false,"9957009":false,"162156001":false,"63901009":false,"438457000":false}\n'; + const parsedPayload = mapSymptomBoolLiteralsToBool( + chlamydiaSymptomPayload, + chlamydiaSymptomDefinitions + ); + chlamydiaSymptomOrder.forEach((symptomKey) => { + expect(parsedPayload[symptomKey]).toEqual(false); + }); + }); }); diff --git a/frontend/src/app/testQueue/TestCardForm/diseaseSpecificComponents/aoeUtils.ts b/frontend/src/app/testQueue/TestCardForm/diseaseSpecificComponents/aoeUtils.ts index 4c789e7309..400ec931c6 100644 --- a/frontend/src/app/testQueue/TestCardForm/diseaseSpecificComponents/aoeUtils.ts +++ b/frontend/src/app/testQueue/TestCardForm/diseaseSpecificComponents/aoeUtils.ts @@ -4,6 +4,8 @@ import _ from "lodash"; import { AoeQuestionResponses } from "../TestCardFormReducer"; import { + chlamydiaSymptomDefinitions, + chlamydiaSymptomsMap, gonorrheaSymptomDefinitions, gonorrheaSymptomsMap, hepatitisCSymptomDefinitions, @@ -190,6 +192,11 @@ export function stringifySymptomJsonForAoeUpdate( mapSymptomBoolLiteralsToBool(symptomJson, gonorrheaSymptomDefinitions) ); } + if (_.isEqual(symptomKeys, Object.keys(chlamydiaSymptomsMap))) { + symptomPayload = JSON.stringify( + mapSymptomBoolLiteralsToBool(symptomJson, chlamydiaSymptomDefinitions) + ); + } return symptomPayload; } @@ -210,6 +217,9 @@ export function mapSpecifiedSymptomBoolLiteralsToBool( if (disease === AOEFormOption.GONORRHEA) { symptomDefinitionToParse = gonorrheaSymptomDefinitions; } + if (disease === AOEFormOption.CHLAMYDIA) { + symptomDefinitionToParse = chlamydiaSymptomDefinitions; + } // there are no symptoms for that test card, so return true if (!symptomDefinitionToParse) return { shouldReturn: true }; return mapSymptomBoolLiteralsToBool( diff --git a/frontend/src/app/testQueue/testCardTestConstants.ts b/frontend/src/app/testQueue/testCardTestConstants.ts index 6849ca3e43..b4e2b03411 100644 --- a/frontend/src/app/testQueue/testCardTestConstants.ts +++ b/frontend/src/app/testQueue/testCardTestConstants.ts @@ -10,6 +10,7 @@ import { import mockSupportedDiseaseTestPerformedHIV from "../supportAdmin/DeviceType/mocks/mockSupportedDiseaseTestPerformedHIV"; import mockSupportedDiseaseTestPerformedSyphilis from "../supportAdmin/DeviceType/mocks/mockSupportedDiseaseTestPerformedSyphilis"; import mockSupportedDiseaseTestPerformedGonorrhea from "../supportAdmin/DeviceType/mocks/mockSupportedDiseaseTestPerformedGonorrhea"; +import mockSupportedDiseaseTestPerformedChlamydia from "../supportAdmin/DeviceType/mocks/mockSupportedDiseaseTestPerformedChlamydia"; import { QueriedFacility, QueriedTestOrder } from "./TestCardForm/types"; import mockSupportedDiseaseCovid from "./mocks/mockSupportedDiseaseCovid"; @@ -35,6 +36,8 @@ export const hepatitisCDeviceName = "HEPATITIS C"; export const hepatitisCDeviceId = "HEPATITIS C-DEVICE-ID"; export const gonorrheaDeviceName = "GONORRHEA"; export const gonorrheaDeviceId = "GONORRHEA-DEVICE-ID"; +export const chlamydiaDeviceName = "Chlamydia device"; +export const chlamydiaDeviceId = "CHLAMYDIA-DEVICE-ID"; // 6 instead of 7 because HIV devices are filtered out when HIV feature flag is disabled export const DEFAULT_DEVICE_OPTIONS_LENGTH = 6; @@ -433,6 +436,21 @@ export const facilityInfo: QueriedFacility = { }, ], }, + { + internalId: chlamydiaDeviceId, + name: chlamydiaDeviceName, + testLength: 15, + supportedDiseaseTestPerformed: [ + ...mockSupportedDiseaseTestPerformedChlamydia, + ], + swabTypes: [ + { + name: specimen1Name, + internalId: specimen1Id, + typeCode: "445297001", + }, + ], + }, ], }; diff --git a/frontend/src/app/testResults/constants.ts b/frontend/src/app/testResults/constants.ts index 09f214afe7..73e1dc28ae 100644 --- a/frontend/src/app/testResults/constants.ts +++ b/frontend/src/app/testResults/constants.ts @@ -8,6 +8,7 @@ export enum MULTIPLEX_DISEASES { FLU_A_AND_B = "Flu A and B", HEPATITIS_C = "Hepatitis C", GONORRHEA = "Gonorrhea", + CHLAMYDIA = "Chlamydia", } export enum TEST_RESULTS { diff --git a/frontend/src/app/utils/disease.ts b/frontend/src/app/utils/disease.ts index ad1433e656..d4aac38574 100644 --- a/frontend/src/app/utils/disease.ts +++ b/frontend/src/app/utils/disease.ts @@ -22,6 +22,10 @@ export const useSupportedDiseaseList = () => { if (!gonorrheaEnabled) { allDiseases = allDiseases.filter((d) => d !== MULTIPLEX_DISEASES.GONORRHEA); } + const chlamydiaEnabled = Boolean(useFeature("chlamydiaEnabled")); + if (!chlamydiaEnabled) { + allDiseases = allDiseases.filter((d) => d !== MULTIPLEX_DISEASES.CHLAMYDIA); + } return allDiseases; }; diff --git a/frontend/src/patientApp/timeOfTest/constants.ts b/frontend/src/patientApp/timeOfTest/constants.ts index d174534f7c..544a50af91 100644 --- a/frontend/src/patientApp/timeOfTest/constants.ts +++ b/frontend/src/patientApp/timeOfTest/constants.ts @@ -181,6 +181,31 @@ export const gonorrheaSymptomDefinitions: SymptomDefinitionMap[] = label: gonorrheaSymptomsMap[value], })); +export const chlamydiaSymptomsMap = { + "77880009": "Pain in rectum", + "405729008": "Rectal bleeding", + "301822002": "Abnormal vaginal bleeding", + "249301002": "Bleeding from urethra", + "49650001": "Burning sensation when urinating", + "9957009": "Urethral discharge", + "162156001": "Vaginal discharge", + "63901009": "Testicular pain", + "438457000": "Swelling of testicles", +} as const; + +export type ChlamydiaSymptoms = typeof chlamydiaSymptomsMap; +export type ChlamydiaSymptomCode = keyof ChlamydiaSymptoms; +export type ChlamydiaSymptomName = ChlamydiaSymptoms[ChlamydiaSymptomCode]; + +export const chlamydiaSymptomOrder: ChlamydiaSymptomCode[] = + alphabetizeSymptomKeysFromMapValues(chlamydiaSymptomsMap); + +export const chlamydiaSymptomDefinitions: SymptomDefinitionMap[] = + chlamydiaSymptomOrder.map((value) => ({ + value, + label: chlamydiaSymptomsMap[value], + })); + export const SYMPTOM_SUBQUESTION_ERROR = "This question is required if the patient has symptoms."; export const ONSET_DATE_LABEL = "When did the patient's symptoms start?"; @@ -188,14 +213,17 @@ export const ONSET_DATE_LABEL = "When did the patient's symptoms start?"; export type AllSymptomsCode = keyof RespiratorySymptoms & keyof SyphilisSymptoms & keyof HepatitisCSymptoms & - keyof GonorrheaSymptoms; + keyof GonorrheaSymptoms & + keyof ChlamydiaSymptoms; export type AllSymptomsName = RespiratorySymptomName & SyphilisSymptomName & HepatitisCSymptomName & - GonorrheaSymptomName; + GonorrheaSymptomName & + ChlamydiaSymptomName; export const allSymptomsMap = { ...syphilisSymptomsMap, ...respiratorySymptomsMap, ...hepatitisCSymptomsMap, ...gonorrheaSymptomsMap, + ...chlamydiaSymptomsMap, };