fix: fix version 2.29.0

* fix: removed alerts in medication and ccam - Ref gestion-de-projet#2406 * fix: changed criteria icons - Ref gestion-de-projet#2236 * fix: fixed encounter form empty form * fix: fix ccam display when no value into dataTablePMSI * fix: fix ccam display when no value into dataTablePMSI --------- Co-authored-by: manelleg <manelle.gueriouz@aphp.fr>
aphp · Dec 5, 2023 · 56eddd0 · 56eddd0
1 parent 5f1b467
commit 56eddd0
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 38 deletions.
diff --git a/...omponents/LogicalOperator/components/CriteriaRightPanel/CCAM/components/Form/CCAMForm.tsx b/...omponents/LogicalOperator/components/CriteriaRightPanel/CCAM/components/Form/CCAMForm.tsx
@@ -7,7 +7,6 @@ import {
   FormLabel,
   Grid,
   IconButton,
-  Link,
   Switch,
   TextField,
   Typography,
@@ -96,18 +95,6 @@ const CcamForm: React.FC<CcamFormProps> = (props) => {
           </Alert>
         )}
 
-        <Alert severity="warning">
-          Données actuellement disponibles : PMSI ORBIS. Pour plus d'informations sur les prochaines intégrations de
-          données, veuillez vous référer au tableau trimestriel de disponibilité des données disponible{' '}
-          <Link
-            href="https://eds.aphp.fr/sites/default/files/2023-01/EDS_Disponibilite_donnees_site_EDS_202212.pdf"
-            target="_blank"
-            rel="noopener"
-          >
-            ici
-          </Link>
-        </Alert>
-
         <Grid className={classes.inputContainer} container>
           <Typography variant="h6">Actes CCAM</Typography>
 

