correc mapping valueset + mapping encounter status

aphp · Dec 20, 2024 · ab562bc · ab562bc
1 parent 64d52c2
commit ab562bc
Show file tree

Hide file tree

Showing 8 changed files with 36 additions and 19 deletions.
diff --git a/src/components/CreationCohort/DataList_Criteria.tsx b/src/components/CreationCohort/DataList_Criteria.tsx
@@ -2,7 +2,7 @@ import { Back_API_Response, CriteriaItemType } from 'types'
 
 import RequestForm from './DiagramView/components/LogicalOperator/components/CriteriaRightPanel/RequestForm/RequestForm'
 import IPPForm from './DiagramView/components/LogicalOperator/components/CriteriaRightPanel/IPPForm/IPPForm'
-import DocumentsForm from './DiagramView/components/LogicalOperator/components/CriteriaRightPanel/DocumentsForm/DocumentsForm'
+import DocumentsForm from './DiagramView/components/LogicalOperator/components/CriteriaRightPanel/DocumentsForm'
 import EncounterForm from './DiagramView/components/LogicalOperator/components/CriteriaRightPanel/EncounterForm'
 import CCAMForm from './DiagramView/components/LogicalOperator/components/CriteriaRightPanel/CcamForm'
 import Cim10Form from './DiagramView/components/LogicalOperator/components/CriteriaRightPanel/Cim10Form'

diff --git a/...iagramView/components/LogicalOperator/components/CriteriaRightPanel/BiologyForm/index.tsx b/...iagramView/components/LogicalOperator/components/CriteriaRightPanel/BiologyForm/index.tsx
@@ -14,7 +14,7 @@ import {
   Button
 } from '@mui/material'
 import useStyles from '../formStyles'
-import { Comparators, ObservationDataType, CriteriaType } from 'types/requestCriterias'
+import { Comparators, ObservationDataType, CriteriaType, CriteriaDataKey } from 'types/requestCriterias'
 import { CriteriaDrawerComponentProps } from 'types'
 import { getConfig } from 'config'
 import KeyboardBackspaceIcon from '@mui/icons-material/KeyboardBackspace'
@@ -27,6 +27,7 @@ import AdvancedInputs from '../AdvancedInputs'
 import { SourceType } from 'types/scope'
 import { getValueSetsFromSystems } from 'utils/valueSets'
 import { HIERARCHY_ROOT } from 'services/aphp/serviceValueSets'
+import { mappingCriteria } from '../DemographicForm'
 
 enum Error {
   NO_ERROR,
@@ -127,7 +128,9 @@ const BiologyForm = (props: CriteriaDrawerComponentProps) => {
         )
       )
       .filter((e) => e)
