fix: add value-quantity to requestor and saveFilters for observation

aphp · Jul 12, 2024 · 79510b6 · 79510b6
1 parent 96187ee
commit 79510b6
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/src/mappers/filters.ts b/src/mappers/filters.ts
@@ -569,7 +569,7 @@ const mapAdministrationToRequestParams = (filters: MedicationFilters) => {
 
 const mapBiologyToRequestParams = (filters: BiologyFilters) => {
   const { anabio, loinc, validatedStatus, nda, endDate, startDate, executiveUnits, encounterStatus } = filters
-  const requestParams: string[] = []
+  const requestParams: string[] = ['value-quantity=ge0,le0', 'subject.active=true']
   if ((anabio && anabio.length > 0) || (loinc && loinc.length > 0)) {
     const key = `${ObservationParamsKeys.ANABIO_LOINC}=`
     let _anabio = ''

diff --git a/src/utils/cohortCreation.ts b/src/utils/cohortCreation.ts
@@ -82,7 +82,7 @@ import { hospitForm } from 'data/hospitData'
 import { editAllCriteria, editAllCriteriaGroup, pseudonimizeCriteria, buildCohortCreation } from 'state/cohortCreation'
 import { AppDispatch } from 'state'
 
-const REQUETEUR_VERSION = 'v1.4.4'
+const REQUETEUR_VERSION = 'v1.4.5'
 
 const IPP_LIST_FHIR = 'identifier.value'
 
@@ -507,7 +507,7 @@ const constructFilterFhir = (criterion: SelectedCriteriaType, deidentified: bool
 
     case CriteriaType.OBSERVATION: {
       const unreducedFilterFhir = [
-        `subject.active=true&${OBSERVATION_STATUS}=${BiologyStatus.VALIDATED}`,
+        `subject.active=true&${OBSERVATION_STATUS}=${BiologyStatus.VALIDATED}&value-quantity=ge0,le0`,
         filtersBuilders(OBSERVATION_CODE, buildLabelObjectFilter(criterion.code, BIOLOGY_HIERARCHY_ITM_ANABIO)),
         filtersBuilders(ENCOUNTER_SERVICE_PROVIDER, buildEncounterServiceFilter(criterion.encounterService)),
         filtersBuilders(ENCOUNTER_STATUS_REFERENCE, buildLabelObjectFilter(criterion.encounterStatus)),
@@ -1411,6 +1411,7 @@ const unbuildObservationCriteria = async (element: RequeteurCriteriaType): Promi
         case OBSERVATION_VALUE:
         case OBSERVATION_STATUS:
         case 'subject.active':
+        case 'value-quantity':
           break
         default:
           currentCriterion.error = true