fix hcx route priority and type errors

ohcnetwork · Feb 18, 2024 · 441481c · 441481c
1 parent dacc7f8
commit 441481c
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/public/config.json b/public/config.json
@@ -22,6 +22,6 @@
     "sample_format_asset_import": "https://spreadsheets.google.com/feeds/download/spreadsheets/Export?key=11JaEhNHdyCHth4YQs_44YaRlP77Rrqe81VSEfg1glko&exportFormat=xlsx",
     "sample_format_external_result_import": "/External-Results-Template.csv",
     "enable_abdm": true,
-    "enable_hcx": false,
+    "enable_hcx": true,
     "min_encounter_date": "2020-01-01"
 }
diff --git a/src/Components/Diagnosis/ConsultationDiagnosisBuilder/AddICD11Diagnosis.tsx b/src/Components/Diagnosis/ConsultationDiagnosisBuilder/AddICD11Diagnosis.tsx
@@ -22,7 +22,7 @@ export default function AddICD11Diagnosis(props: AddICD11DiagnosisProps) {
   const { t } = useTranslation();
   const [selected, setSelected] = useState<ICD11DiagnosisModel>();
   const [adding, setAdding] = useState(false);
-  const hasError = !!props.disallowed.find((d) => d.id === selected?.id);
+  const hasError = !!props.disallowed.find((d) => d?.id === selected?.id);
 
   const { fetchOptions, isLoading, options } =
     useAsyncOptions<ICD11DiagnosisModel>("id");
@@ -33,7 +33,7 @@ export default function AddICD11Diagnosis(props: AddICD11DiagnosisProps) {
     setAdding(true);
     const added = await props.onAdd({
       diagnosis_object: selected,
-      diagnosis: selected.id,
+      diagnosis: selected?.id,
       verification_status: status,
       is_principal: false,
     });

diff --git a/src/Routers/AppRouter.tsx b/src/Routers/AppRouter.tsx
@@ -55,7 +55,7 @@ export default function AppRouter() {
   let routes = Routes;
 
   if (enable_hcx) {
-    routes = { ...routes, ...HCXRoutes };
+    routes = { ...HCXRoutes, ...routes };
   }
 
   if (