diff --git a/packages/esm-patient-common-lib/src/orders/types/order.ts b/packages/esm-patient-common-lib/src/orders/types/order.ts
index 8a56bddc16..edda893ad7 100644
--- a/packages/esm-patient-common-lib/src/orders/types/order.ts
+++ b/packages/esm-patient-common-lib/src/orders/types/order.ts
@@ -70,6 +70,7 @@ export interface OrderBasketItem {
   previousOrder?: string;
   orderType?: string;
   orderNumber?: string;
+  scheduledDate?: Date;
 }
 
 export type OrderUrgency = 'ROUTINE' | 'STAT' | 'ON_SCHEDULED_DATE';
@@ -96,6 +97,7 @@ export interface OrderPost {
   instructions?: string;
   accessionNumber?: string;
   orderType?: string;
+  scheduledDate?: string;
 }
 
 export interface DrugOrderPost extends OrderPost {
diff --git a/packages/esm-patient-orders-app/src/components/orders-details-table.component.tsx b/packages/esm-patient-orders-app/src/components/orders-details-table.component.tsx
index 5e5edac6eb..54ed9d2f53 100644
--- a/packages/esm-patient-orders-app/src/components/orders-details-table.component.tsx
+++ b/packages/esm-patient-orders-app/src/components/orders-details-table.component.tsx
@@ -70,12 +70,10 @@ interface OrderDetailsProps {
 }
 
 interface OrderBasketItemActionsProps {
-  items: Array<MutableOrderBasketItem>;
   openOrderBasket: () => void;
   openOrderForm: (additionalProps?: { order: MutableOrderBasketItem }) => void;
   orderItem: Order;
   responsiveSize: string;
-  setOrderItems: (orderType: string, items: Array<MutableOrderBasketItem>) => void;
 }
 
 interface OrderHeaderProps {
@@ -114,7 +112,6 @@ const OrderDetailsTable: React.FC<OrderDetailsProps> = ({ patientUuid, showAddBu
   const patient = usePatient(patientUuid);
   const { excludePatientIdentifierCodeTypes } = useConfig();
   const [isPrinting, setIsPrinting] = useState(false);
-  const { orders, setOrders } = useOrderBasket<MutableOrderBasketItem>();
   const { data: orderTypes } = useOrderTypes();
   const [selectedOrderTypeUuid, setSelectedOrderTypeUuid] = useState(null);
   const [selectedFromDate, setSelectedFromDate] = useState(null);
@@ -512,11 +509,9 @@ const OrderDetailsTable: React.FC<OrderDetailsProps> = ({ patientUuid, showAddBu
                                           <TableCell className="cds--table-column-menu">
                                             {isOmrsOrder(matchingOrder) ? (
                                               <OrderBasketItemActions
-                                                items={orders}
                                                 openOrderBasket={launchOrderBasket}
                                                 openOrderForm={() => openOrderForm(matchingOrder)}
                                                 orderItem={matchingOrder}
-                                                setOrderItems={setOrders}
                                                 responsiveSize={responsiveSize}
                                               />
                                             ) : (
@@ -604,14 +599,13 @@ const OrderDetailsTable: React.FC<OrderDetailsProps> = ({ patientUuid, showAddBu
 
 function OrderBasketItemActions({
   orderItem,
-  items,
-  setOrderItems,
   openOrderBasket,
   openOrderForm,
   responsiveSize,
 }: OrderBasketItemActionsProps) {
   const { t } = useTranslation();
-  const alreadyInBasket = items.some((x) => x.uuid === orderItem.uuid);
+  const { orders, setOrders } = useOrderBasket<MutableOrderBasketItem>(orderItem.orderType.uuid);
+  const alreadyInBasket = orders.some((x) => x.uuid === orderItem.uuid);
 
   const handleModifyClick = useCallback(() => {
     if (orderItem.type === 'drugorder') {
@@ -619,7 +613,7 @@ function OrderBasketItemActions({
         .then((res) => {
           const medicationOrder = res.data;
           const medicationItem = buildMedicationOrder(medicationOrder, 'REVISE');
-          setOrderItems(medicationsOrderBasket, [...items, medicationItem]);
+          setOrders([...orders, medicationItem]);
           openOrderForm({ order: medicationItem });
         })
         .catch((e) => {
@@ -627,14 +621,14 @@ function OrderBasketItemActions({
         });
     } else if (orderItem.type === 'testorder') {
       const labItem = buildLabOrder(orderItem, 'REVISE');
-      setOrderItems(orderItem.orderType.uuid, [...items, labItem]);
+      setOrders([...orders, labItem]);
       openOrderForm({ order: labItem });
     } else if (orderItem.type === 'order') {
       const order = buildGeneralOrder(orderItem, 'REVISE');
-      setOrderItems(orderItem.orderType.uuid, [...items, order]);
+      setOrders([...orders, order]);
       openOrderForm({ order });
     }
-  }, [orderItem, openOrderForm, items, setOrderItems]);
+  }, [orderItem, openOrderForm, orders, setOrders]);
 
   const handleAddResultsClick = useCallback(() => {
     launchPatientWorkspace('test-results-form-workspace', { order: orderItem });
@@ -644,19 +638,19 @@ function OrderBasketItemActions({
     if (orderItem.type === 'drugorder') {
       getDrugOrderByUuid(orderItem.uuid).then((res) => {
         let medicationOrder = res.data;
-        setOrderItems(medicationsOrderBasket, [...items, buildMedicationOrder(medicationOrder, 'DISCONTINUE')]);
+        setOrders([...orders, buildMedicationOrder(medicationOrder, 'DISCONTINUE')]);
         openOrderBasket();
       });
     } else if (orderItem.type === 'testorder') {
       const labItem = buildLabOrder(orderItem, 'DISCONTINUE');
-      setOrderItems(orderItem.orderType.uuid, [...items, labItem]);
+      setOrders([...orders, labItem]);
       openOrderBasket();
     } else {
       const order = buildGeneralOrder(orderItem, 'DISCONTINUE');
-      setOrderItems(orderItem.orderType.uuid, [...items, order]);
+      setOrders([...orders, order]);
       openOrderBasket();
     }
-  }, [orderItem, setOrderItems, items, openOrderBasket]);
+  }, [orderItem, setOrders, orders, openOrderBasket]);
 
   return (
     <Layer className={styles.layer}>
diff --git a/packages/esm-patient-orders-app/src/order-basket/general-order-type/general-order-form/general-order-form.component.tsx b/packages/esm-patient-orders-app/src/order-basket/general-order-type/general-order-form/general-order-form.component.tsx
index a56ca2c007..85c03495a2 100644
--- a/packages/esm-patient-orders-app/src/order-basket/general-order-type/general-order-form/general-order-form.component.tsx
+++ b/packages/esm-patient-orders-app/src/order-basket/general-order-type/general-order-form/general-order-form.component.tsx
@@ -1,9 +1,15 @@
-import React, { useCallback, useEffect, useMemo, useState } from 'react';
+import React, { type ChangeEvent, useCallback, useEffect, useMemo, useState } from 'react';
 import classNames from 'classnames';
-import { useTranslation } from 'react-i18next';
-import { Controller, type FieldErrors, useForm } from 'react-hook-form';
-import { zodResolver } from '@hookform/resolvers/zod';
-import { z } from 'zod';
+import {
+  type OrderBasketItem,
+  type DefaultPatientWorkspaceProps,
+  launchPatientWorkspace,
+  useOrderBasket,
+  useOrderType,
+  priorityOptions,
+  type OrderUrgency,
+} from '@openmrs/esm-patient-common-lib';
+import { useLayoutType, useSession, useConfig, ExtensionSlot, OpenmrsDatePicker } from '@openmrs/esm-framework';
 import {
   Button,
   ButtonSet,
@@ -17,15 +23,10 @@ import {
   TextArea,
   TextInput,
 } from '@carbon/react';
-import {
-  launchPatientWorkspace,
-  priorityOptions,
-  type DefaultPatientWorkspaceProps,
-  type OrderBasketItem,
-  useOrderBasket,
-  useOrderType,
-} from '@openmrs/esm-patient-common-lib';
-import { useLayoutType, useSession, ExtensionSlot, useConfig } from '@openmrs/esm-framework';
+import { useTranslation } from 'react-i18next';
+import { Controller, type ControllerRenderProps, type FieldErrors, useForm } from 'react-hook-form';
+import { zodResolver } from '@hookform/resolvers/zod';
+import { z } from 'zod';
 import { ordersEqual, prepOrderPostData } from '../resources';
 import styles from './general-order-form.scss';
 import { type ConfigObject } from '../../../config-schema';
@@ -57,20 +58,26 @@ export function OrderForm({
 
   const OrderFormSchema = useMemo(
     () =>
-      z.object({
-        instructions: z.string().nullish(),
-        urgency: z.string().refine((value) => value !== '', {
-          message: t('priorityRequired', 'Priority is required'),
+      z
+        .object({
+          instructions: z.string().nullish(),
+          urgency: z.string().refine((value) => value !== '', {
+            message: t('priorityRequired', 'Priority is required'),
+          }),
+          accessionNumber: z.string().nullish(),
+          concept: z.object(
+            { display: z.string(), uuid: z.string() },
+            {
+              required_error: t('orderableConceptRequired', 'Orderable concept is required'),
+              invalid_type_error: t('orderableConceptRequired', 'Orderable concept is required'),
+            },
+          ),
+          scheduledDate: z.date().nullish(),
+        })
+        .refine((data) => data.urgency !== 'ON_SCHEDULED_DATE' || data.scheduledDate, {
+          message: t('scheduledDateRequired', 'Scheduled date is required'),
+          path: ['scheduledDate'],
         }),
-        accessionNumber: z.string().nullish(),
-        concept: z.object(
-          { display: z.string(), uuid: z.string() },
-          {
-            required_error: t('orderableConceptRequired', 'Orderable concept is required'),
-            invalid_type_error: t('orderableConceptRequired', 'Orderable concept is required'),
-          },
-        ),
-      }),
     [t],
   );
 
@@ -78,6 +85,8 @@ export function OrderForm({
     control,
     handleSubmit,
     formState: { errors, defaultValues, isDirty },
+    setValue,
+    watch,
   } = useForm<OrderBasketItem>({
     mode: 'all',
     resolver: zodResolver(OrderFormSchema),
@@ -86,6 +95,8 @@ export function OrderForm({
     },
   });
 
+  const isScheduledDateRequired = watch('urgency') === 'ON_SCHEDULED_DATE';
+
   const filterItemsByName = useCallback((menu) => {
     return menu?.item?.value?.toLowerCase().includes(menu?.inputValue?.toLowerCase());
   }, []);
@@ -133,6 +144,16 @@ export function OrderForm({
     }
   };
 
+  const handleUpdateUrgency = (fieldOnChange: ControllerRenderProps['onChange']) => {
+    return (e: ChangeEvent<HTMLSelectElement>) => {
+      const value = e.target.value as OrderUrgency;
+      if (value !== 'ON_SCHEDULED_DATE') {
+        setValue('scheduledDate', null);
+      }
+      fieldOnChange(e);
+    };
+  };
+
   useEffect(() => {
     promptBeforeClosing(() => isDirty);
   }, [isDirty, promptBeforeClosing]);
@@ -189,6 +210,7 @@ export function OrderForm({
                     <Select
                       id="priorityInput"
                       {...field}
+                      onChange={handleUpdateUrgency(field.onChange)}
                       invalid={Boolean(fieldState?.error)}
                       invalidText={fieldState?.error?.message}
                       labelText={t('priority', 'Priority')}
@@ -202,6 +224,29 @@ export function OrderForm({
               </InputWrapper>
             </Column>
           </Grid>
+          {isScheduledDateRequired && (
+            <Grid className={styles.gridRow}>
+              <Column lg={8} md={8} sm={4}>
+                <InputWrapper>
+                  <Controller
+                    name="scheduledDate"
+                    control={control}
+                    render={({ field, fieldState }) => (
+                      <OpenmrsDatePicker
+                        labelText={t('scheduledDate', 'Scheduled date')}
+                        id="scheduledDate"
+                        {...field}
+                        invalid={Boolean(fieldState?.error?.message)}
+                        invalidText={fieldState?.error?.message}
+                        minDate={new Date()}
+                        size={responsiveSize}
+                      />
+                    )}
+                  />
+                </InputWrapper>
+              </Column>
+            </Grid>
+          )}
           <Grid className={styles.gridRow}>
             <Column lg={16} md={8} sm={4}>
               <InputWrapper>
diff --git a/packages/esm-patient-orders-app/src/order-basket/general-order-type/resources.ts b/packages/esm-patient-orders-app/src/order-basket/general-order-type/resources.ts
index dbddc90e4a..902312917b 100644
--- a/packages/esm-patient-orders-app/src/order-basket/general-order-type/resources.ts
+++ b/packages/esm-patient-orders-app/src/order-basket/general-order-type/resources.ts
@@ -1,4 +1,10 @@
-import { type FetchResponse, openmrsFetch, type OpenmrsResource, restBaseUrl } from '@openmrs/esm-framework';
+import {
+  type FetchResponse,
+  openmrsFetch,
+  type OpenmrsResource,
+  restBaseUrl,
+  toOmrsIsoString,
+} from '@openmrs/esm-framework';
 import {
   type OrderBasketItem,
   priorityOptions,
@@ -41,6 +47,7 @@ export function prepOrderPostData(
       // orderReason: order.orderReason,
       accessionNumber: order.accessionNumber,
       urgency: order.urgency,
+      scheduledDate: order.scheduledDate ? toOmrsIsoString(order.scheduledDate) : null,
     };
   } else if (order.action === 'REVISE') {
     return {
@@ -55,6 +62,7 @@ export function prepOrderPostData(
       previousOrder: order.previousOrder,
       accessionNumber: order.accessionNumber,
       urgency: order.urgency,
+      scheduledDate: order.scheduledDate ? toOmrsIsoString(order.scheduledDate) : null,
     };
   } else if (order.action === 'DISCONTINUE') {
     return {
@@ -68,6 +76,7 @@ export function prepOrderPostData(
       previousOrder: order.previousOrder,
       accessionNumber: order.accessionNumber,
       urgency: order.urgency,
+      scheduledDate: order.scheduledDate ? toOmrsIsoString(order.scheduledDate) : null,
     };
   } else {
     throw new Error(`Unknown order action: ${order.action}.`);
diff --git a/packages/esm-patient-orders-app/src/utils/index.ts b/packages/esm-patient-orders-app/src/utils/index.ts
index 30ba19d493..5747086920 100644
--- a/packages/esm-patient-orders-app/src/utils/index.ts
+++ b/packages/esm-patient-orders-app/src/utils/index.ts
@@ -87,6 +87,7 @@ export function buildLabOrder(order: Order, action?: OrderAction) {
     concept: order.concept,
     orderType: order.orderType.uuid,
     specimenSource: null,
+    scheduledDate: order.scheduledDate ? new Date(order.scheduledDate) : null,
   };
 }
 
@@ -106,5 +107,6 @@ export function buildGeneralOrder(order: Order, action?: OrderAction): OrderBask
     concept: order.concept,
     orderNumber: order.orderNumber,
     orderType: order.orderType.uuid,
+    scheduledDate: order.scheduledDate ? new Date(order.scheduledDate) : null,
   };
 }
diff --git a/packages/esm-patient-orders-app/translations/en.json b/packages/esm-patient-orders-app/translations/en.json
index b982b236ea..3c560217a6 100644
--- a/packages/esm-patient-orders-app/translations/en.json
+++ b/packages/esm-patient-orders-app/translations/en.json
@@ -93,6 +93,8 @@
   "saveLabResults": "Save lab results",
   "saveOrder": "Save order",
   "saving": "Saving",
+  "scheduledDate": "Scheduled date",
+  "scheduledDateRequired": "Scheduled date is required",
   "searchAgain": "search again",
   "searchFieldOrder": "Search for {{orderType}} order",
   "searchOrderables": "Search orderables",
diff --git a/packages/esm-patient-tests-app/src/test-orders/add-test-order/test-order-form.component.tsx b/packages/esm-patient-tests-app/src/test-orders/add-test-order/test-order-form.component.tsx
index a0938142b9..3c61e615ac 100644
--- a/packages/esm-patient-tests-app/src/test-orders/add-test-order/test-order-form.component.tsx
+++ b/packages/esm-patient-tests-app/src/test-orders/add-test-order/test-order-form.component.tsx
@@ -1,14 +1,14 @@
-import React, { useCallback, useEffect, useMemo, useState } from 'react';
+import React, { type ChangeEvent, useCallback, useEffect, useMemo, useState } from 'react';
 import classNames from 'classnames';
 import {
   type DefaultPatientWorkspaceProps,
   launchPatientWorkspace,
+  type OrderUrgency,
+  priorityOptions,
   useOrderBasket,
   useOrderType,
-  priorityOptions,
 } from '@openmrs/esm-patient-common-lib';
-import { ExtensionSlot, useConfig, useLayoutType, useSession } from '@openmrs/esm-framework';
-import { prepTestOrderPostData, useOrderReasons } from '../api';
+import { ExtensionSlot, OpenmrsDatePicker, useConfig, useLayoutType, useSession } from '@openmrs/esm-framework';
 import {
   Button,
   ButtonSet,
@@ -23,10 +23,11 @@ import {
   TextArea,
   TextInput,
 } from '@carbon/react';
+import { Controller, type ControllerRenderProps, type FieldErrors, useForm } from 'react-hook-form';
+import { zodResolver } from '@hookform/resolvers/zod';
 import { useTranslation } from 'react-i18next';
+import { prepTestOrderPostData, useOrderReasons } from '../api';
 import { ordersEqual } from './test-order';
-import { Controller, type FieldErrors, useForm } from 'react-hook-form';
-import { zodResolver } from '@hookform/resolvers/zod';
 import { z } from 'zod';
 import { type ConfigObject } from '../../config-schema';
 import { type TestOrderBasketItem } from '../../types';
@@ -63,27 +64,33 @@ export function LabOrderForm({
 
   const labOrderFormSchema = useMemo(
     () =>
-      z.object({
-        instructions: z.string().nullish(),
-        urgency: z.string().refine((value) => value !== '', {
-          message: t('priorityRequired', 'Priority is required'),
+      z
+        .object({
+          instructions: z.string().nullish(),
+          urgency: z.string().refine((value) => value !== '', {
+            message: t('priorityRequired', 'Priority is required'),
+          }),
+          accessionNumber: z.string().nullish(),
+          testType: z.object(
+            { label: z.string(), conceptUuid: z.string() },
+            {
+              required_error: t('testTypeRequired', 'Test type is required'),
+              invalid_type_error: t('testTypeRequired', 'Test type is required'),
+            },
+          ),
+          orderReason: orderReasonRequired
+            ? z
+                .string({
+                  required_error: t('orderReasonRequired', 'Order reason is required'),
+                })
+                .refine((value) => !!value, t('orderReasonRequired', 'Order reason is required'))
+            : z.string().optional(),
+          scheduledDate: z.date({}).nullish(),
+        })
+        .refine((data) => data.urgency !== 'ON_SCHEDULED_DATE' || Boolean(data.scheduledDate), {
+          message: t('scheduledDateRequired', 'Scheduled date is required'),
+          path: ['scheduledDate'],
         }),
-        accessionNumber: z.string().nullish(),
-        testType: z.object(
-          { label: z.string(), conceptUuid: z.string() },
-          {
-            required_error: t('testTypeRequired', 'Test type is required'),
-            invalid_type_error: t('testTypeRequired', 'Test type is required'),
-          },
-        ),
-        orderReason: orderReasonRequired
-          ? z
-              .string({
-                required_error: t('orderReasonRequired', 'Order reason is required'),
-              })
-              .refine((value) => !!value, t('orderReasonRequired', 'Order reason is required'))
-          : z.string().optional(),
-      }),
     [orderReasonRequired, t],
   );
 
@@ -91,6 +98,8 @@ export function LabOrderForm({
     control,
     handleSubmit,
     formState: { errors, defaultValues, isDirty },
+    setValue,
+    watch,
   } = useForm<TestOrderBasketItem>({
     mode: 'all',
     resolver: zodResolver(labOrderFormSchema),
@@ -100,6 +109,8 @@ export function LabOrderForm({
     },
   });
 
+  const isScheduledDateRequired = watch('urgency') === 'ON_SCHEDULED_DATE';
+
   const orderReasonUuids =
     (config.labTestsWithOrderReasons?.find((c) => c.labTestUuid === defaultValues?.testType?.conceptUuid) || {})
       .orderReasons || [];
@@ -153,6 +164,16 @@ export function LabOrderForm({
     }
   };
 
+  const handleUpdateUrgency = (fieldOnChange: ControllerRenderProps['onChange']) => {
+    return (e: ChangeEvent<HTMLSelectElement>) => {
+      const value = e.target.value as OrderUrgency;
+      if (value !== 'ON_SCHEDULED_DATE') {
+        setValue('scheduledDate', null);
+      }
+      fieldOnChange(e);
+    };
+  };
+
   useEffect(() => {
     promptBeforeClosing(() => isDirty);
   }, [isDirty, promptBeforeClosing]);
@@ -160,144 +181,166 @@ export function LabOrderForm({
   const responsiveSize = isTablet ? 'lg' : 'sm';
 
   return (
-    <>
-      <Form className={styles.orderForm} onSubmit={handleSubmit(handleFormSubmission, onError)} id="drugOrderForm">
-        <div className={styles.form}>
-          <ExtensionSlot name="top-of-lab-order-form-slot" state={{ order: initialOrder }} />
+    <Form className={styles.orderForm} onSubmit={handleSubmit(handleFormSubmission, onError)} id="drugOrderForm">
+      <div className={styles.form}>
+        <ExtensionSlot name="top-of-lab-order-form-slot" state={{ order: initialOrder }} />
+        <Grid className={styles.gridRow}>
+          <Column lg={16} md={8} sm={4}>
+            <InputWrapper>
+              <label className={styles.testTypeLabel}>{t('testType', 'Test type')}</label>
+              <p className={styles.testType}>{initialOrder?.testType?.label}</p>
+            </InputWrapper>
+          </Column>
+        </Grid>
+        {config.showReferenceNumberField ? (
           <Grid className={styles.gridRow}>
             <Column lg={16} md={8} sm={4}>
               <InputWrapper>
-                <label className={styles.testTypeLabel}>{t('testType', 'Test type')}</label>
-                <p className={styles.testType}>{initialOrder?.testType?.label}</p>
+                <Controller
+                  name="accessionNumber"
+                  control={control}
+                  render={({ field: { onChange, onBlur, value } }) => (
+                    <TextInput
+                      id="labReferenceNumberInput"
+                      invalid={!!errors.accessionNumber}
+                      invalidText={errors.accessionNumber?.message}
+                      labelText={t('referenceNumber', 'Reference number', {
+                        orderType: orderType?.display,
+                      })}
+                      maxLength={150}
+                      onBlur={onBlur}
+                      onChange={onChange}
+                      size={responsiveSize}
+                      value={value}
+                    />
+                  )}
+                />
               </InputWrapper>
             </Column>
           </Grid>
-          {config.showReferenceNumberField ? (
-            <Grid className={styles.gridRow}>
-              <Column lg={16} md={8} sm={4}>
-                <InputWrapper>
-                  <Controller
-                    name="accessionNumber"
-                    control={control}
-                    render={({ field: { onChange, onBlur, value } }) => (
-                      <TextInput
-                        id="labReferenceNumberInput"
-                        invalid={!!errors.accessionNumber}
-                        invalidText={errors.accessionNumber?.message}
-                        labelText={t('referenceNumber', 'Reference number', {
-                          orderType: orderType?.display,
-                        })}
-                        maxLength={150}
-                        onBlur={onBlur}
-                        onChange={onChange}
-                        size={responsiveSize}
-                        value={value}
-                      />
-                    )}
-                  />
-                </InputWrapper>
-              </Column>
-            </Grid>
-          ) : null}
+        ) : null}
+        <Grid className={styles.gridRow}>
+          <Column lg={8} md={8} sm={4}>
+            <InputWrapper>
+              <Controller
+                name="urgency"
+                control={control}
+                render={({ field, fieldState }) => (
+                  <Select
+                    id="priorityInput"
+                    {...field}
+                    onChange={handleUpdateUrgency(field.onChange)}
+                    invalid={Boolean(fieldState?.error?.message)}
+                    invalidText={fieldState?.error?.message}
+                    labelText={t('priority', 'Priority')}
+                  >
+                    {priorityOptions.map((option) => (
+                      <SelectItem key={option.value} value={option.value} text={option.label} />
+                    ))}
+                  </Select>
+                )}
+              />
+            </InputWrapper>
+          </Column>
+        </Grid>
+        {isScheduledDateRequired && (
           <Grid className={styles.gridRow}>
             <Column lg={8} md={8} sm={4}>
               <InputWrapper>
                 <Controller
-                  name="urgency"
+                  name="scheduledDate"
                   control={control}
                   render={({ field, fieldState }) => (
-                    <Select
-                      id="priorityInput"
+                    <OpenmrsDatePicker
+                      labelText={t('scheduledDate', 'Scheduled date')}
+                      id="scheduledDate"
                       {...field}
                       invalid={Boolean(fieldState?.error?.message)}
                       invalidText={fieldState?.error?.message}
-                      labelText={t('priority', 'Priority')}
-                    >
-                      {priorityOptions.map((option) => (
-                        <SelectItem key={option.value} value={option.value} text={option.label} />
-                      ))}
-                    </Select>
+                      minDate={new Date()}
+                      size={responsiveSize}
+                    />
                   )}
                 />
               </InputWrapper>
             </Column>
           </Grid>
-          {orderReasons.length > 0 && (
-            <Grid className={styles.gridRow}>
-              <Column lg={16} md={8} sm={4}>
-                <InputWrapper>
-                  <Controller
-                    name="orderReason"
-                    control={control}
-                    render={({ field: { onBlur, onChange } }) => (
-                      <ComboBox
-                        id="orderReasonInput"
-                        invalid={!!errors.orderReason}
-                        invalidText={errors.orderReason?.message}
-                        items={orderReasons}
-                        itemToString={(item) => item?.display}
-                        onBlur={onBlur}
-                        onChange={({ selectedItem }) => onChange(selectedItem?.uuid || '')}
-                        selectedItem={''}
-                        shouldFilterItem={filterItemsByName}
-                        size={responsiveSize}
-                        titleText={t('orderReason', 'Order reason')}
-                      />
-                    )}
-                  />
-                </InputWrapper>
-              </Column>
-            </Grid>
-          )}
+        )}
+        {orderReasons.length > 0 && (
           <Grid className={styles.gridRow}>
             <Column lg={16} md={8} sm={4}>
               <InputWrapper>
                 <Controller
-                  name="instructions"
+                  name="orderReason"
                   control={control}
-                  render={({ field: { onChange, onBlur, value } }) => (
-                    <TextArea
-                      enableCounter
-                      id="additionalInstructionsInput"
-                      invalid={!!errors.instructions}
-                      invalidText={errors.instructions?.message}
-                      labelText={t('additionalInstructions', 'Additional instructions')}
-                      maxCount={500}
+                  render={({ field: { onBlur, onChange } }) => (
+                    <ComboBox
+                      id="orderReasonInput"
+                      invalid={!!errors.orderReason}
+                      invalidText={errors.orderReason?.message}
+                      items={orderReasons}
+                      itemToString={(item) => item?.display}
                       onBlur={onBlur}
-                      onChange={onChange}
+                      onChange={({ selectedItem }) => onChange(selectedItem?.uuid || '')}
+                      selectedItem={''}
+                      shouldFilterItem={filterItemsByName}
                       size={responsiveSize}
-                      value={value}
+                      titleText={t('orderReason', 'Order reason')}
                     />
                   )}
                 />
               </InputWrapper>
             </Column>
           </Grid>
-        </div>
-        <div>
-          {showErrorNotification && (
-            <Column className={styles.errorContainer}>
-              <InlineNotification
-                lowContrast
-                onClose={() => setShowErrorNotification(false)}
-                subtitle={t('pleaseRequiredFields', 'Please fill all required fields') + '.'}
-                title={t('error', 'Error')}
+        )}
+        <Grid className={styles.gridRow}>
+          <Column lg={16} md={8} sm={4}>
+            <InputWrapper>
+              <Controller
+                name="instructions"
+                control={control}
+                render={({ field: { onChange, onBlur, value } }) => (
+                  <TextArea
+                    enableCounter
+                    id="additionalInstructionsInput"
+                    invalid={!!errors.instructions}
+                    invalidText={errors.instructions?.message}
+                    labelText={t('additionalInstructions', 'Additional instructions')}
+                    maxCount={500}
+                    onBlur={onBlur}
+                    onChange={onChange}
+                    size={responsiveSize}
+                    value={value}
+                  />
+                )}
               />
-            </Column>
-          )}
-          <ButtonSet
-            className={classNames(styles.buttonSet, isTablet ? styles.tabletButtonSet : styles.desktopButtonSet)}
-          >
-            <Button className={styles.button} kind="secondary" onClick={cancelOrder} size="xl">
-              {t('discard', 'Discard')}
-            </Button>
-            <Button className={styles.button} kind="primary" size="xl" type="submit">
-              {t('saveOrder', 'Save order')}
-            </Button>
-          </ButtonSet>
-        </div>
-      </Form>
-    </>
+            </InputWrapper>
+          </Column>
+        </Grid>
+      </div>
+      <div>
+        {showErrorNotification && (
+          <Column className={styles.errorContainer}>
+            <InlineNotification
+              lowContrast
+              onClose={() => setShowErrorNotification(false)}
+              subtitle={t('pleaseRequiredFields', 'Please fill all required fields') + '.'}
+              title={t('error', 'Error')}
+            />
+          </Column>
+        )}
+        <ButtonSet
+          className={classNames(styles.buttonSet, isTablet ? styles.tabletButtonSet : styles.desktopButtonSet)}
+        >
+          <Button className={styles.button} kind="secondary" onClick={cancelOrder} size="xl">
+            {t('discard', 'Discard')}
+          </Button>
+          <Button className={styles.button} kind="primary" size="xl" type="submit">
+            {t('saveOrder', 'Save order')}
+          </Button>
+        </ButtonSet>
+      </div>
+    </Form>
   );
 }
 
diff --git a/packages/esm-patient-tests-app/src/test-orders/api.ts b/packages/esm-patient-tests-app/src/test-orders/api.ts
index cb12b19424..eb63ce541a 100644
--- a/packages/esm-patient-tests-app/src/test-orders/api.ts
+++ b/packages/esm-patient-tests-app/src/test-orders/api.ts
@@ -4,7 +4,14 @@ import useSWR, { mutate } from 'swr';
 import useSWRImmutable from 'swr/immutable';
 import type { OrderPost, PatientOrderFetchResponse, TestOrderPost } from '@openmrs/esm-patient-common-lib';
 import type { TestOrderBasketItem } from '../types';
-import { type FetchResponse, openmrsFetch, restBaseUrl, showSnackbar, useConfig } from '@openmrs/esm-framework';
+import {
+  type FetchResponse,
+  openmrsFetch,
+  restBaseUrl,
+  showSnackbar,
+  toOmrsIsoString,
+  useConfig,
+} from '@openmrs/esm-framework';
 import { type ConfigObject } from '../config-schema';
 
 export const careSettingUuid = '6f0c9a92-6f24-11e3-af88-005056821db0';
@@ -95,6 +102,7 @@ export function prepTestOrderPostData(
       orderReason: order.orderReason,
       accessionNumber: order.accessionNumber,
       urgency: order.urgency,
+      scheduledDate: order.scheduledDate ? toOmrsIsoString(order.scheduledDate) : null,
     };
   } else if (order.action === 'REVISE') {
     return {
@@ -110,6 +118,7 @@ export function prepTestOrderPostData(
       previousOrder: order.previousOrder,
       accessionNumber: order.accessionNumber,
       urgency: order.urgency,
+      scheduledDate: order.scheduledDate ? toOmrsIsoString(order.scheduledDate) : null,
     };
   } else if (order.action === 'DISCONTINUE') {
     return {
@@ -124,6 +133,7 @@ export function prepTestOrderPostData(
       previousOrder: order.previousOrder,
       accessionNumber: order.accessionNumber,
       urgency: order.urgency,
+      scheduledDate: order.scheduledDate ? toOmrsIsoString(order.scheduledDate) : null,
     };
   } else {
     throw new Error(`Unknown order action: ${order.action}.`);
diff --git a/packages/esm-patient-tests-app/translations/en.json b/packages/esm-patient-tests-app/translations/en.json
index b94a2b3fb7..6f24444b7d 100644
--- a/packages/esm-patient-tests-app/translations/en.json
+++ b/packages/esm-patient-tests-app/translations/en.json
@@ -72,6 +72,8 @@
   "returnToOrderBasket": "Return to order basket",
   "returnToTimeline": "Return to timeline",
   "saveOrder": "Save order",
+  "scheduledDate": "Scheduled date",
+  "scheduledDateRequired": "Scheduled date is required",
   "search": "Search",
   "searchAgain": "search again",
   "searchByTestName": "Search by test name",