From 553011aafc4fab14ef2606cd883f9da415a60d17 Mon Sep 17 00:00:00 2001
From: Alex Tan <AlexTAN331@outlook.com>
Date: Thu, 13 Aug 2020 10:36:40 -0400
Subject: [PATCH 1/5] refactor(lab): rename lab request related buttons

fix #2296
---
 src/__tests__/labs/requests/NewLabRequest.test.tsx | 2 +-
 src/labs/requests/NewLabRequest.tsx                | 2 +-
 src/shared/locales/enUs/translations/labs/index.ts | 3 ++-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/__tests__/labs/requests/NewLabRequest.test.tsx b/src/__tests__/labs/requests/NewLabRequest.test.tsx
index 01d1392ffd..8723ce5515 100644
--- a/src/__tests__/labs/requests/NewLabRequest.test.tsx
+++ b/src/__tests__/labs/requests/NewLabRequest.test.tsx
@@ -97,7 +97,7 @@ describe('New Lab Request', () => {
     it('should render a save button', () => {
       const saveButton = wrapper.find(Button).at(0)
       expect(saveButton).toBeDefined()
-      expect(saveButton.text().trim()).toEqual('actions.save')
+      expect(saveButton.text().trim()).toEqual('labs.requests.save')
     })
 
     it('should render a cancel button', () => {
diff --git a/src/labs/requests/NewLabRequest.tsx b/src/labs/requests/NewLabRequest.tsx
index ee88a8087c..421e993998 100644
--- a/src/labs/requests/NewLabRequest.tsx
+++ b/src/labs/requests/NewLabRequest.tsx
@@ -121,7 +121,7 @@ const NewLabRequest = () => {
         <div className="row float-right">
           <div className="btn-group btn-group-lg mt-3">
             <Button className="mr-2" color="success" onClick={onSave}>
-              {t('actions.save')}
+              {t('labs.requests.save')}
             </Button>
 
             <Button color="danger" onClick={onCancel}>
diff --git a/src/shared/locales/enUs/translations/labs/index.ts b/src/shared/locales/enUs/translations/labs/index.ts
index d5027ed844..5b56c0ee59 100644
--- a/src/shared/locales/enUs/translations/labs/index.ts
+++ b/src/shared/locales/enUs/translations/labs/index.ts
@@ -13,7 +13,8 @@ export default {
     },
     requests: {
       label: 'Lab Requests',
-      new: 'New Lab Request',
+      new: 'Request Lab',
+      save: 'Request',
       view: 'View Lab',
       cancel: 'Cancel Lab',
       complete: 'Complete Lab',

From 3db29b7454f7896bdb9a14fae0a615bb6e32e879 Mon Sep 17 00:00:00 2001
From: Alex Tan <AlexTAN331@outlook.com>
Date: Sat, 15 Aug 2020 12:31:05 -0400
Subject: [PATCH 2/5] feat(imaging): link imaging request with visit

fix #2291
---
 .../requests/NewImagingRequest.test.tsx       |  19 ++-
 src/imagings/imaging-slice.ts                 |   1 +
 src/imagings/requests/NewImagingRequest.tsx   | 115 ++++++++++++++----
 .../enUs/translations/patient/index.ts        |   2 +-
 src/shared/model/Imaging.ts                   |   1 +
 5 files changed, 108 insertions(+), 30 deletions(-)

diff --git a/src/__tests__/imagings/requests/NewImagingRequest.test.tsx b/src/__tests__/imagings/requests/NewImagingRequest.test.tsx
index a05bfde5a4..5770df495d 100644
--- a/src/__tests__/imagings/requests/NewImagingRequest.test.tsx
+++ b/src/__tests__/imagings/requests/NewImagingRequest.test.tsx
@@ -86,6 +86,14 @@ describe('New Imaging Request', () => {
       expect(typeahead.prop('searchAccessor')).toEqual('fullName')
     })
 
+    it('should render a dropdown list of visits', async () => {
+      const wrapper = await setup('loading', {})
+      const visitsTypeSelect = wrapper.find('.visits').find(SelectWithLabelFormGroup)
+      expect(visitsTypeSelect).toBeDefined()
+      expect(visitsTypeSelect.prop('label')).toEqual('patient.visits.type')
+      expect(visitsTypeSelect.prop('isRequired')).toBeTruthy()
+    })
+
     it('should render a type input box', async () => {
       const wrapper = await setup('loading', {})
       const typeInputBox = wrapper.find(TextInputWithLabelFormGroup)
@@ -98,7 +106,7 @@ describe('New Imaging Request', () => {
 
     it('should render a status types select', async () => {
       const wrapper = await setup('loading', {})
-      const statusTypesSelect = wrapper.find(SelectWithLabelFormGroup)
+      const statusTypesSelect = wrapper.find('.imaging-status').find(SelectWithLabelFormGroup)
 
       expect(statusTypesSelect).toBeDefined()
       expect(statusTypesSelect.prop('label')).toEqual('imagings.imaging.status')
@@ -184,6 +192,7 @@ describe('New Imaging Request', () => {
         patient: 'patient',
         type: 'expected type',
         status: 'requested',
+        visitId: 'expected visitId',
         notes: 'expected notes',
         id: '1234',
         requestedOn: expectedDate.toISOString(),
@@ -204,12 +213,18 @@ describe('New Imaging Request', () => {
         onChange({ currentTarget: { value: expectedImaging.type } })
       })
 
-      const statusSelect = wrapper.find(SelectWithLabelFormGroup)
+      const statusSelect = wrapper.find('.imaging-status').find(SelectWithLabelFormGroup)
       act(() => {
         const onChange = statusSelect.prop('onChange') as any
         onChange({ currentTarget: { value: expectedImaging.status } })
       })
 
+      const visitsSelect = wrapper.find('.visits').find(SelectWithLabelFormGroup)
+      act(() => {
+        const onChange = visitsSelect.prop('onChange') as any
+        onChange({ currentTarget: { value: expectedImaging.visitId } })
+      })
+
       const notesTextField = wrapper.find(TextFieldWithLabelFormGroup)
       act(() => {
         const onChange = notesTextField.prop('onChange') as any
diff --git a/src/imagings/imaging-slice.ts b/src/imagings/imaging-slice.ts
index 5be2c06c03..70bd442e96 100644
--- a/src/imagings/imaging-slice.ts
+++ b/src/imagings/imaging-slice.ts
@@ -10,6 +10,7 @@ interface Error {
   type?: string
   status?: string
   message?: string
+  visitId?: string
 }
 
 interface ImagingState {
diff --git a/src/imagings/requests/NewImagingRequest.tsx b/src/imagings/requests/NewImagingRequest.tsx
index abbb768518..ee4ba4cd0c 100644
--- a/src/imagings/requests/NewImagingRequest.tsx
+++ b/src/imagings/requests/NewImagingRequest.tsx
@@ -1,4 +1,4 @@
-import { Typeahead, Label, Button, Alert } from '@hospitalrun/components'
+import { Typeahead, Label, Button, Alert, Column, Row } from '@hospitalrun/components'
 import React, { useState } from 'react'
 import { useDispatch, useSelector } from 'react-redux'
 import { useHistory } from 'react-router-dom'
@@ -23,6 +23,7 @@ const NewImagingRequest = () => {
   const history = useHistory()
   useTitle(t('imagings.requests.new'))
   const { status, error } = useSelector((state: RootState) => state.imaging)
+  const [visitOption, setVisitOption] = useState([] as Option[])
 
   const statusOptions: Option[] = [
     { label: t('imagings.status.requested'), value: 'requested' },
@@ -35,6 +36,7 @@ const NewImagingRequest = () => {
     type: '',
     notes: '',
     status: '',
+    visitId: '',
   })
 
   const breadcrumbs = [
@@ -46,10 +48,21 @@ const NewImagingRequest = () => {
   useAddBreadcrumbs(breadcrumbs)
 
   const onPatientChange = (patient: Patient) => {
-    setNewImagingRequest((previousNewImagingRequest) => ({
-      ...previousNewImagingRequest,
-      patient: patient.fullName as string,
-    }))
+    if (patient) {
+      setNewImagingRequest((previousNewImagingRequest) => ({
+        ...previousNewImagingRequest,
+        patient: patient.fullName as string,
+      }))
+
+      const visits = patient.visits?.map((v) => ({ label: v.type, value: v.id }))
+      setVisitOption(visits)
+    } else {
+      setNewImagingRequest((previousNewImagingRequest) => ({
+        ...previousNewImagingRequest,
+        patient: '',
+        visitId: '',
+      }))
+    }
   }
 
   const onImagingTypeChange = (event: React.ChangeEvent<HTMLInputElement>) => {
@@ -67,6 +80,13 @@ const NewImagingRequest = () => {
     }))
   }
 
+  const onVisitChange = (value: string) => {
+    setNewImagingRequest((previousNewImagingRequest) => ({
+      ...previousNewImagingRequest,
+      visitId: value,
+    }))
+  }
+
   const onNoteChange = (event: React.ChangeEvent<HTMLTextAreaElement>) => {
     const notes = event.currentTarget.value
     setNewImagingRequest((previousNewImagingRequest) => ({
@@ -94,19 +114,56 @@ const NewImagingRequest = () => {
         <Alert color="danger" title={t('states.error')} message={t(error.message || '')} />
       )}
       <form>
-        <div className="form-group patient-typeahead">
-          <Label htmlFor="patientTypeahead" isRequired text={t('imagings.imaging.patient')} />
-          <Typeahead
-            id="patientTypeahead"
-            placeholder={t('imagings.imaging.patient')}
-            onChange={(p: Patient[]) => onPatientChange(p[0])}
-            onSearch={async (query: string) => PatientRepository.search(query)}
-            searchAccessor="fullName"
-            renderMenuItemChildren={(p: Patient) => <div>{`${p.fullName} (${p.code})`}</div>}
-            isInvalid={!!error.patient}
-            feedback={t(error.patient as string)}
-          />
-        </div>
+        <Row>
+          <Column>
+            <div className="form-group patient-typeahead">
+              <Label htmlFor="patientTypeahead" isRequired text={t('imagings.imaging.patient')} />
+              <Typeahead
+                id="patientTypeahead"
+                placeholder={t('imagings.imaging.patient')}
+                onChange={(p: Patient[]) => {
+                  onPatientChange(p[0])
+                }}
+                onSearch={async (query: string) => PatientRepository.search(query)}
+                searchAccessor="fullName"
+                renderMenuItemChildren={(p: Patient) => <div>{`${p.fullName} (${p.code})`}</div>}
+                isInvalid={!!error.patient}
+                feedback={t(error.patient as string)}
+              />
+            </div>
+          </Column>
+          <Column>
+            <div className="visits">
+              {newImagingRequest.patient && visitOption ? (
+                <SelectWithLabelFormGroup
+                  name="visit"
+                  label={t('patient.visits.type')}
+                  isRequired
+                  isEditable
+                  options={visitOption}
+                  defaultSelected={visitOption.filter(
+                    ({ value }) => value === newImagingRequest.visitId,
+                  )}
+                  onChange={(values) => {
+                    onVisitChange(values[0])
+                  }}
+                />
+              ) : (
+                <SelectWithLabelFormGroup
+                  name="visit"
+                  label={t('patient.visits.type')}
+                  isRequired
+                  isEditable={false}
+                  options={[]}
+                  onChange={(values) => {
+                    onVisitChange(values[0])
+                  }}
+                />
+              )}
+            </div>
+          </Column>
+        </Row>
+
         <TextInputWithLabelFormGroup
           name="imagingType"
           label={t('imagings.imaging.type')}
@@ -117,15 +174,19 @@ const NewImagingRequest = () => {
           value={newImagingRequest.type}
           onChange={onImagingTypeChange}
         />
-        <SelectWithLabelFormGroup
-          name="status"
-          label={t('imagings.imaging.status')}
-          options={statusOptions}
-          isRequired
-          isEditable
-          defaultSelected={statusOptions.filter(({ value }) => value === newImagingRequest.status)}
-          onChange={(values) => onStatusChange(values[0])}
-        />
+        <div className="imaging-status">
+          <SelectWithLabelFormGroup
+            name="status"
+            label={t('imagings.imaging.status')}
+            options={statusOptions}
+            isRequired
+            isEditable
+            defaultSelected={statusOptions.filter(
+              ({ value }) => value === newImagingRequest.status,
+            )}
+            onChange={(values) => onStatusChange(values[0])}
+          />
+        </div>
         <div className="form-group">
           <TextFieldWithLabelFormGroup
             name="ImagingNotes"
diff --git a/src/shared/locales/enUs/translations/patient/index.ts b/src/shared/locales/enUs/translations/patient/index.ts
index 88764c44f3..704e4b4334 100644
--- a/src/shared/locales/enUs/translations/patient/index.ts
+++ b/src/shared/locales/enUs/translations/patient/index.ts
@@ -146,7 +146,7 @@ export default {
       label: 'Visits',
       startDateTime: 'Start Date',
       endDateTime: 'End Date',
-      type: 'Type',
+      type: 'Visit Type',
       status: 'Status',
       reason: 'Reason',
       location: 'Location',
diff --git a/src/shared/model/Imaging.ts b/src/shared/model/Imaging.ts
index e423d983fd..c8f6492912 100644
--- a/src/shared/model/Imaging.ts
+++ b/src/shared/model/Imaging.ts
@@ -5,6 +5,7 @@ export default interface Imaging extends AbstractDBModel {
   patient: string
   type: string
   status: 'requested' | 'completed' | 'canceled'
+  visitId: string
   requestedOn: string
   requestedBy: string // will be the currently logged in user's id
   completedOn?: string

From 7ecf581deae5e1beccaba8643ac290e4ec8b48d6 Mon Sep 17 00:00:00 2001
From: Alex Tan <AlexTAN331@outlook.com>
Date: Mon, 17 Aug 2020 11:03:35 -0400
Subject: [PATCH 3/5] feat(imaging): create translation key for visit dropdown
 label in new request imaging page

fix #2291
---
 src/__tests__/imagings/requests/NewImagingRequest.test.tsx | 2 +-
 src/imagings/requests/NewImagingRequest.tsx                | 4 ++--
 src/shared/locales/enUs/translations/imagings/index.ts     | 1 +
 src/shared/locales/enUs/translations/patient/index.ts      | 2 +-
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/__tests__/imagings/requests/NewImagingRequest.test.tsx b/src/__tests__/imagings/requests/NewImagingRequest.test.tsx
index 5770df495d..8c13663987 100644
--- a/src/__tests__/imagings/requests/NewImagingRequest.test.tsx
+++ b/src/__tests__/imagings/requests/NewImagingRequest.test.tsx
@@ -90,7 +90,7 @@ describe('New Imaging Request', () => {
       const wrapper = await setup('loading', {})
       const visitsTypeSelect = wrapper.find('.visits').find(SelectWithLabelFormGroup)
       expect(visitsTypeSelect).toBeDefined()
-      expect(visitsTypeSelect.prop('label')).toEqual('patient.visits.type')
+      expect(visitsTypeSelect.prop('label')).toEqual('imagings.imaging.visit')
       expect(visitsTypeSelect.prop('isRequired')).toBeTruthy()
     })
 
diff --git a/src/imagings/requests/NewImagingRequest.tsx b/src/imagings/requests/NewImagingRequest.tsx
index ee4ba4cd0c..9eabb89542 100644
--- a/src/imagings/requests/NewImagingRequest.tsx
+++ b/src/imagings/requests/NewImagingRequest.tsx
@@ -137,7 +137,7 @@ const NewImagingRequest = () => {
               {newImagingRequest.patient && visitOption ? (
                 <SelectWithLabelFormGroup
                   name="visit"
-                  label={t('patient.visits.type')}
+                  label={t('imagings.imaging.visit')}
                   isRequired
                   isEditable
                   options={visitOption}
@@ -151,7 +151,7 @@ const NewImagingRequest = () => {
               ) : (
                 <SelectWithLabelFormGroup
                   name="visit"
-                  label={t('patient.visits.type')}
+                  label={t('imagings.imaging.visit')}
                   isRequired
                   isEditable={false}
                   options={[]}
diff --git a/src/shared/locales/enUs/translations/imagings/index.ts b/src/shared/locales/enUs/translations/imagings/index.ts
index b98e7db19a..d290cd60ef 100644
--- a/src/shared/locales/enUs/translations/imagings/index.ts
+++ b/src/shared/locales/enUs/translations/imagings/index.ts
@@ -25,6 +25,7 @@ export default {
       code: 'Imaging Code',
       status: 'Status',
       type: 'Type',
+      visit: 'Visit Type',
       notes: 'Notes',
       requestedOn: 'Requested On',
       completedOn: 'Completed On',
diff --git a/src/shared/locales/enUs/translations/patient/index.ts b/src/shared/locales/enUs/translations/patient/index.ts
index 704e4b4334..88764c44f3 100644
--- a/src/shared/locales/enUs/translations/patient/index.ts
+++ b/src/shared/locales/enUs/translations/patient/index.ts
@@ -146,7 +146,7 @@ export default {
       label: 'Visits',
       startDateTime: 'Start Date',
       endDateTime: 'End Date',
-      type: 'Visit Type',
+      type: 'Type',
       status: 'Status',
       reason: 'Reason',
       location: 'Location',

From 37a309c87ae2227f032755f5385297733872d334 Mon Sep 17 00:00:00 2001
From: Alex Tan <AlexTAN331@outlook.com>
Date: Tue, 18 Aug 2020 15:50:38 -0400
Subject: [PATCH 4/5] feat(imaging): add more descriptive info to visit label
 and simplify the visit div component

fix #2291
---
 src/__tests__/imagings/ViewImagings.test.tsx |  3 +-
 src/imagings/ViewImagings.tsx                |  2 +-
 src/imagings/requests/NewImagingRequest.tsx  | 57 ++++++++++----------
 src/shared/model/Imaging.ts                  |  1 +
 4 files changed, 33 insertions(+), 30 deletions(-)

diff --git a/src/__tests__/imagings/ViewImagings.test.tsx b/src/__tests__/imagings/ViewImagings.test.tsx
index 94ac8b53fb..f06f32e3cb 100644
--- a/src/__tests__/imagings/ViewImagings.test.tsx
+++ b/src/__tests__/imagings/ViewImagings.test.tsx
@@ -28,6 +28,7 @@ describe('View Imagings', () => {
     id: '1234',
     type: 'imaging type',
     patient: 'patient',
+    fullName: 'full name',
     status: 'requested',
     requestedOn: expectedDate.toISOString(),
     requestedBy: 'some user',
@@ -110,7 +111,7 @@ describe('View Imagings', () => {
         expect.objectContaining({ label: 'imagings.imaging.requestedOn', key: 'requestedOn' }),
       )
       expect(columns[3]).toEqual(
-        expect.objectContaining({ label: 'imagings.imaging.patient', key: 'patient' }),
+        expect.objectContaining({ label: 'imagings.imaging.patient', key: 'fullName' }),
       )
       expect(columns[4]).toEqual(
         expect.objectContaining({ label: 'imagings.imaging.requestedBy', key: 'requestedBy' }),
diff --git a/src/imagings/ViewImagings.tsx b/src/imagings/ViewImagings.tsx
index ffc5317566..96b2bd4b9f 100644
--- a/src/imagings/ViewImagings.tsx
+++ b/src/imagings/ViewImagings.tsx
@@ -74,7 +74,7 @@ const ViewImagings = () => {
               formatter: (row) =>
                 row.requestedOn ? format(new Date(row.requestedOn), 'yyyy-MM-dd hh:mm a') : '',
             },
-            { label: t('imagings.imaging.patient'), key: 'patient' },
+            { label: t('imagings.imaging.patient'), key: 'fullName' },
             {
               label: t('imagings.imaging.requestedBy'),
               key: 'requestedBy',
diff --git a/src/imagings/requests/NewImagingRequest.tsx b/src/imagings/requests/NewImagingRequest.tsx
index 9eabb89542..d9dd4719a1 100644
--- a/src/imagings/requests/NewImagingRequest.tsx
+++ b/src/imagings/requests/NewImagingRequest.tsx
@@ -1,4 +1,5 @@
 import { Typeahead, Label, Button, Alert, Column, Row } from '@hospitalrun/components'
+import format from 'date-fns/format'
 import React, { useState } from 'react'
 import { useDispatch, useSelector } from 'react-redux'
 import { useHistory } from 'react-router-dom'
@@ -33,6 +34,7 @@ const NewImagingRequest = () => {
 
   const [newImagingRequest, setNewImagingRequest] = useState({
     patient: '',
+    fullName: '',
     type: '',
     notes: '',
     status: '',
@@ -51,17 +53,24 @@ const NewImagingRequest = () => {
     if (patient) {
       setNewImagingRequest((previousNewImagingRequest) => ({
         ...previousNewImagingRequest,
-        patient: patient.fullName as string,
+        patient: patient.id,
+        fullName: patient.fullName as string,
       }))
 
-      const visits = patient.visits?.map((v) => ({ label: v.type, value: v.id }))
+      const visits = patient.visits?.map((v) => ({
+        label: `${v.type} at ${format(new Date(v.startDateTime), 'yyyy-MM-dd hh:mm a')}`,
+        value: v.id,
+      })) as Option[]
+
       setVisitOption(visits)
     } else {
       setNewImagingRequest((previousNewImagingRequest) => ({
         ...previousNewImagingRequest,
         patient: '',
+        fullName: '',
         visitId: '',
       }))
+      setVisitOption([])
     }
   }
 
@@ -108,6 +117,13 @@ const NewImagingRequest = () => {
     history.push('/imaging')
   }
 
+  const defaultSelectedVisitsOption = () => {
+    if (visitOption !== undefined) {
+      return visitOption.filter(({ value }) => value === newImagingRequest.visitId)
+    }
+    return []
+  }
+
   return (
     <>
       {status === 'error' && (
@@ -134,32 +150,17 @@ const NewImagingRequest = () => {
           </Column>
           <Column>
             <div className="visits">
-              {newImagingRequest.patient && visitOption ? (
-                <SelectWithLabelFormGroup
-                  name="visit"
-                  label={t('imagings.imaging.visit')}
-                  isRequired
-                  isEditable
-                  options={visitOption}
-                  defaultSelected={visitOption.filter(
-                    ({ value }) => value === newImagingRequest.visitId,
-                  )}
-                  onChange={(values) => {
-                    onVisitChange(values[0])
-                  }}
-                />
-              ) : (
-                <SelectWithLabelFormGroup
-                  name="visit"
-                  label={t('imagings.imaging.visit')}
-                  isRequired
-                  isEditable={false}
-                  options={[]}
-                  onChange={(values) => {
-                    onVisitChange(values[0])
-                  }}
-                />
-              )}
+              <SelectWithLabelFormGroup
+                name="visit"
+                label={t('imagings.imaging.visit')}
+                isRequired
+                isEditable={newImagingRequest.patient !== undefined}
+                options={visitOption || []}
+                defaultSelected={defaultSelectedVisitsOption()}
+                onChange={(values) => {
+                  onVisitChange(values[0])
+                }}
+              />
             </div>
           </Column>
         </Row>
diff --git a/src/shared/model/Imaging.ts b/src/shared/model/Imaging.ts
index c8f6492912..88d91beb6d 100644
--- a/src/shared/model/Imaging.ts
+++ b/src/shared/model/Imaging.ts
@@ -3,6 +3,7 @@ import AbstractDBModel from './AbstractDBModel'
 export default interface Imaging extends AbstractDBModel {
   code: string
   patient: string
+  fullName: string
   type: string
   status: 'requested' | 'completed' | 'canceled'
   visitId: string

From 38962fafbecb0259a27445db89a554f63d4f87e9 Mon Sep 17 00:00:00 2001
From: Alex Tan <AlexTAN331@outlook.com>
Date: Thu, 20 Aug 2020 09:27:49 -0400
Subject: [PATCH 5/5] feat(imaging): refactor visits label translation key

fix #2291
---
 src/__tests__/imagings/requests/NewImagingRequest.test.tsx | 2 +-
 src/imagings/requests/NewImagingRequest.tsx                | 2 +-
 src/shared/locales/enUs/translations/imagings/index.ts     | 1 -
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/__tests__/imagings/requests/NewImagingRequest.test.tsx b/src/__tests__/imagings/requests/NewImagingRequest.test.tsx
index 8c13663987..6d21d587f5 100644
--- a/src/__tests__/imagings/requests/NewImagingRequest.test.tsx
+++ b/src/__tests__/imagings/requests/NewImagingRequest.test.tsx
@@ -90,7 +90,7 @@ describe('New Imaging Request', () => {
       const wrapper = await setup('loading', {})
       const visitsTypeSelect = wrapper.find('.visits').find(SelectWithLabelFormGroup)
       expect(visitsTypeSelect).toBeDefined()
-      expect(visitsTypeSelect.prop('label')).toEqual('imagings.imaging.visit')
+      expect(visitsTypeSelect.prop('label')).toEqual('patient.visits.label')
       expect(visitsTypeSelect.prop('isRequired')).toBeTruthy()
     })
 
diff --git a/src/imagings/requests/NewImagingRequest.tsx b/src/imagings/requests/NewImagingRequest.tsx
index d9dd4719a1..f6432f7e47 100644
--- a/src/imagings/requests/NewImagingRequest.tsx
+++ b/src/imagings/requests/NewImagingRequest.tsx
@@ -152,7 +152,7 @@ const NewImagingRequest = () => {
             <div className="visits">
               <SelectWithLabelFormGroup
                 name="visit"
-                label={t('imagings.imaging.visit')}
+                label={t('patient.visits.label')}
                 isRequired
                 isEditable={newImagingRequest.patient !== undefined}
                 options={visitOption || []}
diff --git a/src/shared/locales/enUs/translations/imagings/index.ts b/src/shared/locales/enUs/translations/imagings/index.ts
index d290cd60ef..b98e7db19a 100644
--- a/src/shared/locales/enUs/translations/imagings/index.ts
+++ b/src/shared/locales/enUs/translations/imagings/index.ts
@@ -25,7 +25,6 @@ export default {
       code: 'Imaging Code',
       status: 'Status',
       type: 'Type',
-      visit: 'Visit Type',
       notes: 'Notes',
       requestedOn: 'Requested On',
       completedOn: 'Completed On',