update: Show patient full name in patient input and fix field being r…

…eset after filter submitted
informatici · Sep 28, 2023 · a4653a4 · a4653a4
1 parent 39f4743
commit a4653a4
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 11 deletions.
diff --git a/src/components/accessories/laboratory/Exams.tsx b/src/components/accessories/laboratory/Exams.tsx
@@ -83,9 +83,7 @@ export const Exams: FC = () => {
   }, []);
 
   useEffect(() => {
-    if (!isEmpty(filter.patientCode)) {
-      dispatch(getPatientThunk(filter.patientCode?.toString() ?? "0"));
-    }
+    console.log(JSON.stringify(filter));
     dispatch(searchLabs({ ...filter, paged: true }));
   }, [filter]);
 

diff --git a/src/components/accessories/laboratory/filter/ExamFilterForm.tsx b/src/components/accessories/laboratory/filter/ExamFilterForm.tsx
@@ -49,10 +49,6 @@ export const ExamFilterForm: FC<IExamFilterProps> = ({
   const [expanded, setExpanded] = useState(true);
   const [openResetConfirmation, setOpenResetConfirmation] = useState(false);
 
-  const patient = useSelector(
-    (state: IState) => state.patients.selectedPatient.data
-  );
-
   const validationSchema = object({
     examName: string(),
     dateFrom: string()
@@ -266,9 +262,6 @@ export const ExamFilterForm: FC<IExamFilterProps> = ({
                       isValid={isValid("patientCode")}
                       errorText={getErrorText("patientCode")}
                       onBlur={onBlurCallback("patientCode")}
-                      initialValue={
-                        isEmpty(formik.values.patientCode) ? undefined : patient
-                      }
                     />
                   </div>
                 </Permission>

diff --git a/src/components/accessories/patientPicker/PatientPicker.tsx b/src/components/accessories/patientPicker/PatientPicker.tsx
@@ -202,7 +202,7 @@ const PatientPicker: FC<IProps> = ({
           label={label}
           name={fieldName}
           variant="outlined"
-          value={value.firstName ?? ""}
+          value={value.name ?? ""}
           type={"text"}
           onBlur={handleOnBlur}
           onMouseDown={handleCriteriaChange}

diff --git a/src/libraries/formDataHandling/functions.ts b/src/libraries/formDataHandling/functions.ts
@@ -173,6 +173,7 @@ export const updateFilterFields = (
     Object.keys(values!).forEach((key) => {
       let value = values![key];
       if (key === "status") return (draft[key as string].value = value);
+      if (key === "patientCode") return (draft[key as string].value = value);
       if (draft[key as string]) {
         return (draft[key as string].value = moment(value).isValid()
           ? parseDate(value as string, withTimezone)

diff --git a/src/mockServer/fixtures/patientDTO.js b/src/mockServer/fixtures/patientDTO.js