From fe014e9a00e42b76be86b5e26c59ab29ebcf69c7 Mon Sep 17 00:00:00 2001
From: FlorentGouyon <florentgouyon@hotmail.com>
Date: Wed, 20 Dec 2023 17:46:11 +0100
Subject: [PATCH] =?UTF-8?q?feat:=20changement=20du=20mapping=20Front?=
 =?UTF-8?q?=E2=86=92=20Back=20pour=20filtres=20sauvegard=C3=A9s,=20TODO=20?=
 =?UTF-8?q?Back=E2=86=90=20Front?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Dashboard/Documents/Documents.tsx         |  46 +++--
 .../Dashboard/PatientList/PatientList.tsx     |  68 ++++---
 .../ui/Inputs/DurationRange/DurationInput.tsx |   2 +-
 src/components/ui/Searchbar/Select.tsx        |   4 +
 src/hooks/filters/useSavedFilters.ts          |  14 +-
 src/mappers/filters.ts                        | 174 ++++++++++++++----
 src/services/aphp/callApi.ts                  |   4 +-
 src/services/aphp/serviceCohorts.ts           |  11 +-
 src/services/aphp/servicePatients.ts          |  33 ++--
 src/types/searchCriterias.ts                  |  12 +-
 10 files changed, 253 insertions(+), 115 deletions(-)

diff --git a/src/components/Dashboard/Documents/Documents.tsx b/src/components/Dashboard/Documents/Documents.tsx
index e54a244e3..e6b101944 100644
--- a/src/components/Dashboard/Documents/Documents.tsx
+++ b/src/components/Dashboard/Documents/Documents.tsx
@@ -414,12 +414,16 @@ const Documents: React.FC<DocumentsProps> = ({ groupId, deidentified }) => {
               const startDate = newFilters.startDate
               const endDate = newFilters.endDate
               const executiveUnits = newFilters.executiveUnits
-              patchSavedFilter(name, {
-                searchBy,
-                searchInput,
-                orderBy: { orderBy: Order.FAMILY, orderDirection: Direction.ASC },
-                filters: { nda, ipp, docTypes, onlyPdfAvailable, startDate, endDate, executiveUnits }
-              })
+              patchSavedFilter(
+                name,
+                {
+                  searchBy,
+                  searchInput,
+                  orderBy: { orderBy: Order.FAMILY, orderDirection: Direction.ASC },
+                  filters: { nda, ipp, docTypes, onlyPdfAvailable, startDate, endDate, executiveUnits }
+                },
+                deidentified ?? true
+              )
             }}
             validationText={isReadonlyFilterInfoModal ? 'Fermer' : 'Sauvegarder'}
           >