-    setCurrentCriteria({ ...currentCriteria, code: foundCodes })
+    const encounterStatus =
+      mappingCriteria(currentCriteria?.encounterStatus, CriteriaDataKey.ENCOUNTER_STATUS, criteriaData) || []
+    setCurrentCriteria({ ...currentCriteria, code: foundCodes, encounterStatus })
   }, [])
 
   return (

diff --git a/...t/DiagramView/components/LogicalOperator/components/CriteriaRightPanel/CcamForm/index.tsx b/...t/DiagramView/components/LogicalOperator/components/CriteriaRightPanel/CcamForm/index.tsx
@@ -19,14 +19,15 @@ import useStyles from '../formStyles'
 import KeyboardBackspaceIcon from '@mui/icons-material/KeyboardBackspace'
 
 import { CriteriaDrawerComponentProps } from 'types'
-import { CcamDataType, Comparators, CriteriaType } from 'types/requestCriterias'
+import { CcamDataType, Comparators, CriteriaDataKey, CriteriaType } from 'types/requestCriterias'
 import { BlockWrapper } from 'components/ui/Layout'
 import OccurenceInput from 'components/ui/Inputs/Occurences'
 import AdvancedInputs from '../AdvancedInputs'
 import { SourceType } from 'types/scope'
 import ValueSetField from 'components/SearchValueSet/ValueSetField'
 import { getConfig } from 'config'
 import { getValueSetsFromSystems } from 'utils/valueSets'
+import { mappingCriteria } from '../DemographicForm'
 
 enum Error {
   ADVANCED_INPUTS_ERROR,
@@ -70,7 +71,9 @@ const CcamForm = (props: CriteriaDrawerComponentProps) => {
         )
       )
       .filter((e) => e)
-    setCurrentCriteria({ ...currentCriteria, code: foundCodes })
+    const encounterStatus =
+      mappingCriteria(currentCriteria?.encounterStatus, CriteriaDataKey.ENCOUNTER_STATUS, criteriaData) || []
+    setCurrentCriteria({ ...currentCriteria, code: foundCodes, encounterStatus })
   }, [])
 
   return (

diff --git a/.../DiagramView/components/LogicalOperator/components/CriteriaRightPanel/Cim10Form/index.tsx b/.../DiagramView/components/LogicalOperator/components/CriteriaRightPanel/Cim10Form/index.tsx
@@ -19,7 +19,7 @@ import KeyboardBackspaceIcon from '@mui/icons-material/KeyboardBackspace'
 
 import useStyles from '../formStyles'
 import { CriteriaDrawerComponentProps } from 'types'
-import { Cim10DataType, Comparators, CriteriaType } from 'types/requestCriterias'
+import { Cim10DataType, Comparators, CriteriaDataKey, CriteriaType } from 'types/requestCriterias'
 import { BlockWrapper } from 'components/ui/Layout'
 import OccurenceInput from 'components/ui/Inputs/Occurences'
 import AdvancedInputs from '../AdvancedInputs'
@@ -28,6 +28,7 @@ import { getConfig } from 'config'
 import ValueSetField from 'components/SearchValueSet/ValueSetField'
 import { getValueSetsFromSystems } from 'utils/valueSets'
 import { LabelObject } from 'types/searchCriterias'
+import { mappingCriteria } from '../DemographicForm'
 
 enum Error {
   ADVANCED_INPUTS_ERROR,
@@ -83,7 +84,9 @@ const Cim10Form = (props: CriteriaDrawerComponentProps) => {
         )
       )
       .filter((e) => e)
-    setCurrentCriteria({ ...currentCriteria, code: foundCodes })
+    const encounterStatus =
+      mappingCriteria(currentCriteria?.encounterStatus, CriteriaDataKey.ENCOUNTER_STATUS, criteriaData) || []
+    setCurrentCriteria({ ...currentCriteria, code: foundCodes, encounterStatus })
   }, [])
   return (
     <Grid className={classes.root}>

diff --git a/...ightPanel/DocumentsForm/DocumentsForm.tsx → ...riteriaRightPanel/DocumentsForm/index.tsx b/...ightPanel/DocumentsForm/DocumentsForm.tsx → ...riteriaRightPanel/DocumentsForm/index.tsx
@@ -32,12 +32,13 @@ import { useDebounce } from 'utils/debounce'
 import { SearchByTypes, FilterByDocumentStatus } from 'types/searchCriterias'
 import { IndeterminateCheckBoxOutlined } from '@mui/icons-material'
 import { SearchInputError } from 'types/error'
-import { Comparators, DocumentDataType, CriteriaType } from 'types/requestCriterias'
+import { Comparators, DocumentDataType, CriteriaType, CriteriaDataKey } from 'types/requestCriterias'
 import Searchbar from 'components/ui/Searchbar'
 import SearchInput from 'components/ui/Searchbar/SearchInput'
 import { BlockWrapper } from 'components/ui/Layout'
 import OccurenceInput from 'components/ui/Inputs/Occurences'
 import { SourceType } from 'types/scope'
+import { mappingCriteria } from '../DemographicForm'
 
 const defaultComposition: Omit<DocumentDataType, 'id'> = {
   type: CriteriaType.DOCUMENTS,
@@ -290,7 +291,7 @@ const DocumentsForm: React.FC<CriteriaDrawerComponentProps> = (props) => {
               noOptionsText="Veuillez entrer un statut de visite associée"
               getOptionLabel={(option) => option.label}
               isOptionEqualToValue={(option, value) => option.id === value.id}
-              value={defaultValues.encounterStatus}
+              value={mappingCriteria(defaultValues?.encounterStatus, CriteriaDataKey.ENCOUNTER_STATUS, criteriaData)}
               onChange={(e, value) => _onChangeValue('encounterStatus', value)}
               renderInput={(params) => <TextField {...params} label="Statut de la visite associée" />}
             />

diff --git a/...rt/DiagramView/components/LogicalOperator/components/CriteriaRightPanel/GHMForm/index.tsx b/...rt/DiagramView/components/LogicalOperator/components/CriteriaRightPanel/GHMForm/index.tsx
@@ -15,7 +15,7 @@ import {
 
 import useStyles from '../formStyles'
 import { CriteriaDrawerComponentProps } from 'types'
-import { Comparators, GhmDataType, CriteriaType } from 'types/requestCriterias'
+import { Comparators, GhmDataType, CriteriaType, CriteriaDataKey } from 'types/requestCriterias'
 import KeyboardBackspaceIcon from '@mui/icons-material/KeyboardBackspace'
 import { BlockWrapper } from 'components/ui/Layout'
 import OccurenceInput from 'components/ui/Inputs/Occurences'
@@ -24,6 +24,7 @@ import { SourceType } from 'types/scope'
 import ValueSetField from 'components/SearchValueSet/ValueSetField'
 import { getConfig } from 'config'
 import { getValueSetsFromSystems } from 'utils/valueSets'
+import { mappingCriteria } from '../DemographicForm'
 
 enum Error {
   ADVANCED_INPUTS_ERROR,
@@ -63,7 +64,9 @@ const GhmForm = (props: CriteriaDrawerComponentProps) => {
         criteriaData.data.ghmData.find((cacheCode: any) => cacheCode.id === code.id && cacheCode.system === code.system)
       )
       .filter((e) => e)
-    setCurrentCriteria({ ...currentCriteria, code: foundCodes })
+    const encounterStatus =
+      mappingCriteria(currentCriteria?.encounterStatus, CriteriaDataKey.ENCOUNTER_STATUS, criteriaData) || []
+    setCurrentCriteria({ ...currentCriteria, code: foundCodes, encounterStatus })
   }, [])
 
   return (

diff --git a/...ramView/components/LogicalOperator/components/CriteriaRightPanel/MedicationForm/index.tsx b/...ramView/components/LogicalOperator/components/CriteriaRightPanel/MedicationForm/index.tsx
@@ -1,7 +1,7 @@
 import React, { useEffect, useMemo, useState } from 'react'
 
 import { CriteriaDrawerComponentProps } from 'types'
-import { Comparators, MedicationDataType, CriteriaType } from 'types/requestCriterias'
+import { Comparators, MedicationDataType, CriteriaType, CriteriaDataKey } from 'types/requestCriterias'
 import {
   Grid,
   IconButton,
@@ -27,6 +27,7 @@ import AdvancedInputs from '../AdvancedInputs'
 import KeyboardBackspaceIcon from '@mui/icons-material/KeyboardBackspace'
 import { getValueSetsFromSystems } from 'utils/valueSets'
 import { LabelObject } from 'types/searchCriterias'
+import { mappingCriteria } from '../DemographicForm'
 
 enum Error {
   ADVANCED_INPUTS_ERROR,
@@ -77,7 +78,10 @@ const MedicationForm = (props: CriteriaDrawerComponentProps) => {
         )
       )
       .filter((e) => e)
-    setCurrentCriteria({ ...currentCriteria, code: foundCodes })
+      .filter((e) => e)
+    const encounterStatus =
+      mappingCriteria(currentCriteria?.encounterStatus, CriteriaDataKey.ENCOUNTER_STATUS, criteriaData) || []
+    setCurrentCriteria({ ...currentCriteria, code: foundCodes, encounterStatus })
   }, [])
 
   if (criteriaData?.data?.prescriptionTypes === 'loading' || criteriaData?.data?.administrations === 'loading') {

diff --git a/src/utils/mappers.ts b/src/utils/mappers.ts
@@ -59,13 +59,13 @@ export const buildLabelObjectFilter = (criterion: LabelObject[] | undefined | nu
 }
 
 export const unbuildLabelObjectFilter = (currentCriterion: any, filterName: string, values?: string | null) => {
-  const valuesIds = values?.split(',') || []
-  const newArray = valuesIds?.map((url) => ({
-    system: url.split('|')?.[0],
-    id: url.split('|')?.[1]
-  }))
-  if (newArray)
+ const valuesIds = values?.split(',') || []
+  const newArray = valuesIds?.map((value) =>
+    value.includes('|') ? { system: value.split('|')?.[0], id: value.split('|')?.[1] } : { id: value }
+  )
+  if (newArray) {
     currentCriterion[filterName] = currentCriterion ? [...currentCriterion[filterName], ...newArray] : newArray
+  }
 }
 
 export const buildEncounterServiceFilter = (criterion?: LabelObject[]) => {