Преглед изворни кода

feat(patient-register): hide non-human patient fields in registration interface, including sterilization, breed, chip number and gender sterilization
close #41

sw пре 1 месец
родитељ
комит
8f59b2d7ca

+ 3 - 3
src/API/patient/workActions.ts

@@ -17,10 +17,10 @@ export interface RegisterInfo {
   patient_age: string;
   patient_dob: string;
   patient_sex: string;
-  sex_neutered: string;
+  // sex_neutered: string;
   pregnancy_status: string;
-  chip_number: string;
-  variety: string;
+  // chip_number: string;
+  // variety: string;
   patient_type: string;
   ref_physician: string;
   operator_id: string;

+ 6 - 6
src/pages/patient/components/register.form.tsx

@@ -219,7 +219,7 @@ const BasicInfoForm: React.FC<BasicInfoFormProps> = ({ style, form }) => {
       >
         <Select options={genderOptions} />
       </Form.Item>
-      <Form.Item
+      {/* <Form.Item
         label={
           <FormattedMessage
             id="register.sexNeutered"
@@ -237,7 +237,7 @@ const BasicInfoForm: React.FC<BasicInfoFormProps> = ({ style, form }) => {
             defaultMessage: 'register.sexNeutered.placeholder',
           })}
         />
-      </Form.Item>
+      </Form.Item> */}
       <Form.Item
         label={
           <FormattedMessage
@@ -256,7 +256,7 @@ const BasicInfoForm: React.FC<BasicInfoFormProps> = ({ style, form }) => {
           buttonStyle="solid"
         />
       </Form.Item>
-      <Form.Item
+      {/* <Form.Item
         label={
           <FormattedMessage
             id="register.chipNumber"
@@ -274,8 +274,8 @@ const BasicInfoForm: React.FC<BasicInfoFormProps> = ({ style, form }) => {
             defaultMessage: 'register.chipNumber.placeholder',
           })}
         />
-      </Form.Item>
-      <Form.Item
+      </Form.Item> */}
+      {/* <Form.Item
         label={
           <FormattedMessage
             id="register.variety"
@@ -293,7 +293,7 @@ const BasicInfoForm: React.FC<BasicInfoFormProps> = ({ style, form }) => {
             defaultMessage: 'register.variety.placeholder',
           })}
         />
-      </Form.Item>
+      </Form.Item> */}
       {/* <Form.Item
         label={
           <FormattedMessage

+ 27 - 27
src/validation/patient/registerSchema.ts

@@ -24,10 +24,10 @@ const registerInfoSchema: Record<
   }),
   patient_dob: z.string().nonempty(),
   patient_sex: z.string().optional(),
-  sex_neutered: z.string().optional(),
+  // sex_neutered: z.string().optional(),
   pregnancy_status: z.string().optional(),
-  chip_number: z.string().optional(),
-  variety: z.string().optional(),
+  // chip_number: z.string().optional(),
+  // variety: z.string().optional(),
   // patient_type: z.string().nonempty(),
   ref_physician: z.string().optional(),
   operator_id: z.string().optional(),
@@ -100,14 +100,14 @@ export const registerFormFields = {
     message: 'Patient Sex is required',
     trigger: ['onChange', 'onBlur'],
   },
-  sex_neutered: {
-    label: 'Sex Neutered',
-    required: false,
-    requiredLabel: '',
-    validation: zodToAntdRules(registerformSchema.shape.sex_neutered),
-    message: 'Sex Neutered is optional',
-    trigger: ['onChange', 'onBlur'],
-  },
+  // sex_neutered: {
+  //   label: 'Sex Neutered',
+  //   required: false,
+  //   requiredLabel: '',
+  //   validation: zodToAntdRules(registerformSchema.shape.sex_neutered),
+  //   message: 'Sex Neutered is optional',
+  //   trigger: ['onChange', 'onBlur'],
+  // },
   pregnancy_status: {
     label: 'Pregnancy Status',
     required: false,
@@ -116,22 +116,22 @@ export const registerFormFields = {
     message: 'Pregnancy Status is optional',
     trigger: ['onChange', 'onBlur'],
   },
-  chip_number: {
-    label: 'Chip Number',
-    required: false,
-    requiredLabel: '',
-    validation: zodToAntdRules(registerformSchema.shape.chip_number),
-    message: 'Chip Number is optional',
-    trigger: ['onChange', 'onBlur'],
-  },
-  variety: {
-    label: 'Variety',
-    required: false,
-    requiredLabel: '',
-    validation: zodToAntdRules(registerformSchema.shape.variety),
-    message: 'Variety is optional',
-    trigger: ['onChange', 'onBlur'],
-  },
+  // chip_number: {
+  //   label: 'Chip Number',
+  //   required: false,
+  //   requiredLabel: '',
+  //   validation: zodToAntdRules(registerformSchema.shape.chip_number),
+  //   message: 'Chip Number is optional',
+  //   trigger: ['onChange', 'onBlur'],
+  // },
+  // variety: {
+  //   label: 'Variety',
+  //   required: false,
+  //   requiredLabel: '',
+  //   validation: zodToAntdRules(registerformSchema.shape.variety),
+  //   message: 'Variety is optional',
+  //   trigger: ['onChange', 'onBlur'],
+  // },
   // patient_type: {
   //   label: 'Patient Type',
   //   required: true,