|
@@ -17,6 +17,7 @@ import RegisterAvailableList from './components/register.available.list';
|
|
|
import { RegisterInfo, registerWork } from '@/API/patient/workActions';
|
|
|
import useRegisterState from '@/hooks/useRegisterState';
|
|
|
import registerformSchema from '@/validation/patient/registerSchema';
|
|
|
+import registerToExam from '@/domain/patient/registerToExam';
|
|
|
import dayjs from 'dayjs';
|
|
|
import utc from 'dayjs/plugin/utc';
|
|
|
dayjs.extend(utc);
|
|
@@ -29,7 +30,7 @@ const RegisterPage: React.FC = () => {
|
|
|
const [form] = Form.useForm();
|
|
|
const { selectedViews, currentPatientType } = useRegisterState();
|
|
|
|
|
|
-const handleRegister = async (): Promise<void> => {
|
|
|
+const handleRegister = async (): Promise<{ success: boolean; data?: any }> => {
|
|
|
try {
|
|
|
let values = form.getFieldsValue();
|
|
|
const formatDob = values.patient_dob
|
|
@@ -47,7 +48,7 @@ const handleRegister = async (): Promise<void> => {
|
|
|
// message.error(JSON.stringify(validateResult.error, null, 2));
|
|
|
console.log(JSON.stringify(validateResult.error, null, 2));
|
|
|
|
|
|
- return;
|
|
|
+ return { success: false };
|
|
|
}
|
|
|
const registerInfo: RegisterInfo = {
|
|
|
...values,
|
|
@@ -62,11 +63,13 @@ const handleRegister = async (): Promise<void> => {
|
|
|
const response = await registerWork(registerInfo);
|
|
|
console.log('Work registered successfully:', response);
|
|
|
message.info('Work registered successfully');
|
|
|
+ return { success: true, data: response.data };
|
|
|
} catch (error) {
|
|
|
console.error('Error registering work:', error);
|
|
|
message.error(
|
|
|
'Error registering work, please check the console for details.'
|
|
|
);
|
|
|
+ return { success: false };
|
|
|
}
|
|
|
};
|
|
|
|
|
@@ -174,7 +177,12 @@ const handleRegister = async (): Promise<void> => {
|
|
|
<Button type="primary" onClick={handleRegister}>
|
|
|
注册
|
|
|
</Button>
|
|
|
- <Button type="default">检查</Button>
|
|
|
+ <Button type="default" onClick={async () => {
|
|
|
+ const registerResult = await handleRegister();
|
|
|
+ if (registerResult.success) {
|
|
|
+ await registerToExam(registerResult.data);
|
|
|
+ }
|
|
|
+ }}>检查</Button>
|
|
|
</Space>
|
|
|
</>
|
|
|
);
|