fix: resolve unknown chipset into patient data table

aphp · Jun 1, 2023 · be9f3da · be9f3da
1 parent 29e124c
commit be9f3da
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 24 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/src/components/Dashboard/PatientList/PatientList.tsx b/src/components/Dashboard/PatientList/PatientList.tsx
@@ -64,9 +64,9 @@ const PatientList: React.FC<PatientListProps> = ({
   const [open, setOpen] = useState(false)
 
   const [filters, setFilters] = useState<PatientFiltersType>({
-    gender: PatientGenderKind._unknown,
+    gender: null,
     birthdatesRanges: ['', ''],
-    vitalStatus: VitalStatus.all
+    vitalStatus: null
   })
 
   const [order, setOrder] = useState<Order>({
@@ -166,7 +166,7 @@ const PatientList: React.FC<PatientListProps> = ({
       case 'gender':
         setFilters((prevFilters) => ({
           ...prevFilters,
-          gender: PatientGenderKind._unknown
+          gender: null
         }))
         break
       case 'birthdates':

diff --git a/src/services/aphp/callApi.ts b/src/services/aphp/callApi.ts
@@ -88,7 +88,7 @@ type fetchPatientProps = {
   offset?: number
   _sort?: string
   sortDirection?: 'asc' | 'desc'
-  gender?: string
+  gender?: string | null
   minBirthdate?: number
   maxBirthdate?: number
   searchBy?: string

diff --git a/src/services/aphp/serviceCohorts.ts b/src/services/aphp/serviceCohorts.ts
@@ -97,9 +97,9 @@ export interface IServiceCohorts {
     page: number,
     searchBy: SearchByTypes,
     searchInput: string,
-    gender: PatientGenderKind,
+    gender: PatientGenderKind | null,
     birthdates: [string, string],
-    vitalStatus: VitalStatus,
+    vitalStatus: VitalStatus | null,
     sortBy: string,
     sortDirection: string,
     deidentified: boolean,

diff --git a/src/types.ts b/src/types.ts
@@ -187,9 +187,9 @@ export type PMSIFilters = {
 }
 
 export type PatientFilters = {
-  gender: PatientGenderKind
+  gender: PatientGenderKind | null
   birthdatesRanges: [string, string]
-  vitalStatus: VitalStatus
+  vitalStatus: VitalStatus | null
 }
 
 export type ObservationFilters = {

diff --git a/src/utils/patient.ts b/src/utils/patient.ts
@@ -1,6 +1,6 @@
 import { PatientGenderKind, VitalStatus } from 'types'
 
-export const genderName = (gender: PatientGenderKind): string => {
+export const genderName = (gender: PatientGenderKind | null): string | null => {
   switch (gender) {
     case PatientGenderKind._female:
       return 'Genre: Femmes'
@@ -9,18 +9,19 @@ export const genderName = (gender: PatientGenderKind): string => {
     case PatientGenderKind._other:
       return 'Genre: Autre'
     case PatientGenderKind._unknown:
-    default:
       return 'Genre: Inconnu'
+    default:
+      return null
   }
 }
 
-export const vitalStatusName = (vitalStatus: VitalStatus): string => {
+export const vitalStatusName = (vitalStatus: VitalStatus | null): string | null => {
   switch (vitalStatus) {
     case VitalStatus.alive:
       return 'Patients vivants'
     case VitalStatus.deceased:
       return 'Patients décédés'
     default:
-      return 'Statut vital: Inconnu'
+      return null
   }
 }