@@ -435,13 +439,25 @@ const Documents: React.FC<DocumentsProps> = ({ groupId, deidentified }) => {
                   maxLimit={50}
                 />
               </Grid>
-              <Grid item>
-                <TextInput
-                  name="searchInput"
-                  label="Recherche textuelle :"
-                  disabled={isReadonlyFilterInfoModal}
-                  value={selectedSavedFilter?.filterParams.searchInput}
-                />
+              <Grid item container direction="column" paddingBottom="16px">
+                <Grid item>
+                  <TextInput
+                    name="searchInput"
+                    label="Recherche textuelle :"
+                    disabled={isReadonlyFilterInfoModal}
+                    value={selectedSavedFilter?.filterParams.searchInput}
+                  />
+                </Grid>
+                <Grid item>
+                  <Select
+                    label="Rechercher dans"
+                    width="60%"
+                    disabled={isReadonlyFilterInfoModal}
+                    value={selectedSavedFilter?.filterParams.searchBy}
+                    items={searchByListDocuments}
+                    name="searchBy"
+                  />
+                </Grid>
               </Grid>
               <Grid item>
                 {!deidentified && (
@@ -498,7 +514,9 @@ const Documents: React.FC<DocumentsProps> = ({ groupId, deidentified }) => {
           setToggleSaveFiltersModal(false)
           resetSavedFilterError()
         }}
-        onSubmit={({ filtersName }) => postSavedFilter(filtersName, { searchBy, searchInput, filters, orderBy })}
+        onSubmit={({ filtersName }) =>
+          postSavedFilter(filtersName, { searchBy, searchInput, filters, orderBy }, deidentified ?? true)
+        }
       >
         <TextInput name="filtersName" error={savedFiltersErrors} />
       </Modal>
diff --git a/src/components/Dashboard/PatientList/PatientList.tsx b/src/components/Dashboard/PatientList/PatientList.tsx
index 1f9532564..43fbe3210 100644
--- a/src/components/Dashboard/PatientList/PatientList.tsx
+++ b/src/components/Dashboard/PatientList/PatientList.tsx
@@ -1,5 +1,4 @@
 import React, { useState, useEffect, useRef, useMemo } from 'react'
-import moment from 'moment'
 
 import { CircularProgress, Grid, Tooltip } from '@mui/material'
 
@@ -20,7 +19,6 @@ import {
 
 import { getGenderRepartitionSimpleData } from 'utils/graphUtils'
 import { Save, SavedSearch } from '@mui/icons-material'
-import { substructAgeString } from 'utils/age'
 import { cancelPendingRequest } from 'utils/abortController'
 import { CanceledError } from 'axios'
 import Searchbar from 'components/ui/Searchbar'
@@ -116,10 +114,6 @@ const PatientList = ({ groupId, total, deidentified }: PatientListProps) => {
   const fetchPatients = async () => {
     try {
       const includeFacets = page === 1
-      const birthdates: [string, string] = [
-        moment(substructAgeString(birthdatesRanges?.[0] || '')).format('MM/DD/YYYY'),
-        moment(substructAgeString(birthdatesRanges?.[1] || '')).format('MM/DD/YYYY')
-      ]
       setLoadingStatus(LoadingStatus.FETCHING)
       const result = await services.cohorts.fetchPatientList(
         {
@@ -128,7 +122,7 @@ const PatientList = ({ groupId, total, deidentified }: PatientListProps) => {
             orderBy,
             searchInput,
             searchBy,
-            filters: { genders, vitalStatuses, birthdatesRanges: birthdates }
+            filters: { genders, vitalStatuses, birthdatesRanges }
           }
         },
         deidentified ?? true,
@@ -315,7 +309,7 @@ const PatientList = ({ groupId, total, deidentified }: PatientListProps) => {
         <BirthdatesRangesFilter
           name={FilterKeys.BIRTHDATES}
           value={birthdatesRanges}
-          deidentified={deidentified || false}
+          deidentified={deidentified ?? false}
         />
       </Modal>
       <Modal
@@ -355,16 +349,20 @@ const PatientList = ({ groupId, total, deidentified }: PatientListProps) => {
               const genders = newFilters.genders as GenderStatus[]
               const vitalStatuses = newFilters.vitalStatuses as VitalStatus[]
               const birthdatesRanges = newFilters.birthdatesRanges as DurationRangeType
-              patchSavedFilter(name, {
-                searchInput,
-                searchBy,
-                orderBy: { orderBy: Order.FAMILY, orderDirection: Direction.ASC },
-                filters: { genders, vitalStatuses, birthdatesRanges }
-              })
+              patchSavedFilter(
+                name,
+                {
+                  searchInput,
+                  searchBy,
+                  orderBy: { orderBy: Order.FAMILY, orderDirection: Direction.ASC },
+                  filters: { genders, vitalStatuses, birthdatesRanges }
+                },
+                deidentified ?? true
+              )
             }}
             validationText={isReadonlyFilterInfoModal ? 'Fermer' : 'Sauvegarder'}
           >
-            <Grid container direction="column" sx={{ gap: '16px' }}>
+            <Grid container direction="column" gap="8px">
               <Grid item container direction="column">
                 <TextInput
                   name="filterName"
@@ -376,26 +374,22 @@ const PatientList = ({ groupId, total, deidentified }: PatientListProps) => {
                   maxLimit={50}
                 />
               </Grid>
-
-              <Grid item container direction="column" sx={{ gap: '16px' }}>
-                <Grid item container direction="column" sx={{ gap: '8px' }}>
-                  <TextInput
-                    name="searchInput"
-                    label="Recherche textuelle :"
-                    disabled={isReadonlyFilterInfoModal}
-                    value={selectedSavedFilter?.filterParams.searchInput}
-                  />
-                  <Select
-                    label="Rechercher dans"
-                    width="60%"
-                    disabled={isReadonlyFilterInfoModal}
-                    value={selectedSavedFilter?.filterParams.searchBy}
-                    items={searchByListPatients}
-                    name="searchBy"
-                  />
-                </Grid>
+              <Grid item container direction="column" paddingBottom="8px">
+                <TextInput
+                  name="searchInput"
+                  label="Recherche textuelle :"
+                  disabled={isReadonlyFilterInfoModal}
+                  value={selectedSavedFilter?.filterParams.searchInput}
+                />
+                <Select
+                  label="Rechercher dans"
+                  width="60%"
+                  disabled={isReadonlyFilterInfoModal}
+                  value={selectedSavedFilter?.filterParams.searchBy}
+                  items={searchByListPatients}
+                  name="searchBy"
+                />
               </Grid>
-              <Grid item container direction="column" sx={{ gap: '8px' }}></Grid>
               <Grid item>
                 <GendersFilter
                   disabled={isReadonlyFilterInfoModal}
@@ -411,7 +405,7 @@ const PatientList = ({ groupId, total, deidentified }: PatientListProps) => {
                   disabled={isReadonlyFilterInfoModal}
                   name={FilterKeys.BIRTHDATES}
                   value={selectedSavedFilter?.filterParams.filters.birthdatesRanges || [null, null]}
-                  deidentified={deidentified || false}
+                  deidentified={deidentified ?? false}
                 />
               </Grid>
             </Grid>
@@ -425,7 +419,9 @@ const PatientList = ({ groupId, total, deidentified }: PatientListProps) => {
           setToggleSaveFiltersModal(false)
           resetSavedFilterError()
         }}
-        onSubmit={({ filtersName }) => postSavedFilter(filtersName, { searchBy, searchInput, filters, orderBy })}
+        onSubmit={({ filtersName }) =>
+          postSavedFilter(filtersName, { searchBy, searchInput, filters, orderBy }, deidentified ?? true)
+        }
       >
         <TextInput name="filtersName" error={savedFiltersErrors} label="Nom" minLimit={2} maxLimit={50} />
       </Modal>
diff --git a/src/components/ui/Inputs/DurationRange/DurationInput.tsx b/src/components/ui/Inputs/DurationRange/DurationInput.tsx
index c26ccbdf8..cd0b17826 100644
--- a/src/components/ui/Inputs/DurationRange/DurationInput.tsx
+++ b/src/components/ui/Inputs/DurationRange/DurationInput.tsx
@@ -22,7 +22,7 @@ const DurationInput = ({ value, label, deidentified = false, disabled = false, o
   }, [duration])
 
   return (
-    <BlockWrapper container justifyContent="space-between" xs={12} alignItems="flex-end">
+    <BlockWrapper container justifyContent="space-between" alignItems="flex-end">
       <Grid item xs={deidentified ? 4 : 3} container alignItems="flex-start">
         <DurationLegendWrapper variant="h5">{label}</DurationLegendWrapper>
       </Grid>
diff --git a/src/components/ui/Searchbar/Select.tsx b/src/components/ui/Searchbar/Select.tsx
index 89937c8de..16159c634 100644
--- a/src/components/ui/Searchbar/Select.tsx
+++ b/src/components/ui/Searchbar/Select.tsx
@@ -22,6 +22,10 @@ const Select = <T,>({ value, label, items, width = '100%', disabled, name, oncha
     if (onchange) onchange(activeValue)
   }, [activeValue])
 
+  useEffect(() => {
+    setActiveValue(value)
+  }, [value])
+
   return (
     <SelectWrapper width={width}>
       <FormControl variant="outlined">
diff --git a/src/hooks/filters/useSavedFilters.ts b/src/hooks/filters/useSavedFilters.ts
index 8bb587cb8..19d07e5c8 100644
--- a/src/hooks/filters/useSavedFilters.ts
+++ b/src/hooks/filters/useSavedFilters.ts
@@ -8,7 +8,7 @@ import {
 } from 'services/aphp/servicePatients'
 import { ErrorType } from 'types/error'
 import { RessourceType } from 'types/requestCriterias'
-import { SavedFilter, SavedFiltersResults, SearchCriterias } from 'types/searchCriterias'
+import { Filters, SavedFilter, SavedFiltersResults, SearchCriterias } from 'types/searchCriterias'
 
 export type SelectedFilter<T> = {
   filterUuid: string
@@ -37,9 +37,9 @@ export const useSavedFilters = <T>(type: RessourceType) => {
     }
   }
 
-  const postSavedFilter = async <T>(name: string, searchCriterias: SearchCriterias<T>) => {
+  const postSavedFilter = async (name: string, searchCriterias: SearchCriterias<Filters>, deidentified: boolean) => {
     try {
-      await postFiltersService(type, name, searchCriterias)
+      await postFiltersService(type, name, searchCriterias, deidentified)
       setSavedFiltersErrors({ isError: false })
       await getSavedFilters()
     } catch {
@@ -53,9 +53,13 @@ export const useSavedFilters = <T>(type: RessourceType) => {
     await getSavedFilters()
   }
 
-  const patchSavedFilter = async <T>(name: string, newSearchCriterias: SearchCriterias<T>): Promise<void> => {
+  const patchSavedFilter = async (
+    name: string,
+    newSearchCriterias: SearchCriterias<Filters>,
+    deidentified: boolean
+  ): Promise<void> => {
     if (selectedSavedFilter) {
-      await patchFiltersService(type, selectedSavedFilter?.filterUuid, name, newSearchCriterias)
+      await patchFiltersService(type, selectedSavedFilter?.filterUuid, name, newSearchCriterias, deidentified)
       await getSavedFilters()
     }
   }
diff --git a/src/mappers/filters.ts b/src/mappers/filters.ts
index 698a3eccd..aaa874f1e 100644
--- a/src/mappers/filters.ts
+++ b/src/mappers/filters.ts
@@ -1,20 +1,30 @@
 import { RessourceType } from 'types/requestCriterias'
-import { ScopeTreeRow, SimpleCodeType } from './../types'
+import { ScopeTreeRow, SimpleCodeType } from 'types'
 import {
   AllDocumentsFilters,
+  BiologyFilters,
+  CohortsFilters,
   Direction,
   DurationRangeType,
   FilterKeys,
   Filters,
+  GenderCodes,
   GenderStatus,
+  ImagingFilters,
+  MedicationFilters,
   Order,
   PatientsFilters,
+  PatientDocumentsFilters,
+  PMSIFilters,
   SearchBy,
   SearchCriterias,
   SearchInput,
-  VitalStatus
+  VitalStatus,
+  SearchByTypes
 } from 'types/searchCriterias'
 import allDocTypesList from 'assets/docTypes.json'
+import moment from 'moment'
+import { substructAgeString } from 'utils/age'
 
 export function parsePatientsFiltersString(filterURLParams: URLSearchParams): PatientsFilters {
   const filters: PatientsFilters = {
@@ -122,43 +132,141 @@ export const mapStringToSearchCriteria = <T>(filtersString: string, type: Ressou
   }
 }
 
-const isSimpleCodeType = (obj: any): obj is SimpleCodeType => {
-  return 'code' in obj && 'label' in obj && 'type' in obj
+function genderStatusToGenderCodes(status: GenderStatus): GenderCodes {
+  switch (status) {
+    case GenderStatus.MALE:
+      return GenderCodes.MALE
+    case GenderStatus.FEMALE:
+      return GenderCodes.FEMALE
+    case GenderStatus.OTHER:
+    case GenderStatus.OTHER_UNKNOWN:
+      return GenderCodes.OTHER
+    case GenderStatus.UNKNOWN:
+      return GenderCodes.UNKNOWN
+    default:
+      return GenderCodes.NOT_SPECIFIED
+  }
+}
+
+function genderCodesToGenderStatus(code: GenderCodes): GenderStatus {
+  switch (code) {
+    case GenderCodes.MALE:
+      return GenderStatus.MALE
+    case GenderCodes.FEMALE:
+      return GenderStatus.FEMALE
+    case GenderCodes.OTHER:
+      return GenderStatus.OTHER
+    case GenderCodes.UNKNOWN:
+      return GenderStatus.UNKNOWN
+    case GenderCodes.UNDETERMINED:
+    case GenderCodes.NOT_SPECIFIED:
+    default:
+      return GenderStatus.OTHER_UNKNOWN
+  }
+}
+
+const isPatientsFilter = (filters: Filters): filters is PatientsFilters => {
+  return 'genders' in filters && 'birthdatesRanges' in filters && 'vitalStatuses' in filters
+}
+
+const isPMSIFilters = (filters: Filters): filters is PMSIFilters => {
+  return 'diagnosticTypes' in filters && 'code' in filters && 'source' in filters
+}
+
+const isMedicationFilters = (filters: Filters): filters is MedicationFilters => {
+  return 'prescriptionTypes' in filters && 'administrationRoutes' in filters
+}
+
+const isBiologyFilters = (filters: Filters): filters is BiologyFilters => {
+  return 'loinc' in filters && 'anabio' in filters && 'validatedStatus' in filters
 }
 
-const isScopeTreeRow = (obj: any): obj is ScopeTreeRow => {
-  return (
-    'id' in obj &&
-    'name' in obj &&
-    'cohort_id' in obj &&
-    'full_path' in obj &&
-    'above_levels_ids' in obj &&
-    'inferior_levels_ids' in obj &&
-    'type' in obj
-  )
+const isImagingFilters = (filters: Filters): filters is ImagingFilters => {
+  return 'modality' in filters
 }
 
-export const mapObjectToString = (obj: any) => {
+const isPatientDocumentsFilters = (filters: Filters): filters is PatientDocumentsFilters => {
+  return 'docTypes' in filters && 'onlyPdfAvailable' in filters
+}
+
+const isAllDocumentsFilters = (filters: Filters): filters is AllDocumentsFilters => {
+  return isPatientDocumentsFilters(filters) && 'ipp' in filters
+}
+
+const isCohortsFilters = (filters: Filters): filters is CohortsFilters => {
+  return 'status' in filters && 'favorite' in filters && 'minPatients' in filters && 'maxPatients' in filters
+}
+
+export const mapSearchCriteriasToRequestParams = (searchCriterias: SearchCriterias<Filters>, deidentified: boolean) => {
   let transformedString = ''
-  for (const property in obj) {
-    const value = obj[property as keyof Filters]
-    if (!value || value.length === 0) continue
-    if (Array.isArray(value)) {
-      if (value.every((entry) => entry === null)) continue
-      transformedString += `${property}=`
-      const tempValue = value.map((entry) => {
-        if (entry === null) return 'null'
-        if (typeof entry === 'object') {
-          if (isSimpleCodeType(entry)) return entry.code
-          else if (isScopeTreeRow(entry)) return entry.id
-        }
-        return entry
-      })
-      transformedString += tempValue
-    } else {
-      transformedString += `${property}=${value}`
+
+  let _searchInput: string | string[] = ''
+  _searchInput = searchCriterias.searchInput
+    .split(' ') // Split by space (= ['mot1', 'mot2' ...])
+    .filter((elem: string) => elem) // Filter if you have ['mot1', '', 'mot2'] (double space)
+
+  if (searchCriterias.searchBy === SearchByTypes.IDENTIFIER) {
+    _searchInput = _searchInput.join()
+    transformedString += `${searchCriterias.searchBy}=${_searchInput}&`
+  } else {
+    _searchInput.forEach((input) => (transformedString += `${searchCriterias.searchBy}=${input}&`))
+  }
+
+  const filters = searchCriterias.filters
+
+  if (isPatientsFilter(filters)) {
+    transformedString += filters.genders.length ? `gender=${filters.genders.map(genderStatusToGenderCodes)}&` : ''
+    transformedString +=
+      filters.vitalStatuses.length === 1 ? `deceased=${filters.vitalStatuses[0] === VitalStatus.DECEASED}&` : ''
+
+    const birthdates: [string, string] = [
+      moment(substructAgeString(filters?.birthdatesRanges?.[0] || '')).format('MM/DD/YYYY'),
+      moment(substructAgeString(filters?.birthdatesRanges?.[1] || '')).format('MM/DD/YYYY')
+    ]
+    const minBirthdate = birthdates && Math.abs(moment(birthdates[0]).diff(moment(), deidentified ? 'months' : 'days'))
+    const maxBirthdate = birthdates && Math.abs(moment(birthdates[1]).diff(moment(), deidentified ? 'months' : 'days'))
+    if (minBirthdate) transformedString += `${deidentified ? 'age-month' : 'age-day'}=ge${minBirthdate}&`
+    if (maxBirthdate) transformedString += `${deidentified ? 'age-month' : 'age-day'}=le${maxBirthdate}&`
+  } else if (isCohortsFilters(filters)) {
+    transformedString += filters.status ? `status=${filters.status.map((valueSet) => valueSet.code)}&` : ''
+    transformedString += filters.favorite ? `favorite=${filters.favorite}&` : ''
+    transformedString += filters.minPatients ? `minPatients=${filters.minPatients}&` : ''
+    transformedString += filters.maxPatients ? `maxPatients=${filters.maxPatients}&` : ''
+  } else {
+    transformedString += filters.nda ? `nda=${filters.nda}&` : ''
+    transformedString += filters.startDate ? `startDate=${filters.startDate}&` : ''
+    transformedString += filters.endDate ? `endDate=${filters.endDate}&` : ''
+    transformedString += filters.executiveUnits
+      ? `executiveUnits=${filters.executiveUnits.map((scopeTreeRow) => scopeTreeRow.id)}&`
+      : ''
+    if (isImagingFilters(filters) || isAllDocumentsFilters(filters)) {
+      transformedString += filters.ipp ? `ipp=${filters.ipp}&` : ''
+      if (isImagingFilters(filters)) {
+        transformedString += filters.modality
+          ? `modality=${filters.modality.map((labelObject) => labelObject.id)}&`
+          : ''
+      } else {
+        transformedString += filters.docTypes ? `docTypes=${filters.docTypes.map((codeType) => codeType.code)}&` : ''
+        transformedString += filters.onlyPdfAvailable ? `onlyPdfAvailable=${filters.onlyPdfAvailable}&` : ''
+      }
+    } else if (isPMSIFilters(filters)) {
+      transformedString += filters.diagnosticTypes
+        ? `diagnosticTypes=${filters.diagnosticTypes.map((labelObject) => labelObject.id)}&`
+        : ''
+      transformedString += filters.code ? `code=${filters.code}&` : ''
+      transformedString += filters.source ? `source=${filters.source}&` : ''
+    } else if (isMedicationFilters(filters)) {
+      transformedString += filters.prescriptionTypes
+        ? `prescriptionTypes=${filters.prescriptionTypes.map((labelObject) => labelObject.id)}&`
+        : ''
+      transformedString += filters.administrationRoutes
+        ? `administrationRoutes=${filters.administrationRoutes.map((labelObject) => labelObject.id)}&`
+        : ''
+    } else if (isBiologyFilters(filters)) {
+      transformedString += filters.loinc ? `loinc=${filters.loinc}&` : ''
+      transformedString += filters.anabio ? `anabio=${filters.anabio}&` : ''
+      transformedString += filters.validatedStatus ? `validatedStatus=${filters.validatedStatus}&` : ''
     }
-    transformedString += `&`
   }
   transformedString = transformedString.substring(0, transformedString.length - 1)
   return transformedString
diff --git a/src/services/aphp/callApi.ts b/src/services/aphp/callApi.ts
index 0de0b0cde..af4cf674d 100644
--- a/src/services/aphp/callApi.ts
+++ b/src/services/aphp/callApi.ts
@@ -14,7 +14,7 @@ import {
 } from 'types'
 
 import { FHIR_Bundle_Response } from 'types'
-import { AxiosResponse } from 'axios'
+import { AxiosError, AxiosResponse } from 'axios'
 import apiBackend from '../apiBackend'
 import {
   Binary,
@@ -349,6 +349,7 @@ export const postFilters = async (
     name,
     filter
   })
+  if (res instanceof AxiosError) throw "Le filtre n'a pas pu être sauvegardé."
   return res
 }
 
@@ -391,6 +392,7 @@ export const patchFilters = async (
     name,
     filter
   })
+  if (res instanceof AxiosError) throw "Le filtre n'a pas pu être modifié."
   return res
 }
 
diff --git a/src/services/aphp/serviceCohorts.ts b/src/services/aphp/serviceCohorts.ts
index 921bbf664..d2f551f8e 100644
--- a/src/services/aphp/serviceCohorts.ts
+++ b/src/services/aphp/serviceCohorts.ts
@@ -45,6 +45,7 @@ import {
 import services from '.'
 import { ErrorDetails, SearchInputError } from 'types/error'
 import { getResourceInfos } from 'utils/fillElement'
+import { substructAgeString } from 'utils/age'
 
 export interface IServiceCohorts {
   /**
@@ -339,12 +340,14 @@ const servicesCohorts: IServiceCohorts = {
       }
 
       // convert birthdates into days or months depending of if it's a deidentified perimeter or not
+      const birthdates: [string, string] = [
+        moment(substructAgeString(filters?.birthdatesRanges?.[0] || '')).format('MM/DD/YYYY'),
+        moment(substructAgeString(filters?.birthdatesRanges?.[1] || '')).format('MM/DD/YYYY')
+      ]
       const minBirthdate =
-        filters?.birthdatesRanges &&
-        Math.abs(moment(filters.birthdatesRanges[0]).diff(moment(), deidentified ? 'months' : 'days'))
+        birthdates && Math.abs(moment(birthdates[0]).diff(moment(), deidentified ? 'months' : 'days'))
       const maxBirthdate =
-        filters?.birthdatesRanges &&
-        Math.abs(moment(filters.birthdatesRanges[1]).diff(moment(), deidentified ? 'months' : 'days'))
+        birthdates && Math.abs(moment(birthdates[1]).diff(moment(), deidentified ? 'months' : 'days'))
       const patientsResp = await fetchPatient({
         size: 20,
         offset: page ? (page - 1) * 20 : 0,
diff --git a/src/services/aphp/servicePatients.ts b/src/services/aphp/servicePatients.ts
index 672a42172..d29a861c9 100644
--- a/src/services/aphp/servicePatients.ts
+++ b/src/services/aphp/servicePatients.ts
@@ -1,4 +1,4 @@
-import { AxiosError, AxiosResponse } from 'axios'
+import { AxiosResponse } from 'axios'
 import { CohortData, FHIR_Bundle_Response, CohortEncounter, CohortComposition, MedicationEntry, ChartCode } from 'types'
 import {
   getGenderRepartitionMapAphp,
@@ -42,10 +42,10 @@ import {
   Patient,
   Procedure
 } from 'fhir/r4'
-import { Direction, Order, SearchByTypes, SearchCriterias } from 'types/searchCriterias'
+import { Direction, Filters, Order, SearchByTypes, SearchCriterias } from 'types/searchCriterias'
 import { Medication, PMSI } from 'types/patient'
 import { RessourceType } from 'types/requestCriterias'
-import { mapObjectToString } from 'mappers/filters'
+import { mapSearchCriteriasToRequestParams } from 'mappers/filters'
 
 export interface IServicePatients {
   /*
@@ -832,17 +832,15 @@ export const getEncounterDocuments = async (
   return _encounters
 }
 
-export const postFiltersService = async <T>(
+export const postFiltersService = async (
   fhir_resource: RessourceType,
   name: string,
-  criterias: SearchCriterias<T>
+  criterias: SearchCriterias<Filters>,
+  deidentified: boolean
 ) => {
-  const { searchBy, searchInput, filters } = criterias
-
-  const criteriasString = `${mapObjectToString({ searchBy, searchInput })}&${mapObjectToString(filters)}`
+  const criteriasString = mapSearchCriteriasToRequestParams(criterias, deidentified)
   const response = await postFilters(fhir_resource, name, criteriasString)
 
-  if (response instanceof AxiosError) throw "Le filtre n'a pas pu être sauvegardé."
   return response.data
 }
 
@@ -875,20 +873,17 @@ export const deleteFiltersService = async (fhir_resource_uuids: string[]) => {
   }
 }
 
-export const patchFiltersService = async <T>(
+export const patchFiltersService = async (
   fhir_resource: RessourceType,
   uuid: string,
   name: string,
-  criterias: SearchCriterias<T>
+  criterias: SearchCriterias<Filters>,
+  deidentified: boolean
 ) => {
-  try {
-    const { searchBy, searchInput, filters } = criterias
-    const criteriasString = `${mapObjectToString({ searchBy, searchInput })}&${mapObjectToString(filters)}`
-    const response = await patchFilters(fhir_resource, uuid, name, criteriasString)
-    return response
-  } catch {
-    throw "Le filtre n'a pas pu être modifié."
-  }
+  const criteriasString = mapSearchCriteriasToRequestParams(criterias, deidentified)
+  const response = await patchFilters(fhir_resource, uuid, name, criteriasString)
+
+  return response
 }
 
 export const fetchPerimeterFromPerimeterId = async (perimeterId: string) => {
diff --git a/src/types/searchCriterias.ts b/src/types/searchCriterias.ts
index 9905f9c17..8660f95ed 100644
--- a/src/types/searchCriterias.ts
+++ b/src/types/searchCriterias.ts
@@ -10,6 +10,14 @@ export enum GenderStatus {
   UNKNOWN = 'UNKNOWN',
   OTHER_UNKNOWN = 'OTHER_UNKNOWN'
 }
+export enum GenderCodes {
+  MALE = 'm',
+  FEMALE = 'f',
+  OTHER = 'a',
+  UNKNOWN = 'INCONNU',
+  UNDETERMINED = 'i',
+  NOT_SPECIFIED = 'NON RENSEIGNE'
+}
 export enum GenderStatusLabel {
   MALE = 'Hommes',
   FEMALE = 'Femmes',
@@ -213,7 +221,7 @@ export interface BiologyFilters {
   validatedStatus: boolean
 }
 
-export type ImagingFilters = {
+export interface ImagingFilters {
   ipp?: string
   nda: string
   startDate: string | null
@@ -222,7 +230,7 @@ export type ImagingFilters = {
   modality: LabelObject[]
 }
 
-export type PatientDocumentsFilters = {
+export interface PatientDocumentsFilters {
   nda: string
   docTypes: SimpleCodeType[]
   onlyPdfAvailable: boolean