Feat : add schedule with worklist

johnny990628 · May 26, 2023 · 63cbaa8 · 63cbaa8
1 parent 75e2404
commit 63cbaa8
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 6 deletions.
diff --git 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
@@ -220,7 +220,7 @@ const CustomReportForm = ({ lists, patient }) => {
                     </Button>
                 </Tooltip> */}
                 <Stack direction="row" spacing={1}>
-                    <Button
+                    {/* <Button
                         variant="contained"
                         onClick={() => {
                             apiAddWorklist(patient.id)
@@ -248,7 +248,7 @@ const CustomReportForm = ({ lists, patient }) => {
                         sx={{ borderRadius: '2rem', height: 'auto', color: 'white' }}
                     >
                         超音波開單
-                    </Button>
+                    </Button> */}
                     <Button
                         variant={Boolean(dicomAnchorEl) ? 'outlined' : 'contained'}
                         onClick={handleDicomClick}
@@ -258,6 +258,17 @@ const CustomReportForm = ({ lists, patient }) => {
                     >
                         超音波影像
                     </Button>
+                    <Button
+                        variant="outlined"
+                        onClick={() => {
+                            window.open(`${process.env.REACT_APP_BLUELIGHT_URL}?PatientID=${patient.id}`, '_blank').focus()
+                        }}
+                        startIcon={<Cast />}
+                        color="contrast"
+                        sx={{ borderRadius: '2rem', height: 'auto', color: 'contrast.main' }}
+                    >
+                        新分頁開啟影像
+                    </Button>
                 </Stack>
 
                 {/* <Badge badgeContent={patient?.report?.records.length ? patient?.report?.records.length - 1 : 0} color="primary">

diff --git a/src/Pages/Report/Report.js b/src/Pages/Report/Report.js
@@ -146,7 +146,7 @@ const Report = () => {
                         >
                             刪除
                         </Button>
-                        <Button
+                        {/* <Button
                             startIcon={<CloudDone />}
                             color="primary"
                             sx={{ color: 'primary.main', fontSize: '1.1rem' }}
@@ -173,7 +173,7 @@ const Report = () => {
                             }}
                         >
                             超音波開單
-                        </Button>
+                        </Button> */}
                     </Box>
                 ),
             },

diff --git 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()