refactor: refactor of cohortCreation - Ref gestion-de-projet#2420

* refactor: refactor of cohortCreation - Ref gestion-de-projet#2420
aphp · Jan 10, 2024 · aac8025 · aac8025
1 parent 9a1d1cb
commit aac8025
Show file tree

Hide file tree

Showing 6 changed files with 420 additions and 846 deletions.
diff --git a/src/types/requestCriterias.ts b/src/types/requestCriterias.ts
@@ -1,17 +1,16 @@
-import { ScopeTreeRow, ValueSetSystem } from 'types'
+import { ScopeTreeRow } from 'types'
 import { DocumentAttachmentMethod, DurationRangeType, LabelObject, SearchByTypes } from './searchCriterias'
 
+export enum MedicationType {
+  Request = 'MedicationRequest',
+  Administration = 'MedicationAdministration'
+}
+
 export enum MedicationTypeLabel {
   Request = 'Prescription',
   Administration = 'Administration'
 }
 
-export type LabelCriteriaObject = {
-  id: string
-  label: string
-  system?: ValueSetSystem
-}
-
 export enum RessourceType {
   REQUEST = 'Request',
   IPP_LIST = 'IPPList',

diff --git a/src/types/searchCriterias.ts b/src/types/searchCriterias.ts
@@ -1,4 +1,4 @@
-import { ScopeTreeRow, SimpleCodeType, ValueSet } from 'types'
+import { ScopeTreeRow, SimpleCodeType, ValueSet, ValueSetSystem } from 'types'
 import { PatientTableLabels } from './patient'
 import { CohortsType } from './cohorts'
 
@@ -140,6 +140,7 @@ export type DurationRangeType = [string | null | undefined, string | null | unde
 export type LabelObject = {
   id: string
   label: string
+  system?: ValueSetSystem
 }
 export type OrderBy = {
   orderBy: Order