From 51a4f209a8c6a8e48fbdafd67c60c5a1efadb479 Mon Sep 17 00:00:00 2001
From: munania <munaniadeno@gmail.com>
Date: Fri, 13 Dec 2024 03:35:34 -0600
Subject: [PATCH 1/4] adding OrderReason to Imaging order

---
 .../imaging-order-form.component.tsx          | 27 +++++++++++++++++++
 .../src/form/imaging-orders/api.ts            |  3 +++
 .../src/hooks/useOrdersWorklist.ts            |  2 +-
 .../esm-imaging-orders-app/src/types/index.ts |  1 +
 4 files changed, 32 insertions(+), 1 deletion(-)

diff --git a/packages/esm-imaging-orders-app/src/form/imaging-orders/add-imaging-orders/imaging-order-form.component.tsx b/packages/esm-imaging-orders-app/src/form/imaging-orders/add-imaging-orders/imaging-order-form.component.tsx
index acb0928..72df1c8 100644
--- a/packages/esm-imaging-orders-app/src/form/imaging-orders/add-imaging-orders/imaging-order-form.component.tsx
+++ b/packages/esm-imaging-orders-app/src/form/imaging-orders/add-imaging-orders/imaging-order-form.component.tsx
@@ -74,6 +74,9 @@ export function ImagingOrderForm({
     commentsToFulfiller: z.string().optional(),
     laterality: z.string().optional(),
     bodySite: z.string().optional(),
+    orderReasonNonCoded: z.string().min(1, {
+      message: translateFrom(moduleName, 'addOrderReasonRequired', 'Order reason is required'),
+    }),
   });
 
   const {
@@ -317,6 +320,30 @@ export function ImagingOrderForm({
               </InputWrapper>
             </Column>
           </Grid>
+          <Grid className={styles.gridRow}>
+            <Column lg={16} md={8} sm={4}>
+              <InputWrapper>
+                <Controller
+                  name="orderReasonNonCoded"
+                  control={control}
+                  render={({ field: { onChange, onBlur, value } }) => (
+                    <TextArea
+                      enableCounter
+                      id="orderReasonNonCodedInput"
+                      size="lg"
+                      labelText={'Order Reason'}
+                      value={value}
+                      onChange={onChange}
+                      onBlur={onBlur}
+                      maxCount={500}
+                      invalid={errors.orderReasonNonCoded?.message}
+                      invalidText={errors.orderReasonNonCoded?.message}
+                    />
+                  )}
+                />
+              </InputWrapper>
+            </Column>
+          </Grid>
         </div>
         <div>
           {showErrorNotification && (
diff --git a/packages/esm-imaging-orders-app/src/form/imaging-orders/api.ts b/packages/esm-imaging-orders-app/src/form/imaging-orders/api.ts
index c66f5ad..3d4814c 100644
--- a/packages/esm-imaging-orders-app/src/form/imaging-orders/api.ts
+++ b/packages/esm-imaging-orders-app/src/form/imaging-orders/api.ts
@@ -58,6 +58,7 @@ export function prepImagingOrderPostData(
       concept: order.testType.conceptUuid,
       instructions: order.instructions,
       orderReason: order.orderReason,
+      orderReasonNonCoded: order.orderReasonNonCoded,
       commentToFulfiller: order.commentsToFulfiller,
       laterality: order.laterality,
       bodySite: order.bodySite,
@@ -78,6 +79,7 @@ export function prepImagingOrderPostData(
       concept: order.testType.conceptUuid,
       instructions: order.instructions,
       orderReason: order.orderReason,
+      orderReasonNonCoded: order.orderReasonNonCoded,
       commentToFulfiller: order.commentsToFulfiller,
       laterality: order.laterality,
       bodySite: order.bodySite,
@@ -96,6 +98,7 @@ export function prepImagingOrderPostData(
       encounter: encounterUuid,
       concept: order.testType.conceptUuid,
       orderReason: order.orderReason,
+      orderReasonNonCoded: order.orderReasonNonCoded,
       commentToFulfiller: order.commentsToFulfiller,
       laterality: order.laterality,
       bodySite: order.bodySite,
diff --git a/packages/esm-imaging-orders-app/src/hooks/useOrdersWorklist.ts b/packages/esm-imaging-orders-app/src/hooks/useOrdersWorklist.ts
index c8b990c..83518b5 100644
--- a/packages/esm-imaging-orders-app/src/hooks/useOrdersWorklist.ts
+++ b/packages/esm-imaging-orders-app/src/hooks/useOrdersWorklist.ts
@@ -14,7 +14,7 @@ const createApiUrl = (
   fulfillerStatus: string,
 ) => {
   const responseFormat =
-    'custom:(uuid,orderNumber,patient:ref,concept:(uuid,display,conceptClass),action,careSetting,orderer:ref,urgency,instructions,bodySite,laterality,commentToFulfiller,procedures,display,fulfillerStatus,dateStopped,scheduledDate,dateActivated,fulfillerComment)';
+    'custom:(uuid,orderNumber,patient:ref,concept:(uuid,display,conceptClass),action,careSetting,orderer:ref,urgency,instructions,orderReasonNonCoded,bodySite,laterality,commentToFulfiller,procedures,display,fulfillerStatus,dateStopped,scheduledDate,dateActivated,fulfillerComment)';
   const orderTypeParam = `orderTypes=${OrderTypeUuid}&activatedOnOrAfterDate=${activatedOnOrAfterDate}&activatedOnOrBeforeDate=${activatedOnOrBeforeDate}&isStopped=false&fulfillerStatus=${fulfillerStatus}&v=${responseFormat}`;
 
   return `${restBaseUrl}/order?${orderTypeParam}`;
diff --git a/packages/esm-imaging-orders-app/src/types/index.ts b/packages/esm-imaging-orders-app/src/types/index.ts
index 24ec2f5..c5a5334 100644
--- a/packages/esm-imaging-orders-app/src/types/index.ts
+++ b/packages/esm-imaging-orders-app/src/types/index.ts
@@ -30,6 +30,7 @@ export interface ImagingOrderBasketItem extends OrderBasketItem {
   urgency?: string;
   instructions?: string;
   orderReason?: string;
+  orderReasonNonCoded?: string;
   scheduleDate?: Date | string;
   commentsToFulfiller?: string;
   laterality?: string;

From 260204aa76dd7c6be489fe81900aa4609de4e93e Mon Sep 17 00:00:00 2001
From: munania <munaniadeno@gmail.com>
Date: Fri, 13 Dec 2024 03:38:29 -0600
Subject: [PATCH 2/4] added OrderReason to Imaging orders

---
 packages/esm-imaging-orders-app/translations/en.json   | 2 +-
 packages/esm-procedure-orders-app/translations/en.json | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/esm-imaging-orders-app/translations/en.json b/packages/esm-imaging-orders-app/translations/en.json
index 6838cd0..9c508c4 100644
--- a/packages/esm-imaging-orders-app/translations/en.json
+++ b/packages/esm-imaging-orders-app/translations/en.json
@@ -55,7 +55,7 @@
   "saveAndClose": "Save & close",
   "saveOrder": "Save order",
   "scheduleDate": "Scheduled date",
-  "searchbypatientname": "Search by patient name",
+  "searchByPatientName": "Search by patient name",
   "status": "Status",
   "submitting": "Submitting...",
   "successfullyRejected": "You have successfully rejected an Order with OrderNumber {{orderNumber}} ",
diff --git a/packages/esm-procedure-orders-app/translations/en.json b/packages/esm-procedure-orders-app/translations/en.json
index b0ee802..83fd2cd 100644
--- a/packages/esm-procedure-orders-app/translations/en.json
+++ b/packages/esm-procedure-orders-app/translations/en.json
@@ -93,7 +93,7 @@
   "saveOrder": "Save order",
   "saveReport": "Report updated sucessful",
   "scheduleDate": "Scheduled date",
-  "searchbypatientname": "Search by patient name",
+  "searchByPatientName": "Search by patient name",
   "searchThisList": "Search this list",
   "selectOutcome": "Select outcome",
   "sendEmail": "Send Email",

From 7c0a4621763e7b96b8e4856bf2b70522da51a109 Mon Sep 17 00:00:00 2001
From: munania <munaniadeno@gmail.com>
Date: Fri, 13 Dec 2024 05:06:33 -0600
Subject: [PATCH 3/4] Adding Order Reason to Procedure Orders

---
 .../procedures-order-form.component.tsx       | 27 +++++++++++++++++++
 .../src/form/procedures-orders/api.ts         |  3 +++
 .../src/types/index.ts                        |  1 +
 3 files changed, 31 insertions(+)

diff --git a/packages/esm-procedure-orders-app/src/form/procedures-orders/add-procedures-order/procedures-order-form.component.tsx b/packages/esm-procedure-orders-app/src/form/procedures-orders/add-procedures-order/procedures-order-form.component.tsx
index 1a956b4..4eed843 100644
--- a/packages/esm-procedure-orders-app/src/form/procedures-orders/add-procedures-order/procedures-order-form.component.tsx
+++ b/packages/esm-procedure-orders-app/src/form/procedures-orders/add-procedures-order/procedures-order-form.component.tsx
@@ -104,6 +104,9 @@ export function ProceduresOrderForm({
     previousOrder: z.string().optional(),
     frequency: z.string().optional(),
     bodySite: z.string().optional(),
+    orderReasonNonCoded: z.string().min(1, {
+      message: translateFrom(moduleName, 'addOrderReasonRequired', 'Order reason is required'),
+    }),
   });
 
   const orderFrequencies: Array<OrderFrequency> = useMemo(
@@ -412,6 +415,30 @@ export function ProceduresOrderForm({
               </InputWrapper>
             </Column>
           </Grid>
+          <Grid className={styles.gridRow}>
+            <Column lg={16} md={8} sm={4}>
+              <InputWrapper>
+                <Controller
+                  name="orderReasonNonCoded"
+                  control={control}
+                  render={({ field: { onChange, onBlur, value } }) => (
+                    <TextArea
+                      enableCounter
+                      id="orderReasonNonCodedInput"
+                      size="lg"
+                      labelText={'Order Reason'}
+                      value={value}
+                      onChange={onChange}
+                      onBlur={onBlur}
+                      maxCount={500}
+                      invalid={errors.orderReasonNonCoded?.message}
+                      invalidText={errors.orderReasonNonCoded?.message}
+                    />
+                  )}
+                />
+              </InputWrapper>
+            </Column>
+          </Grid>
         </div>
         <div>
           {showErrorNotification && (
diff --git a/packages/esm-procedure-orders-app/src/form/procedures-orders/api.ts b/packages/esm-procedure-orders-app/src/form/procedures-orders/api.ts
index fdfe2da..a8113d2 100644
--- a/packages/esm-procedure-orders-app/src/form/procedures-orders/api.ts
+++ b/packages/esm-procedure-orders-app/src/form/procedures-orders/api.ts
@@ -99,6 +99,7 @@ export function prepProceduresOrderPostData(
       commentToFulfiller: order.commentsToFulfiller,
       instructions: order.instructions,
       orderReason: order.orderReason,
+      orderReasonNonCoded: order.orderReasonNonCoded,
       bodySite: order.bodySite,
     };
     if (order.urgency === 'ON_SCHEDULED_DATE') {
@@ -122,6 +123,7 @@ export function prepProceduresOrderPostData(
       commentToFulfiller: order.commentsToFulfiller,
       instructions: order.instructions,
       orderReason: order.orderReason,
+      orderReasonNonCoded: order.orderReasonNonCoded,
       previousOrder: order.previousOrder,
     };
     if (order.urgency === 'ON_SCHEDULED_DATE') {
@@ -144,6 +146,7 @@ export function prepProceduresOrderPostData(
       numberOfRepeats: order.numberOfRepeats,
       commentToFulfiller: order.commentsToFulfiller,
       orderReason: order.orderReason,
+      orderReasonNonCoded: order.orderReasonNonCoded,
       previousOrder: order.previousOrder,
     };
     if (order.urgency === 'ON_SCHEDULED_DATE') {
diff --git a/packages/esm-procedure-orders-app/src/types/index.ts b/packages/esm-procedure-orders-app/src/types/index.ts
index f52af1e..79817e1 100644
--- a/packages/esm-procedure-orders-app/src/types/index.ts
+++ b/packages/esm-procedure-orders-app/src/types/index.ts
@@ -424,6 +424,7 @@ export interface ProcedureOrderBasketItem extends OrderBasketItem {
   instructions?: string;
   previousOrder?: string;
   orderReason?: string;
+  orderReasonNonCoded?: string;
   scheduledDate?: string | Date;
   commentsToFulfiller?: string;
   laterality?: string;

From 41bf9420359fa78a11a6c111b0f8aef1a7435431 Mon Sep 17 00:00:00 2001
From: munania <munaniadeno@gmail.com>
Date: Tue, 17 Dec 2024 00:25:38 -0600
Subject: [PATCH 4/4] order reason above instructions

---
 .../imaging-order-form.component.tsx          | 30 +++++++++----------
 .../procedures-order-form.component.tsx       | 30 +++++++++----------
 2 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/packages/esm-imaging-orders-app/src/form/imaging-orders/add-imaging-orders/imaging-order-form.component.tsx b/packages/esm-imaging-orders-app/src/form/imaging-orders/add-imaging-orders/imaging-order-form.component.tsx
index 72df1c8..cf42a35 100644
--- a/packages/esm-imaging-orders-app/src/form/imaging-orders/add-imaging-orders/imaging-order-form.component.tsx
+++ b/packages/esm-imaging-orders-app/src/form/imaging-orders/add-imaging-orders/imaging-order-form.component.tsx
@@ -276,20 +276,20 @@ export function ImagingOrderForm({
             <Column lg={16} md={8} sm={4}>
               <InputWrapper>
                 <Controller
-                  name="instructions"
+                  name="orderReasonNonCoded"
                   control={control}
                   render={({ field: { onChange, onBlur, value } }) => (
                     <TextArea
                       enableCounter
-                      id="additionalInstructionsInput"
+                      id="orderReasonNonCodedInput"
                       size="lg"
-                      labelText={t('additionalInstructions', 'Additional instructions')}
+                      labelText={'Order Reason'}
                       value={value}
                       onChange={onChange}
                       onBlur={onBlur}
                       maxCount={500}
-                      invalid={errors.instructions?.message}
-                      invalidText={errors.instructions?.message}
+                      invalid={errors.orderReasonNonCoded?.message}
+                      invalidText={errors.orderReasonNonCoded?.message}
                     />
                   )}
                 />
@@ -300,20 +300,20 @@ export function ImagingOrderForm({
             <Column lg={16} md={8} sm={4}>
               <InputWrapper>
                 <Controller
-                  name="commentsToFulfiller"
+                  name="instructions"
                   control={control}
                   render={({ field: { onChange, onBlur, value } }) => (
                     <TextArea
                       enableCounter
-                      id="commentsToFulfillerInput"
+                      id="additionalInstructionsInput"
                       size="lg"
-                      labelText={t('commentsToFulfiller', 'Comments To Fulfiller')}
+                      labelText={t('additionalInstructions', 'Additional instructions')}
                       value={value}
                       onChange={onChange}
                       onBlur={onBlur}
                       maxCount={500}
-                      invalid={errors.commentsToFulfiller?.message}
-                      invalidText={errors.commentsToFulfiller?.message}
+                      invalid={errors.instructions?.message}
+                      invalidText={errors.instructions?.message}
                     />
                   )}
                 />
@@ -324,20 +324,20 @@ export function ImagingOrderForm({
             <Column lg={16} md={8} sm={4}>
               <InputWrapper>
                 <Controller
-                  name="orderReasonNonCoded"
+                  name="commentsToFulfiller"
                   control={control}
                   render={({ field: { onChange, onBlur, value } }) => (
                     <TextArea
                       enableCounter
-                      id="orderReasonNonCodedInput"
+                      id="commentsToFulfillerInput"
                       size="lg"
-                      labelText={'Order Reason'}
+                      labelText={t('commentsToFulfiller', 'Comments To Fulfiller')}
                       value={value}
                       onChange={onChange}
                       onBlur={onBlur}
                       maxCount={500}
-                      invalid={errors.orderReasonNonCoded?.message}
-                      invalidText={errors.orderReasonNonCoded?.message}
+                      invalid={errors.commentsToFulfiller?.message}
+                      invalidText={errors.commentsToFulfiller?.message}
                     />
                   )}
                 />
diff --git a/packages/esm-procedure-orders-app/src/form/procedures-orders/add-procedures-order/procedures-order-form.component.tsx b/packages/esm-procedure-orders-app/src/form/procedures-orders/add-procedures-order/procedures-order-form.component.tsx
index 4eed843..f3c0db4 100644
--- a/packages/esm-procedure-orders-app/src/form/procedures-orders/add-procedures-order/procedures-order-form.component.tsx
+++ b/packages/esm-procedure-orders-app/src/form/procedures-orders/add-procedures-order/procedures-order-form.component.tsx
@@ -371,20 +371,20 @@ export function ProceduresOrderForm({
             <Column lg={16} md={8} sm={4}>
               <InputWrapper>
                 <Controller
-                  name="instructions"
+                  name="orderReasonNonCoded"
                   control={control}
                   render={({ field: { onChange, onBlur, value } }) => (
                     <TextArea
                       enableCounter
-                      id="additionalInstructionsInput"
+                      id="orderReasonNonCodedInput"
                       size="lg"
-                      labelText={t('additionalInstructions', 'Additional instructions')}
+                      labelText={'Order Reason'}
                       value={value}
                       onChange={onChange}
                       onBlur={onBlur}
                       maxCount={500}
-                      invalid={errors.instructions?.message}
-                      invalidText={errors.instructions?.message}
+                      invalid={errors.orderReasonNonCoded?.message}
+                      invalidText={errors.orderReasonNonCoded?.message}
                     />
                   )}
                 />
@@ -395,20 +395,20 @@ export function ProceduresOrderForm({
             <Column lg={16} md={8} sm={4}>
               <InputWrapper>
                 <Controller
-                  name="commentsToFulfiller"
+                  name="instructions"
                   control={control}
                   render={({ field: { onChange, onBlur, value } }) => (
                     <TextArea
                       enableCounter
-                      id="commentsToFulfillerInput"
+                      id="additionalInstructionsInput"
                       size="lg"
-                      labelText={t('commentsToFulfiller', 'Comments To Fulfiller')}
+                      labelText={t('additionalInstructions', 'Additional instructions')}
                       value={value}
                       onChange={onChange}
                       onBlur={onBlur}
                       maxCount={500}
-                      invalid={errors.commentsToFulfiller?.message}
-                      invalidText={errors.commentsToFulfiller?.message}
+                      invalid={errors.instructions?.message}
+                      invalidText={errors.instructions?.message}
                     />
                   )}
                 />
@@ -419,20 +419,20 @@ export function ProceduresOrderForm({
             <Column lg={16} md={8} sm={4}>
               <InputWrapper>
                 <Controller
-                  name="orderReasonNonCoded"
+                  name="commentsToFulfiller"
                   control={control}
                   render={({ field: { onChange, onBlur, value } }) => (
                     <TextArea
                       enableCounter
-                      id="orderReasonNonCodedInput"
+                      id="commentsToFulfillerInput"
                       size="lg"
-                      labelText={'Order Reason'}
+                      labelText={t('commentsToFulfiller', 'Comments To Fulfiller')}
                       value={value}
                       onChange={onChange}
                       onBlur={onBlur}
                       maxCount={500}
-                      invalid={errors.orderReasonNonCoded?.message}
-                      invalidText={errors.orderReasonNonCoded?.message}
+                      invalid={errors.commentsToFulfiller?.message}
+                      invalidText={errors.commentsToFulfiller?.message}
                     />
                   )}
                 />