Skip to content

Commit d8dd371

Browse files
committed
fix(CARE-27): fix only doctor's patients
1 parent beae613 commit d8dd371

File tree

4 files changed

+11
-7
lines changed

4 files changed

+11
-7
lines changed

frontend/src/apis/doctor.api.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
import queryString from 'query-string'
22
import { PatientOfDoctor } from 'src/types/users.type'
3-
import { PaginationParams, PagingResponse } from 'src/types/utils.type'
3+
import { PaginationParams, PagingResponse, SearchParams } from 'src/types/utils.type'
44
import http from 'src/utils/http'
55

66
const URL_DOCTORS_MY_PATIENT = 'doctors/my-patients'
77

88
const doctorApi = {
9-
getMyPatients: (examinationFilter: PaginationParams) => {
9+
getMyPatients: (examinationFilter: PaginationParams & SearchParams) => {
1010
const patientsFilterParams = queryString.stringify(examinationFilter)
1111
return http.get<PagingResponse<PatientOfDoctor[]>>(`${URL_DOCTORS_MY_PATIENT}?${patientsFilterParams}`)
1212
}

frontend/src/apis/patient.api.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
import queryString from 'query-string'
22
import { ExaminationType } from 'src/types/examination.type'
33
import { PatientOfDoctor } from 'src/types/users.type'
4-
import { PaginationParams, PagingResponse } from 'src/types/utils.type'
4+
import { PaginationParams, PagingResponse, SearchParams } from 'src/types/utils.type'
55
import http from 'src/utils/http'
66

77
const URL_PATIENTS = 'patients'
88

99
const patientApi = {
10-
getPatients: (patientFilter: { keyword: string }) => {
10+
getPatients: (patientFilter: SearchParams) => {
1111
const patientsFilterParams = queryString.stringify(patientFilter)
1212
return http.get<PagingResponse<PatientOfDoctor[]>>(`${URL_PATIENTS}?${patientsFilterParams}`)
1313
},

frontend/src/pages/schedule/Schedule.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,14 @@ import { Controller, SubmitHandler, useForm } from 'react-hook-form'
1111
import { AppointmentScheduleSchema, appointmentScheduleSchema } from 'src/utils/rules'
1212
import { yupResolver } from '@hookform/resolvers/yup'
1313
import { PatientOfDoctor } from 'src/types/users.type'
14-
import patientApi from 'src/apis/patient.api'
1514
import { useMutation, useQuery, useQueryClient } from 'react-query'
1615
import SearchForm from 'src/components/form/SearchForm'
1716
import meetingsApi from 'src/apis/meetings.api'
1817
import Loading from 'src/components/loading/Loading'
1918
import { MeetingReqBody, MeetingReqBodyUpdate } from 'src/types/meetings.type'
2019
import dayjs from 'dayjs'
2120
import utc from 'dayjs/plugin/utc'
21+
import doctorApi from 'src/apis/doctor.api'
2222

2323
dayjs.extend(utc)
2424

@@ -128,8 +128,8 @@ export default function AppointmentSchedule(props: AppointmentScheduleProps) {
128128
isSuccess,
129129
isLoading
130130
} = useQuery({
131-
queryKey: ['patients', getValues('search.keyword')],
132-
queryFn: () => patientApi.getPatients({ keyword: getValues('search.keyword') }),
131+
queryKey: ['myPatients', getValues('search.keyword')],
132+
queryFn: () => doctorApi.getMyPatients({ keyword: getValues('search.keyword'), page: 1, size: 1000000 }),
133133
enabled: isSearching
134134
})
135135

frontend/src/types/utils.type.ts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,10 @@ export type PaginationParams = {
2828
size: number
2929
}
3030

31+
export type SearchParams = {
32+
keyword?: string
33+
}
34+
3135
export type PagingResponse<Data> = {
3236
data: Data
3337
totalPages: number

0 commit comments

Comments
 (0)