Skip to content

Commit

Permalink
avancées
Browse files Browse the repository at this point in the history
  • Loading branch information
aetchego committed Dec 9, 2024
1 parent 10a68cd commit 9540e29
Show file tree
Hide file tree
Showing 20 changed files with 512 additions and 291 deletions.
250 changes: 250 additions & 0 deletions public/config.local.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,250 @@
{
"core": {
"codeSystems": {
"docStatus": "http://hl7.org/fhir/CodeSystem/composition-status"
},
"extensions": {
"codeHierarchy": "https://terminology.eds.aphp.fr/fhir/profile/valueSet/extension/hierarchy-path-id",
"conceptMapHierarchy": "https://terminology.eds.aphp.fr/fhir/profile/conceptMap/extension/group-source-hierarchy-path",
"patientLastEnconterUrl": "https://terminology.eds.aphp.fr/fhir/profile/patient/extension/last-encounter",
"patientTotalAgeDaysExtensionUrl": "https://terminology.eds.aphp.fr/fhir/profile/patient/extension/total-age-day",
"patientTotalAgeMonthsExtensionUrl": "https://terminology.eds.aphp.fr/fhir/profile/patient/extension/total-age-month"
},
"perimeterSourceTypeHierarchy": [
"AP-HP",
"Groupe hospitalier (GH)",
"GHU",
"Hôpital",
"Pôle/DMU",
"Unité Fonctionnelle (UF)"
],
"valueSets": {
"demographicGender": {
"url": "https://terminology.eds.aphp.fr/aphp-orbis-patient-genre"
},
"encounterAdmission": {
"url": "https://terminology.eds.aphp.fr/aphp-orbis-visit-type-admission"
},
"encounterAdmissionMode": {
"url": "https://terminology.eds.aphp.fr/aphp-orbis-visit-motif-admission"
},
"encounterDestination": {
"url": "https://terminology.eds.aphp.fr/aphp-orbis-visit-destination"
},
"encounterEntryMode": {
"url": "https://terminology.eds.aphp.fr/aphp-orbis-visit-mode-entree"
},
"encounterExitMode": {
"url": "https://terminology.eds.aphp.fr/aphp-orbis-visit-mode-sortie"
},
"encounterExitType": {
"url": "https://terminology.eds.aphp.fr/aphp-orbis-visit-type-sortie"
},
"encounterFileStatus": {
"url": "https://terminology.eds.aphp.fr/aphp-orbis-visite-status"
},
"encounterProvenance": {
"url": "https://terminology.eds.aphp.fr/aphp-orbis-visit-provenance"
},
"encounterSejourType": {
"url": "https://terminology.eds.aphp.fr/aphp-orbis-type-sejour"
},
"encounterStatus": {
"url": "http://hl7.org/fhir/CodeSystem/encounter-status"
},
"encounterVisitType": {
"url": "https://terminology.eds.aphp.fr/aphp-orbis-visit-type"
}
}
},
"features": {
"claim": {
"enabled": true,
"valueSets": {
"claimHierarchy": {
"url": "https://terminology.eds.aphp.fr/aphp-orbis-ghm"
}
}
},
"cohort": {
"enabled": true,
"shortCohortLimit": 2000
},
"condition": {
"enabled": true,
"valueSets": {
"conditionHierarchy": {
"url": "https://smt.esante.gouv.fr/terminologie-cim-10/"
},
"conditionStatus": {
"url": "https://terminology.eds.aphp.fr/aphp-orbis-condition-status"
}
}
},
"contact": {
"enabled": false
},
"export": {
"enabled": true,
"exportLinesLimit": 300000
},
"feasabilityReport": {
"enabled": true
},
"imaging": {
"enabled": true,
"extensions": {
"imagingStudyUid": "https://terminology.eds.aphp.fr/imaging/studyUid"
},
"valueSets": {
"imagingModalities": {
"url": "https://dicom.nema.org/medical/dicom/current/output/chtml/part16/sect_CID_33.html"
}
}
},
"locationMap": {
"enabled": true
},
"medication": {
"enabled": true,
"valueSets": {
"medicationAdministrations": {
"url": "https://terminology.eds.aphp.fr/aphp-orbis-medicament-voie-administration"
},
"medicationAtc": {
"url": "https://terminology.eds.aphp.fr/atc"
},
"medicationAtcOrbis": {
"url": "https://terminology.eds.aphp.fr/aphp-orbis-medicament-atc-article"
},
"medicationPrescriptionTypes": {
"url": "https://terminology.eds.aphp.fr/aphp-medicament-type-prescription"
},
"medicationUcd": {
"url": "https://terminology.eds.aphp.fr/smt-medicament-ucd"
}
}
},
"observation": {
"enabled": true,
"valueSets": {
"biologyHierarchyAnabio": {
"url": "https://terminology.eds.aphp.fr/aphp-itm-anabio"
},
"biologyHierarchyLoinc": {
"url": "https://terminology.eds.aphp.fr/aphp-itm-loinc"
}
}
},
"procedure": {
"enabled": true,
"valueSets": {
"procedureHierarchy": {
"url": "https://www.atih.sante.fr/plateformes-de-transmission-et-logiciels/logiciels-espace-de-telechargement/id_lot/3550"
}
}
},
"questionnaires": {
"enabled": true,
"valueSets": {
"analgesieType": {
"url": "https://aphp.fr/ig/fhir/eds/ValueSet/aphp-eds-aph-mat-type-anesth-vs"
},
"birthDeliveryWay": {
"url": "https://aphp.fr/ig/fhir/eds/ValueSet/aphp-eds-aph-mat-voie-acc-vs"
},
"cSectionModality": {
"url": "https://aphp.fr/ig/fhir/eds/ValueSet/aphp-eds-aph-mat-cesarienne-vs"
},
"childBirthMode": {
"url": "https://aphp.fr/ig/fhir/eds/ValueSet/aphp-eds-aph-mat-mode-travail2-vs"
},
"chirurgicalGesture": {
"url": "https://aphp.fr/ig/fhir/eds/ValueSet/aphp-eds-aph-mat-hos-type-geste-chir-fo-vs"
},
"conditionPerineum": {
"url": "https://aphp.fr/ig/fhir/eds/ValueSet/aphp-eds-aph-mat-perinee-vs"
},
"exitDiagnostic": {
"url": "https://aphp.fr/ig/fhir/eds/ValueSet/aphp-eds-aph-mat-hos-diagnostic-sortie-vs"
},
"exitFeedingMode": {
"url": "https://aphp.fr/ig/fhir/eds/ValueSet/aphp-eds-aph-mat-allaitement-vs"
},
"exitPlaceType": {
"url": "https://aphp.fr/ig/fhir/eds/ValueSet/aphp-eds-aph-mat-hos-lieu-sortie-sn-vs"
},
"feedingType": {
"url": "https://aphp.fr/ig/fhir/eds/ValueSet/aphp-eds-aph-mat-allaitement-vs"
},
"imgIndication": {
"url": "https://aphp.fr/ig/fhir/eds/ValueSet/aphp-eds-aph-mat-indications-img-vs"
},
"instrumentType": {
"url": "https://aphp.fr/ig/fhir/eds/ValueSet/aphp-eds-aph-mat-type-instru-vs"
},
"laborOrCesareanEntry": {
"url": "https://aphp.fr/ig/fhir/eds/ValueSet/aphp-eds-aph-mat-hos-pres-entree-trav-vs"
},
"maternalRisks": {
"url": "https://aphp.fr/ig/fhir/eds/ValueSet/aphp-eds-aph-mat-risq-atcd-mat-vs"
},
"maturationModality": {
"url": "https://aphp.fr/ig/fhir/eds/ValueSet/aphp-eds-aph-mat-hos-mod-mat-cervicale-vs"
},
"maturationReason": {
"url": "https://aphp.fr/ig/fhir/eds/ValueSet/aphp-eds-aph-mat-maturation-vs"
},
"obstetricalGestureDuringLabor": {
"url": "https://aphp.fr/ig/fhir/eds/ValueSet/aphp-eds-aph-mat-hos-geste-manoeuv-obst-vs"
},
"pathologyDuringLabor": {
"url": "https://aphp.fr/ig/fhir/eds/ValueSet/aphp-eds-aph-mat-patho-vs"
},
"pregnancyMode": {
"url": "https://aphp.fr/ig/fhir/eds/ValueSet/aphp-eds-aph-mat-obt-gross-vs"
},
"presentationAtDelivery": {
"url": "https://aphp.fr/ig/fhir/eds/ValueSet/aphp-eds-aph-mat-hos-present-accoucheme-vs"
},
"risksOrComplicationsOfPregnancy": {
"url": "https://aphp.fr/ig/fhir/eds/ValueSet/aphp-eds-aph-mat-risq-gross-vs"
},
"risksRelatedToObstetricHistory": {
"url": "https://aphp.fr/ig/fhir/eds/ValueSet/aphp-eds-aph-mat-risq-atcd-obs-vs"
}
}
}
},
"fhir": {
"baseUrl": "http://localhost:8001/api/fhir",
"codeSystems": {
"docStatus": "http://hl7.org/fhir/CodeSystem/composition-status"
},
"extensions": {
"codeHierarchy": "https://terminology.eds.aphp.fr/fhir/profile/valueSet/extension/hierarchy-path-id",
"conceptMapHierarchy": "https://terminology.eds.aphp.fr/fhir/profile/conceptMap/extension/group-source-hierarchy-path"
},
"valueSets": {}
},
"labels": {
"exploration": "Exploration",
"search": "Recherche"
},
"system": {
"backendUrl": "/api/back",
"codeDisplayJWT": "ArrowUp,ArrowUp,ArrowDown,ArrowDown",
"jToolUsers": [],
"mailSupport": "",
"oidc": {
"clientId": "cohort360",
"issuer": "http://172.26.0.17:8080/realms/cohort/protocol/openid-connect/auth",
"redirectUri": "http://localhost:8085",
"responseType": "code",
"scope": "openid",
"state": "mlTPASu3bwdFmFUSK4G4ImecrsKW9pQ7SDdf7uB"
},
"userTrackingBlacklist": [],
"wsProtocol": "ws://"
}
}
37 changes: 25 additions & 12 deletions src/components/Dashboard/BiologyList/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,9 @@ import { BlockWrapper } from 'components/ui/Layout'
import Button from 'components/ui/Button'
import DatesRangeFilter from 'components/Filters/DatesRangeFilter'
import DisplayDigits from 'components/ui/Display/DisplayDigits'
import EncounterStatusFilter from 'components/Filters/EncounterStatusFilter'
import ExecutiveUnitsFilter from 'components/Filters/ExecutiveUnitsFilter'
import IppFilter from 'components/Filters/IppFilter'
import List from 'components/ui/List'
import Modal from 'components/ui/Modal'
import NdaFilter from 'components/Filters/NdaFilter'
import SearchInput from 'components/ui/Searchbar/SearchInput'
import TextInput from 'components/Filters/TextInput'

