fix: fix bugs n6 n8 and n16 - Ref gestion-de-projet#2330

Co-authored-by: manelleg <manelle.gueriouz@aphp.fr>
aphp · Oct 13, 2023 · 742eec3 · 742eec3
1 parent 3c74578
commit 742eec3
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 5 deletions.
diff --git a/src/components/DataTable/DataTablePatient.tsx b/src/components/DataTable/DataTablePatient.tsx
@@ -43,12 +43,12 @@ const DataTablePatient: React.FC<DataTablePatientProps> = ({
   const { classes } = useStyles()
 
   const columns: Column[] = [
-    { label: `Sexe`, code: 'gender', align: 'center', sortableColumn: true },
+    { label: `Sexe`, code: 'gender,id', align: 'center', sortableColumn: true },
     { label: 'Prénom', code: 'name', align: 'center', sortableColumn: !deidentified },
     { label: 'Nom', code: 'family', align: 'left', sortableColumn: !deidentified },
     {
       label: !deidentified ? 'Date de naissance' : 'Âge',
-      code: 'birthdate',
+      code: 'birthdate,id',
       align: 'center',
       sortableColumn: !deidentified
     },

diff --git a/src/components/Patient/PatientBiology/PatientBiology.tsx b/src/components/Patient/PatientBiology/PatientBiology.tsx
@@ -92,6 +92,8 @@ const PatientBiology: React.FC<PatientBiologyTypes> = ({ groupId }) => {
     } catch (error) {
       if (error instanceof CanceledError) {
         setLoadingStatus(LoadingStatus.FETCHING)
+      } else {
+        setLoadingStatus(LoadingStatus.SUCCESS)
       }
     }
   }

diff --git a/src/components/Patient/PatientMedication/PatientMedication.tsx b/src/components/Patient/PatientMedication/PatientMedication.tsx
@@ -81,6 +81,8 @@ const PatientMedication: React.FC<PatientMedicationTypes> = ({ groupId }) => {
     } catch (error) {
       if (error instanceof CanceledError) {
         setLoadingStatus(LoadingStatus.FETCHING)
+      } else {
+        setLoadingStatus(LoadingStatus.SUCCESS)
       }
     }
   }

diff --git a/src/components/Patient/PatientPMSI/PatientPMSI.tsx b/src/components/Patient/PatientPMSI/PatientPMSI.tsx
@@ -95,6 +95,8 @@ const PatientPMSI: React.FC<PatientPMSITypes> = ({ groupId }) => {
     } catch (error) {
       if (error instanceof CanceledError) {
         setLoadingStatus(LoadingStatus.FETCHING)
+      } else {
+        setLoadingStatus(LoadingStatus.SUCCESS)
       }
     }
   }

diff --git a/src/services/aphp/serviceCohorts.ts b/src/services/aphp/serviceCohorts.ts
@@ -351,8 +351,13 @@ const servicesCohorts: IServiceCohorts = {
         .trim() // Remove space before/after search
         .split(' ') // Split by space (= ['mot1', 'mot2' ...])
         .filter((elem: string) => elem) // Filter if you have ['mot1', '', 'mot2'] (double space)
-      for (const _search of searches) {
-        _searchInput = _searchInput ? `${_searchInput} AND "${_search}"` : `"${_search}"`
+
+      if (searchBy === SearchByTypes.identifier) {
+        _searchInput = searches.join()
+      } else {
+        for (const _search of searches) {
+          _searchInput = _searchInput ? `${_searchInput} AND "${_search}"` : `"${_search}"`
+        }
       }
 
       // convert birthdates into days or months depending of if it's a deidentified perimeter or not

diff --git a/src/state/patient.ts b/src/state/patient.ts
@@ -151,9 +151,10 @@ const fetchPmsi = createAsyncThunk<FetchPmsiReturn, FetchPmsiParams, { state: Ro
           return { ghm: pmsiReturn as IPatientPmsi<Claim> }
       }
     } catch (error) {
-      console.error(error)
       if (error instanceof CanceledError) {
         return thunkApi.rejectWithValue({ error })
+      } else {
+        throw error
       }
     }
   }
@@ -243,6 +244,8 @@ const fetchBiology = createAsyncThunk<FetchBiologyReturn, FetchBiologyParams, {
       console.error(error)
       if (error instanceof CanceledError) {
         return thunkApi.rejectWithValue({ error })
+      } else {
+        throw error
       }
     }
   }
@@ -350,6 +353,8 @@ const fetchMedication = createAsyncThunk<
     console.error(error)
     if (error instanceof CanceledError) {
       return thunkApi.rejectWithValue({ error })
+    } else {
+      throw error
     }
   }
 })