diff --git a/src/Components/CustomForm/usePatientForm.js b/src/Components/CustomForm/usePatientForm.js
index c47aeda..212ccc4 100644
--- a/src/Components/CustomForm/usePatientForm.js
+++ b/src/Components/CustomForm/usePatientForm.js
@@ -104,7 +104,7 @@ const usePatientForm = () => {
}
const inputModel = [
- { name: 'blood', label: '抽血編號', type: 'text', value: blood, setValue: setBlood, required: false },
+ { name: 'blood', label: '抽血編號(非必填)', type: 'text', value: blood, setValue: setBlood, required: false },
{ name: 'id', label: '身分證字號', type: 'text', value: id, setValue: setId, required: true },
{ name: 'name', label: '姓名', type: 'text', value: name, setValue: setName, required: true },
{ name: 'phone', label: '電話', type: 'text', value: phone, setValue: setPhone, required: true },
diff --git a/src/Components/CustomReport/CustomReportForm.js b/src/Components/CustomReport/CustomReportForm.js
index b856231..62d0675 100644
--- a/src/Components/CustomReport/CustomReportForm.js
+++ b/src/Components/CustomReport/CustomReportForm.js
@@ -220,7 +220,7 @@ const CustomReportForm = ({ lists, patient }) => {
*/}
-
+ */}
+
{/*
diff --git a/src/Pages/Report/Report.js b/src/Pages/Report/Report.js
index 0943503..5c256b5 100644
--- a/src/Pages/Report/Report.js
+++ b/src/Pages/Report/Report.js
@@ -146,7 +146,7 @@ const Report = () => {
>
刪除
- }
color="primary"
sx={{ color: 'primary.main', fontSize: '1.1rem' }}
@@ -173,7 +173,7 @@ const Report = () => {
}}
>
超音波開單
-
+ */}
),
},
diff --git a/src/Redux/Slices/Schedule.js b/src/Redux/Slices/Schedule.js
index b7c8456..93d4170 100644
--- a/src/Redux/Slices/Schedule.js
+++ b/src/Redux/Slices/Schedule.js
@@ -9,6 +9,7 @@ import {
apiUpdateScheduleStatus,
} from '../../Axios/Schedule'
import { tokenExpirationHandler } from '../../Utils/ErrorHandle'
+import { apiAddWorklist } from '../../Axios/WorkList'
export const fetchSchedule = createAsyncThunk('schedule/fetchSchedule', async (params, thunkAPI) => {
try {
@@ -31,7 +32,15 @@ export const addSchedule = createAsyncThunk('schedule/addSchedule', async ({ pat
const reportResponse = await apiCreateReport({ patientID })
const reportID = reportResponse.data._id
const bloodResponse = await apiAddBlood({ patientID, number: blood })
- await apiAddSchedule({ patientID, reportID, procedureCode, status: 'wait-examination', bloodID: bloodResponse.data._id })
+ const worklistResponse = await apiAddWorklist(patientID)
+ await apiAddSchedule({
+ patientID,
+ reportID,
+ procedureCode,
+ status: 'wait-examination',
+ bloodID: bloodResponse.data._id,
+ StudyInstanceUID: worklistResponse.data.studyInstanceUID,
+ })
} catch (e) {
thunkAPI.dispatch(tokenExpirationHandler(e.response))
return thunkAPI.rejectWithValue()