Expand All @@ -37,6 +34,7 @@ import {
fetchAnabioCodes as fetchAnabioCodesApi
} from 'services/aphp/serviceBiology'
import { checkIfPageAvailable, cleanSearchParams, handlePageError } from 'utils/paginationUtils'
import SelectInput from 'components/Filters/SelectInput'

type BiologyListProps = {
deidentified?: boolean
Expand Down Expand Up @@ -317,8 +315,17 @@ const BiologyList = ({ deidentified }: BiologyListProps) => {
onClose={() => setToggleFilterByModal(false)}
onSubmit={(newFilters) => addFilters({ ...filters, ...newFilters })}
>
{!deidentified && <NdaFilter name={FilterKeys.NDA} value={nda} />}
{!deidentified && <IppFilter name={FilterKeys.IPP} value={ipp ?? ''} />}
{!deidentified && (
<TextInput name={FilterKeys.NDA} value={nda} label="NDA :" placeholder="Exemple: 6601289264,141740347" />
)}
{!deidentified && (
<TextInput
name={FilterKeys.IPP}
value={ipp}
label="IPP :"
placeholder="'Exemple: 8000000000001,8000000000002'"
/>
)}
<AnabioFilter name={FilterKeys.ANABIO} value={anabio} onFetch={fetchAnabioCodesApi} />
<LoincFilter name={FilterKeys.LOINC} value={loinc} onFetch={fetchLoincCodesApi} />
<DatesRangeFilter values={[startDate, endDate]} names={[FilterKeys.START_DATE, FilterKeys.END_DATE]} />
Expand All @@ -327,10 +334,11 @@ const BiologyList = ({ deidentified }: BiologyListProps) => {
value={executiveUnits}
name={FilterKeys.EXECUTIVE_UNITS}
/>
<EncounterStatusFilter
<SelectInput
value={encounterStatus}
name={FilterKeys.ENCOUNTER_STATUS}
encounterStatusList={encounterStatusList}
options={encounterStatusList}
label="Statut de la visite associée :"
/>
</Modal>
<Modal
Expand Down Expand Up @@ -428,19 +436,23 @@ const BiologyList = ({ deidentified }: BiologyListProps) => {
</Grid>
{!deidentified && (
<Grid item xs={12}>
<NdaFilter
<TextInput
name="nda"
disabled={isReadonlyFilterInfoModal}
value={selectedSavedFilter?.filterParams.filters.nda ?? ''}
value={selectedSavedFilter?.filterParams.filters.nda || ''}
label="NDA :"
placeholder="Exemple: 6601289264,141740347"
/>
</Grid>
)}
{!deidentified && (
<Grid item xs={12}>
<IppFilter
<TextInput
disabled={isReadonlyFilterInfoModal}
name={FilterKeys.IPP}
value={selectedSavedFilter?.filterParams.filters.ipp ?? ''}
label="IPP :"
placeholder="'Exemple: 8000000000001,8000000000002'"
/>
</Grid>
)}
Expand Down Expand Up @@ -479,11 +491,12 @@ const BiologyList = ({ deidentified }: BiologyListProps) => {
/>
</Grid>
<Grid item xs={12}>
<EncounterStatusFilter
<SelectInput
disabled={isReadonlyFilterInfoModal}
value={selectedSavedFilter?.filterParams.filters.encounterStatus || []}
name={FilterKeys.ENCOUNTER_STATUS}
encounterStatusList={encounterStatusList}
options={encounterStatusList}
label="Statut de la visite associée :"
/>
</Grid>
</Grid>
Expand Down
Loading

0 comments on commit 9540e29

Please sign in to comment.