update: Fix laboratory and visits default filter date values

informatici · Sep 25, 2023 · 39f4743 · 39f4743
1 parent 2bb3ec7
commit 39f4743
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 5 deletions.
diff --git a/src/components/accessories/opds/Opds.tsx b/src/components/accessories/opds/Opds.tsx
@@ -24,7 +24,6 @@ export const Opds: FC = () => {
   const fields = initialFilterFields;
   const { t } = useTranslation();
   const dispatch = useDispatch();
-  const navigate = useNavigate();
 
   const [filter, setFilter] = useState({} as TFilterValues);
 

diff --git a/src/state/laboratories/actions.ts b/src/state/laboratories/actions.ts
@@ -214,8 +214,8 @@ export const searchLabs =
     });
     labsApi
       .getLaboratoryForPrint({
-        dateTo: query.dateTo ?? moment().add("-30", "days").toISOString(),
-        dateFrom: query.dateFrom ?? moment().toISOString(),
+        dateFrom: query.dateFrom ?? moment().add("-30", "days").toISOString(),
+        dateTo: query.dateTo ?? moment().toISOString(),
         examName: query.examName,
         patientCode: !isNaN(query.patientCode) ? query.patientCode : undefined,
         status: query.status ?? undefined,

diff --git a/src/state/opds/actions.ts b/src/state/opds/actions.ts
@@ -237,8 +237,8 @@ export const searchOpds =
       .getOpdByDates({
         sex: query.sex,
         newPatient: query.newPatient,
-        dateTo: query.dateTo ?? moment().add("-30", "days").toISOString(),
-        dateFrom: query.dateFrom ?? moment().toISOString(),
+        dateFrom: query.dateFrom ?? moment().add("-30", "days").toISOString(),
+        dateTo: query.dateTo ?? moment().toISOString(),
         ageFrom: isNaN(query.ageFrom) ? null : query.ageFrom,
         ageTo: isNaN(query.ageTo) ? null : query.ageTo,
         diseaseCode: query.diseaseCode,