Feat/add numeric value ranges

src/patient-chart/laboratory-order.component.tsx

@@ -260,7 +260,7 @@ const LaboratoryOrder: React.FC<LaboratoryOrderOverviewProps> = ({
         ),
       },
       location: {
-        content: <span>{entry.location.display}</span>,
+        content: <span>{entry?.location?.display}</span>,
       },
       status: {
         content: <span>--</span>,

src/patient-chart/results-summary/print-results-summary.component.tsx

@@ -61,7 +61,7 @@ const PrintResultsSummary: React.FC<PrintResultsSummaryProps> = ({
               <span
                 style={{ fontSize: "10px", fontWeight: "bold", margin: "5px" }}
               >
-                {encounterResponse.visit.location.display}
+                {encounterResponse?.visit?.location?.display}
               </span>
             </div>
             <div

src/results/result-form-field.component.tsx

@@ -4,6 +4,7 @@ import { TextInput, Select, SelectItem } from "@carbon/react";
 import { useTranslation } from "react-i18next";
 import { ConceptReference } from "./result-form.resource";
 import { Controller } from "react-hook-form";
+import { min } from "rxjs/operators";
 
 interface ResultFormFieldProps {
   concept: ConceptReference;
@@ -23,6 +24,25 @@ const ResultFormField: React.FC<ResultFormFieldProps> = ({
   const isCoded = (concept) => concept.datatype?.display === "Coded";
   const isPanel = (concept) => concept.setMembers?.length > 0;
 
+  const printValueRange = (concept: ConceptReference) => {
+    if (concept?.datatype?.display === "Numeric") {
+      const maxVal = Math.max(
+        concept?.hiAbsolute,
+        concept?.hiCritical,
+        concept?.hiNormal
+      );
+      const minVal = Math.min(
+        concept?.lowAbsolute,
+        concept?.lowCritical,
+        concept?.lowNormal
+      );
+      return ` (${minVal ?? 0} - ${maxVal > 0 ? maxVal : "--"} ${
+        concept?.units ?? ""
+      })`;
+    }
+    return "";
+  };
+
   return (
     <>
       {Object.keys(errors).length > 0 && (
@@ -41,7 +61,12 @@ const ResultFormField: React.FC<ResultFormFieldProps> = ({
               className={styles.textInput}
               {...field}
               type={concept.datatype.display === "Numeric" ? "number" : "text"}
-              labelText={concept?.display}
+              labelText={
+                concept?.display +
+                (concept.datatype.display === "Numeric"
+                  ? printValueRange(concept) ?? ""
+                  : "")
+              }
               autoFocus
             />
           )}
@@ -98,7 +123,12 @@ const ResultFormField: React.FC<ResultFormFieldProps> = ({
                     type={
                       member.datatype.display === "Numeric" ? "number" : "text"
                     }
-                    labelText={member?.display}
+                    labelText={
+                      member?.display +
+                      (member.datatype.display === "Numeric"
+                        ? printValueRange(member) ?? ""
+                        : "")
+                    }
                     autoFocus={index === 0}
                   />
                 )}

src/results/result-form.resource.ts

@@ -19,6 +19,13 @@ export interface ConceptResponse {
   attributes: any[];
   links: Link18[];
   resourceVersion: string;
+  hiNormal?: number;
+  hiAbsolute?: number;
+  hiCritical?: number;
+  lowNormal?: number;
+  lowAbsolute?: number;
+  lowCritical?: number;
+  units?: string;
 }
 
 export interface Name {
@@ -159,6 +166,13 @@ export interface ConceptReference {
   attributes: any[];
   links: Link15[];
   resourceVersion: string;
+  hiNormal?: number;
+  hiAbsolute?: number;
+  hiCritical?: number;
+  lowNormal?: number;
+  lowAbsolute?: number;
+  lowCritical?: number;
+  units?: string;
 }
 
 export interface Name3 {
@@ -300,7 +314,8 @@ export async function GetOrderConceptByUuid(uuid: string) {
 }
 
 export function useGetOrderConceptByUuid(uuid: string) {
-  const apiUrl = `/ws/rest/v1/concept/${uuid}?v=full`;
+  const apiUrl = `/ws/rest/v1/concept/${uuid}?v=custom:(uuid,display,name,datatype,set,answers,hiNormal,hiAbsolute,hiCritical,lowNormal,lowAbsolute,lowCritical,units,setMembers:(uuid,display,answers,datatype,hiNormal,hiAbsolute,hiCritical,lowNormal,lowAbsolute,lowCritical,units))`;
+
   const { data, error, isLoading, isValidating, mutate } = useSWR<
     { data: ConceptResponse },
     Error
@@ -314,7 +329,6 @@ export function useGetOrderConceptByUuid(uuid: string) {
   };
 }
 
-// create observation
 export async function UpdateEncounter(uuid: string, payload: any) {
   const abortController = new AbortController();
   return openmrsFetch(`/ws/rest/v1/encounter/${uuid}`, {

src/work-list/work-list.component.tsx

@@ -39,6 +39,7 @@
 import { Result, useGetOrdersWorklist } from "./work-list.resource";
 import styles from "./work-list.scss";
 import {
+  ConfigurableLink,
   formatDate,
   parseDate,
   showModal,
@@ -116,7 +117,7 @@
     { id: 10, header: t("actions", "Actions"), key: "actions" },
   ];
 
   const ResultsOrder: React.FC<ResultsOrderProps> = ({
     order,
     patientUuid,
   }) => {
@@ -149,9 +150,11 @@
         },
         patient: {
           content: (
-            <>
-              <span>{entry.patient.display.split("-")[1]}</span>
-            </>
+            <ConfigurableLink
+              to={`\${openmrsSpaBase}/patient/${entry.patient.uuid}/chart/laboratory-orders`}
+            >
+              {entry.patient.display.split("-")[1]}
+            </ConfigurableLink>
           ),
         },
         orderNumber: { content: <span>{entry.orderNumber}</span> },