提交merge1.3

2025-12-27 15:30:40 +08:00
parent 088861f66e
commit 3c497417dc
167 changed files with 0 additions and 17577 deletions
--- a/openhis-ui-vue3/src/views/basicservices/registrationfee/index.vue
+++ b/openhis-ui-vue3/src/views/basicservices/registrationfee/index.vue
@@ -757,11 +757,7 @@ const transformFormData = (form) => {
    ybNo,
    title,
    comment,
-<<<<<<< HEAD
-    practitionerId,
-=======
    busNo,
->>>>>>> v1.3
  } = form.value;

  return {
@@ -779,11 +775,7 @@ const transformFormData = (form) => {
      appointmentRequiredFlag,
      extraDetails,
      comment,
-<<<<<<< HEAD
-      practitionerId,
-=======
      busNo,
->>>>>>> v1.3
    },
    chargeItemDefinitionFormData: {
      id,
@@ -822,11 +814,7 @@ const transformFormEditData = (form) => {
    ybNo,
    title,
    comment,
-<<<<<<< HEAD
-    practitionerId,
-=======
    busNo,
->>>>>>> v1.3
  } = form.value;

  return {
@@ -844,11 +832,7 @@ const transformFormEditData = (form) => {
      appointmentRequiredFlag,
      extraDetails,
      comment,
-<<<<<<< HEAD
-      practitionerId,
-=======
      busNo,
->>>>>>> v1.3
    },
  };
 };