fix: @Mehdi-BOUYAHIA fix: call to the right valueSet for medication a…

…nd biology - Ref gestion-de-projet#2154 * build: set release version to 2.22.0 * fix: call to the right valueSet for medication and biology - Ref gestion-de-projet#2154 * fix: call to the right valueSet for medication and biology - Ref gestion-de-projet#2154 --------- Co-authored-by: Paul Bui-Quang <paul.bui-quang@aphp.fr>
aphp · Jul 5, 2023 · a306d15 · a306d15
1 parent 3ac2a98
commit a306d15
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 8 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/...iagramView/components/LogicalOperator/components/CriteriaRightPanel/BiologyForm/index.tsx b/...iagramView/components/LogicalOperator/components/CriteriaRightPanel/BiologyForm/index.tsx
@@ -7,7 +7,8 @@ import BiologyForm from './components/Form/BiologyForm'
 import BiologyHierarchy from './components/Hierarchy/BiologyHierarchy'
 import BiologySearch from './components/BiologySearch/BiologySearch'
 import { initSyncHierarchyTableEffect, OBSERVATION, syncOnChangeFormValue } from 'utils/pmsi'
-import { fetchProcedure, PmsiListType } from 'state/pmsi'
+import { PmsiListType } from 'state/pmsi'
+import { fetchBiology } from 'state/biology'
 import { useAppDispatch, useAppSelector } from 'state'
 
 export const defaultBiology = {
@@ -57,7 +58,7 @@ const Index = (props: any) => {
       biologyHierarchy,
       selectedCriteria,
       defaultCriteria && defaultCriteria.code ? defaultCriteria.code : [],
-      fetchProcedure,
+      fetchBiology,
       defaultBiology.type,
       dispatch
     )

diff --git a/...ramView/components/LogicalOperator/components/CriteriaRightPanel/MedicationForm/index.tsx b/...ramView/components/LogicalOperator/components/CriteriaRightPanel/MedicationForm/index.tsx
@@ -9,7 +9,7 @@ import { MedicationDataType } from 'types'
 import useStyles from './styles'
 import { useAppDispatch, useAppSelector } from 'state'
 import { initSyncHierarchyTableEffect, MEDICATION_REQUEST, syncOnChangeFormValue } from 'utils/pmsi'
-import { initMedicationHierarchy } from 'state/medication'
+import { fetchMedication } from 'state/medication'
 import { PmsiListType } from 'state/pmsi'
 
 export const defaultMedication: MedicationDataType = {
@@ -58,7 +58,7 @@ const Index = (props: any) => {
       medicationHierarchy,
       selectedCriteria,
       defaultCriteria && defaultCriteria.code ? defaultCriteria.code : [],
-      initMedicationHierarchy,
+      fetchMedication,
       defaultMedication.type,
       dispatch,
       criteria && criteria.data?.atcHierarchy !== 'loading'

diff --git a/...View/components/LogicalOperator/components/CriteriaRightPanel/RequestForm/RequestForm.tsx b/...View/components/LogicalOperator/components/CriteriaRightPanel/RequestForm/RequestForm.tsx
@@ -51,13 +51,13 @@ const RequestForm: React.FC<RequestFormProps> = ({ parentId, goBack }) => {
       </Grid>
 
       <Grid className={classes.formContainer}>
-        {error && <Alert severity="error">Merci de selectionner une requête</Alert>}
+        {error && <Alert severity="error">Merci de sélectionner une requête</Alert>}
 
         <Grid className={classes.inputContainer} container>
           <Typography variant="h6">Mes requêtes</Typography>
 
           <FormLabel style={{ padding: '1em' }} component="legend">
-            Veuillez selectionner la requête que vous voulez integrer à votre requête actuelle :
+            Veuillez sélectionner la requête que vous voulez intégrer à votre requête actuelle :
           </FormLabel>
 
           <RequestList