diff --git a/src/completed-list/completed-list.component.tsx b/src/completed-list/completed-list.component.tsx index 086c2fa..338474e 100644 --- a/src/completed-list/completed-list.component.tsx +++ b/src/completed-list/completed-list.component.tsx @@ -42,10 +42,10 @@ export const CompletedList: React.FC = ({ // eslint-disable-next-line prefer-const let { workListEntries, isLoading } = useOrdersWorklist("", fulfillerStatus); - // console.log("workListEntries ", workListEntries); - workListEntries = workListEntries.filter( - (order) => order?.procedures[0]?.status == "COMPLETED" - ); + // temporarily remove procedures references + // workListEntries = workListEntries.filter( + // (order) => order?.procedures[0]?.status == "COMPLETED" + // ); const [activatedOnOrAfterDate, setActivatedOnOrAfterDate] = useState(""); const pageSizes = [10, 20, 30, 40, 50]; const [currentPageSize, setPageSize] = useState(10); diff --git a/src/hooks/useOrdersWorklist.ts b/src/hooks/useOrdersWorklist.ts index 8a05455..b4f8eb1 100644 --- a/src/hooks/useOrdersWorklist.ts +++ b/src/hooks/useOrdersWorklist.ts @@ -9,7 +9,7 @@ export function useOrdersWorklist( const config = useConfig() as ConfigObject; const responseFormat = - "custom:(uuid,orderNumber,patient:ref,concept:(uuid,display,conceptClass:(uuid)),action,careSetting,orderer:ref,urgency,instructions,commentToFulfiller,display,fulfillerStatus,dateStopped,scheduledDate,dateActivated,procedures)"; + "custom:(uuid,orderNumber,patient:ref,concept:(uuid,display,conceptClass:(uuid)),action,careSetting,orderer:ref,urgency,instructions,commentToFulfiller,display,fulfillerStatus,dateStopped,scheduledDate,dateActivated)"; const orderTypeParam = `orderTypes=${config.procedureOrderTypeUuid}&activatedOnOrAfterDate=${activatedOnOrAfterDate}&isStopped=false&fulfillerStatus=${fulfillerStatus}&v=${responseFormat}`; const apiUrl = `/ws/rest/v1/order?${orderTypeParam}`; diff --git a/src/work-list/work-list.component.tsx b/src/work-list/work-list.component.tsx index 2a4b8c0..bde2d8f 100644 --- a/src/work-list/work-list.component.tsx +++ b/src/work-list/work-list.component.tsx @@ -63,9 +63,9 @@ const WorkList: React.FC = ({ fulfillerStatus }) => { // eslint-disable-next-line prefer-const let { workListEntries, isLoading } = useOrdersWorklist("", fulfillerStatus); - workListEntries = workListEntries.filter( - (order) => order?.procedures?.length == 0 - ); + // workListEntries = workListEntries.filter( + // (order) => order?.procedures?.length == 0 + // ); const [activatedOnOrAfterDate, setActivatedOnOrAfterDate] = useState(""); const pageSizes = [10, 20, 30, 40, 50]; const [currentPageSize, setPageSize] = useState(10);