diff --git a/...agramView/components/LogicalOperator/components/CriteriaRightPanel/CriteriaRightPanel.tsx b/...agramView/components/LogicalOperator/components/CriteriaRightPanel/CriteriaRightPanel.tsx
@@ -53,17 +53,17 @@ const CriteriaListItem: React.FC<CriteriaListItemProps> = (props) => {
       case RessourceType.CONDITION:
         return <ArticleIcon />
       case RessourceType.PROCEDURE:
-        return <ContactPageIcon />
-      case RessourceType.CLAIM:
         return <LocalHospitalIcon />
+      case RessourceType.CLAIM:
+        return <ContactPageIcon />
       case RessourceType.MEDICATION:
         return <VaccinesIcon />
       case RessourceType.BIO_MICRO:
         return <BiotechIcon />
       case RessourceType.OBSERVATION:
-        return <CoronavirusIcon />
-      case RessourceType.MICROBIOLOGIE:
         return <ScienceIcon />
+      case RessourceType.MICROBIOLOGIE:
+        return <CoronavirusIcon />
       case RessourceType.PHYSIOLOGIE:
         return <MonitorHeartIcon />
       case RessourceType.IMAGING:

diff --git a/...gramView/components/LogicalOperator/components/CriteriaRightPanel/EncounterForm/index.tsx b/...gramView/components/LogicalOperator/components/CriteriaRightPanel/EncounterForm/index.tsx
@@ -102,6 +102,8 @@ const EncounterForm = ({ criteria, selectedCriteria, goBack, onChangeSelectedCri
   useEffect(() => {
     setError(Error.NO_ERROR)
     if (
+      occurrence === 0 &&
+      occurrenceComparator === Comparators.EQUAL &&
       age[0] === null &&
       age[1] === null &&
       duration[0] === null &&
@@ -117,8 +119,8 @@ const EncounterForm = ({ criteria, selectedCriteria, goBack, onChangeSelectedCri
       provenance?.length === 0 &&
       admission?.length === 0 &&
       encounterService?.length === 0 &&
-      !encounterStartDate &&
-      !encounterEndDate
+      encounterStartDate === null &&
+      encounterEndDate === null
     ) {
       setError(Error.EMPTY_FORM)
     }
@@ -137,7 +139,9 @@ const EncounterForm = ({ criteria, selectedCriteria, goBack, onChangeSelectedCri
     admission,
     encounterService,
     encounterStartDate,
-    encounterEndDate
+    encounterEndDate,
+    occurrence,
+    occurrenceComparator
   ])
 
   const onSubmit = () => {

diff --git a/...lOperator/components/CriteriaRightPanel/MedicationForm/components/Form/MedicationForm.tsx b/...lOperator/components/CriteriaRightPanel/MedicationForm/components/Form/MedicationForm.tsx
@@ -9,7 +9,6 @@ import {
   FormLabel,
   Grid,
   IconButton,
-  Link,
   Radio,
   RadioGroup,
   Switch,
@@ -127,18 +126,6 @@ const MedicationForm: React.FC<MedicationFormProps> = (props) => {
           </Alert>
         )}
 
-        <Alert severity="warning">
-          Données actuellement disponibles : Circuit du médicament ORBIS. Pour plus d'informations sur les prochaines
-          intégrations de données, veuillez vous référer au tableau trimestriel de disponibilité des données disponible{' '}
-          <Link
-            href="https://eds.aphp.fr/sites/default/files/2023-01/EDS_Disponibilite_donnees_site_EDS_202212.pdf"
-            target="_blank"
-            rel="noopener"
-          >
-            ici
-          </Link>
-        </Alert>
-
         <Grid className={classes.inputContainer} container>
           <Typography variant="h6">Médicaments</Typography>
           <TextField

diff --git a/src/components/DataTable/DataTablePmsi.tsx b/src/components/DataTable/DataTablePmsi.tsx
@@ -112,10 +112,10 @@ const DataTablePmsiLine: React.FC<{
         <Typography className={classes.libelle}>{source}</Typography>
       </TableCellWrapper>
       <TableCellWrapper>
-        <Typography className={classes.libelle}>{codeToDisplay?.code}</Typography>
+        <Typography className={classes.libelle}>{codeToDisplay?.code ?? 'Non renseigné'}</Typography>
       </TableCellWrapper>
       <TableCellWrapper>
-        <Typography className={classes.libelle}>{codeToDisplay?.display}</Typography>
+        <Typography className={classes.libelle}>{codeToDisplay?.display ?? 'Non renseigné'}</Typography>
       </TableCellWrapper>
       {selectedTab === PMSI.DIAGNOSTIC && <TableCellWrapper>{type}</TableCellWrapper>}
       <TableCellWrapper>{serviceProvider ?? '-'}</TableCellWrapper>

diff --git a/src/services/aphp/callApi.ts b/src/services/aphp/callApi.ts
@@ -36,7 +36,7 @@ import { Observation } from 'fhir/r4'
 import { getApiResponseResourceOrThrow, getApiResponseResourcesOrThrow } from 'utils/apiHelpers'
 import { idSort, labelSort } from 'utils/alphabeticalSort'
 import { capitalizeFirstLetter } from 'utils/capitalize'
-import { CODE_HIERARCHY_EXTENSION_NAME } from '../../constants'
+import { CODE_HIERARCHY_EXTENSION_NAME, PROCEDURE_HIERARCHY } from '../../constants'
 import { Direction, Order, SearchByTypes } from 'types/searchCriterias'
 
 const paramValuesReducerWithPrefix =
@@ -413,8 +413,7 @@ export const fetchProcedure = async (args: fetchProcedureProps): FHIR_Bundle_Pro
   if (offset) options = [...options, `offset=${offset}`] // eslint-disable-line
   if (_sort) options = [...options, `_sort=${_sortDirection}${_sort},id`] // eslint-disable-line
   if (subject) options = [...options, `subject=${subject}`] // eslint-disable-line
-  if (code)
-    options = [...options, `code=${encodeURIComponent('https://terminology.eds.aphp.fr/aphp-orbis-ccam|') + code}`] // eslint-disable-line
+  if (code) options = [...options, `code=${encodeURIComponent(`${PROCEDURE_HIERARCHY}|`) + code}`] // eslint-disable-line
   if (source) options = [...options, `source=${source}`]
   if (_text) options = [...options, `_text=${encodeURIComponent(_text)}`] // eslint-disable-line
   if (status)