提交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/charge/outpatientregistration/components/chargeDialog.vue
+++ b/openhis-ui-vue3/src/views/charge/outpatientregistration/components/chargeDialog.vue
@@ -166,16 +166,6 @@ const props = defineProps({
    type: Object,
    default: undefined,
  },
-<<<<<<< HEAD
-  medfee_paymtd_code: {
-     type: Array,
-     default: () => [],
-   },
-  feeType: {
-    type: String,
-    default: '',
-  }
-=======
  orgId: {
    type: String,
    default: '',
@@ -184,7 +174,6 @@ const props = defineProps({
    type: String,
    default: '',
  },
->>>>>>> v1.3
 });

 const { proxy } = getCurrentInstance();
--- a/openhis-ui-vue3/src/views/charge/outpatientregistration/components/outpatientregistration.js
+++ b/openhis-ui-vue3/src/views/charge/outpatientregistration/components/outpatientregistration.js
@@ -228,38 +228,6 @@ export function gerPreInfo(userMaessage) {
  return request({
    url: '/yb-request/per-info',
    method: 'post',
-<<<<<<< HEAD
-    params: userMaessage
-  })
-}
-
-/**
- * 根据就诊卡号查询挂号记录
- * 注意：此接口可能不存在，实际使用getOutpatientRegistrationCurrent接口
- * 保留此函数以便将来使用，目前使用getOutpatientRegistrationCurrent替代
- */
-export function getRegistrationByCardNo(query) {
-  // 如果后端提供了专门的接口，可以取消注释使用
-  // return request({
-  //   url: '/charge-manage/register/encounter-by-card',
-  //   method: 'get',
-  //   params: query
-  // })
-  // 暂时使用现有的接口
-  return getOutpatientRegistrationCurrent(query);
-}
-
-/**
- * 补打挂号
- */
-export function reprintRegistration(data) {
-  return request({
-    url: '/charge-manage/register/reprint',
-    method: 'post',
-    data: data
-  })
-}
-=======
    params: userMaessage,
  });
 }
@@ -285,4 +253,3 @@ export function WxPayResult(data) {
    data: data,
  });
 }
->>>>>>> v1.3
--- a/openhis-ui-vue3/src/views/charge/outpatientregistration/components/patientAddDialog.vue
+++ b/openhis-ui-vue3/src/views/charge/outpatientregistration/components/patientAddDialog.vue
@@ -10,10 +10,6 @@
            <el-input v-model="form.name" clearable :disabled="isViewMode" />
          </el-form-item>
        </el-col>
-<<<<<<< HEAD
-        <el-col :span="6">
-          <el-form-item label="民族" prop="nationalityCode" label-width="80px">
-=======
        <el-col :span="8">
          <el-form-item label="性别" prop="genderEnum">
            <el-radio-group v-model="form.genderEnum" :disabled="isViewMode">
@@ -66,7 +62,6 @@
        </el-col>
        <el-col :span="8">
          <el-form-item label="民族" prop="nationalityCode">
->>>>>>> v1.3
            <el-select v-model="form.nationalityCode" clearable filterable :disabled="isViewMode">
              <el-option
                v-for="item in nationality_code"
@@ -106,87 +101,10 @@
      <!-- 第二行：证件类别、证件号码、*年龄 -->
      <el-row :gutter="10">
        <el-col :span="8">
-<<<<<<< HEAD
-          <el-form-item label="证件类别" prop="typeCode" label-width="80px">
-            <el-select
-              v-model="form.typeCode"
-              placeholder="就诊卡"
-              clearable
-              :disabled="isViewMode"
-            >
-              <el-option
-                v-for="dict in sys_idtype"
-                :key="dict.value"
-                :label="dict.label"
-                :value="dict.value"
-              />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="8">
-          <el-form-item label="证件号码" prop="idCard" label-width="80px">
-            <el-input v-model="form.idCard" clearable :disabled="isViewMode" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="8">
-          <el-form-item label="年龄" prop="age" label-width="80px">
-            <el-input
-              v-model="form.age"
-              :disabled="isViewMode"
-              @input="handleAgeInput"
-              placeholder="请输入龄"
-            >
-              <template #suffix>岁</template>
-            </el-input>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      
-      <!-- 第三行：国籍、*联系方式、工作单位 -->
-      <el-row :gutter="10">
-        <el-col :span="8">
-          <el-form-item label="国籍" prop="countryCode" label-width="80px">
-            <el-select v-model="form.countryCode" placeholder="请选择国籍" clearable filterable :disabled="isViewMode">
-              <el-option
-                v-for="item in countryCodeList"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
-              />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="8">
-          <el-form-item label="联系方式" prop="phone" label-width="80px">
-            <el-input v-model="form.phone" clearable :disabled="isViewMode" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="8">
-          <el-form-item label="出生日期" prop="birthDate">
-            <el-date-picker
-              v-model="form.birthDate"
-              type="date"
-              placeholder="请选择出生日期"
-              format="YYYY年MM月DD日"
-              :disabled="isViewMode"
-              value-format="YYYY-MM-DD"
-              @change="handleBirthDateChange"
-            />
-          </el-form-item>
-        </el-col>
-      </el-row>
-      
-      <!-- 第三行：就诊卡号、职业、邮政编码 -->
-      <el-row>
-        <el-col :span="8">
-=======
->>>>>>> v1.3
          <el-form-item label="就诊卡号" prop="identifierNo">
            <el-input v-model="form.identifierNo" clearable :disabled="isViewMode" />
          </el-form-item>
        </el-col>
-<<<<<<< HEAD
-=======
        <!-- <el-col :span="8">
          <el-form-item label="国家编码" prop="countryCode">
            <el-input v-model="form.countryCode" clearable :disabled="isViewMode" />
@@ -199,7 +117,6 @@
 						</el-form-item>
 				</el-col> -->
      <el-row>
->>>>>>> v1.3
        <el-col :span="8">
          <el-form-item label="职业" prop="prfsEnum">
            <el-select v-model="form.prfsEnum" placeholder="职业" clearable :disabled="isViewMode">
@@ -423,11 +340,7 @@
 </template>

 <script setup name="PatientAddDialog">
-<<<<<<< HEAD
-import { watch, defineProps } from "vue";
-=======
 import { watch } from 'vue';
->>>>>>> v1.3
 import pcas from 'china-division/dist/pcas-code.json';
 import { addPatient, patientlLists, getOutpatientRegistrationList } from './outpatientregistration';
 import {
@@ -689,21 +602,9 @@ const validateGuardianInfo = (rule, value, callback) => {
 const data = reactive({
  isViewMode: false,
  form: {
-<<<<<<< HEAD
-    typeCode: '08',
-    birthDate: undefined,
-    age: undefined,
-    genderEnum: '1', // 默认设置为'男'
-    hukouAddressSelect: undefined,
-    hukouAddress: undefined,
-    postalCode: undefined,
-    companyAddress: undefined,
-    patientDerived: undefined,
-=======
    typeCode: '01',
    tempFlag: '1',
    // genderEnum: 0,
->>>>>>> v1.3
  },
  rules: {
      name: [{ required: true, message: '姓名不能为空', trigger: 'change' },
@@ -720,22 +621,7 @@ const data = reactive({
    genderEnum: [{ required: true, message: '请选择性别', trigger: 'change' }],
    age: [{ required: true, message: '年龄不能为空', trigger: 'change' }],
    phone: [{ required: true, message: '联系方式不能为空', trigger: 'change' }],
-<<<<<<< HEAD
-    identifierNo: [{ required: true, message: '就诊卡号不能为空', trigger: 'change' }],
-    idCard: [
-        { required: false, message: '证件号码不能为空', trigger: 'change' },
-        { validator: validateIdCard, trigger: 'blur' },
-        { validator: validateUniquePatient, trigger: 'blur' }
-      ],
-    birthDate: [{ required: false, message: '请选择出生日期', trigger: 'change' }],
-    // 监护人信息条件验证规则
-    guardianName: [{ validator: validateGuardianInfo, trigger: 'blur' }],
-    guardianRelation: [{ validator: validateGuardianInfo, trigger: 'blur' }],
-    guardianPhone: [{ validator: validateGuardianInfo, trigger: 'blur' }],
-    guardianIdNo: [{ validator: validateGuardianInfo, trigger: 'blur' }],
-=======
    idCard: [{ required: true, message: '证件号不能为空', trigger: 'change' }],
->>>>>>> v1.3
  },
 });

@@ -757,76 +643,6 @@ const props = defineProps({
  }
 });

-<<<<<<< HEAD
-// 处理出生日期变化，自动计算年龄
-function handleBirthDateChange() {
-  if (form.value.birthDate) {
-    const birthDate = new Date(form.value.birthDate);
-    const today = new Date();
-    
-    let age = today.getFullYear() - birthDate.getFullYear();
-    const monthDiff = today.getMonth() - birthDate.getMonth();
-    
-    // 计算精确年龄
-    if (monthDiff < 0 || (monthDiff === 0 && today.getDate() < birthDate.getDate())) {
-      age--;
-    }
-    
-    form.value.age = age;
-  }
-}
-
-// 处理年龄输入，自动计算出生日期
-function handleAgeInput() {
-  // 提取数字部分
-  const ageMatch = form.value.age.match(/\d+/);
-  if (ageMatch) {
-    const age = parseInt(ageMatch[0]);
-    // 移除非数字字符，保留数字和可能的单位
-    form.value.age = age ;
-    
-    // 计算出生日期
-    const today = new Date();
-    const birthYear = today.getFullYear() - age;
-    const birthMonth = today.getMonth();
-    const birthDay = today.getDate();
-    
-    const birthDate = new Date(birthYear, birthMonth, birthDay);
-    
-    // 格式化为YYYY-MM-DD
-    const formattedBirthDate = birthDate.toISOString().split('T')[0];
-    form.value.birthDate = formattedBirthDate;
-  }
-}
-watch(
-  () => form.value.idCard,
-  (newIdCard) => {
-    if (newIdCard && newIdCard.length === 18) {
-      const birthYear = parseInt(newIdCard.substring(6, 10));
-      const birthMonth = parseInt(newIdCard.substring(10, 12));
-      const birthDay = parseInt(newIdCard.substring(12, 14));
-
-       // 设置出生日期
-      form.value.birthDate = `${birthYear}-${birthMonth.toString().padStart(2, '0')}-${birthDay.toString().padStart(2, '0')}`;
-      const today = new Date();
-      const currentYear = today.getFullYear();
-      const currentMonth = today.getMonth() + 1;
-      const currentDay = today.getDate();
-
-      let age = currentYear - birthYear;
-
-      // 如果当前月份小于出生月份，或者月份相同但当前日期小于出生日期，则年龄减1
-      if (currentMonth < birthMonth || (currentMonth === birthMonth && currentDay < birthDay)) {
-        age--;
-      }
-
-      form.value.age = age;
-      
-      form.value.age = age ;
-    }
-  }
-);
-=======
 // watch(
 //   () => form.value.idCard,
 //   (newIdCard) => {
@@ -851,7 +667,6 @@ watch(
 //     }
 //   }
 // );
->>>>>>> v1.3
 /** 查询菜单列表 */
 function getList() {
  patientlLists().then((response) => {
--- a/openhis-ui-vue3/src/views/charge/outpatientregistration/components/refundDialog.vue
+++ b/openhis-ui-vue3/src/views/charge/outpatientregistration/components/refundDialog.vue
@@ -11,11 +11,7 @@
      <el-text size="large" style="display: block; margin-bottom: 15px">
        退费日期：{{ currentDate }}
      </el-text>
-<<<<<<< HEAD
-      <el-text size="large">费用性质：{{ getFeeTypeText }}</el-text>
-=======
      <el-text size="large">费用性质：{{ props.category || '自费' }}</el-text>
->>>>>>> v1.3
      <div class="amount-row">
        <el-text size="large">应退金额：</el-text>
        <el-text size="large" type="primary" class="amount">
@@ -160,39 +156,16 @@ const props = defineProps({
    type: [],
    default: [],
  },
-<<<<<<< HEAD
-  medfee_paymtd_code: {
-     type: Array,
-     default: () => [],
-   },
-  feeType: {
-    type: String,
-    default: '',
-  },
-  contractName: {
-    type: String,
-    default: '', // 新增：接收费用性质名称
-  },
-  registerInfo: {
-    type: Object,
-    default: () => ({}), // 原挂号记录信息
-  }
-=======
  eventType: {
    type: String,
    default: 1,
  },
->>>>>>> v1.3
 });

 const { proxy } = getCurrentInstance();
 const reason = ref('');
-<<<<<<< HEAD
-const userStore = useUserStore();
-=======
 const preCancelData = ref([]);
 const loading = ref(false);
->>>>>>> v1.3

 const formData = reactive({
  totalAmount: 0,
@@ -255,29 +228,10 @@ watch(
 function submit() {
  console.log(props.chargeItemIds);

-<<<<<<< HEAD
-  if (parseFloat(displayAmount.value) < formData.totalAmount) {
-    proxy.$modal.msgError('请输入正确的金额');
-    return;
-  }
-  
-  // 获取当前时间作为退号操作日期
-  const returnDate = formatDateStr(new Date(), 'YYYY-MM-DD HH:mm:ss');
-  
-  // 获取当前用户信息作为操作工号（使用用户管理中的用户账号）
-  // userStore.name 对应后端的 userName（用户账号），如 'admin'
-  const operatorId = userStore.name || null; // 退号操作工号（用户账号）
-  const operatorName = userStore.nickName || userStore.name || ''; // 退号操作人姓名
-  
-  // 计算退款总金额
-  const refundAmount = formData.selfPay.reduce((sum, item) => sum + (Number(item.amount) || 0), 0);
-  
-=======
  // if (parseFloat(displayAmount.value) < formData.totalAmount) {
  //   proxy.$modal.msgError('请输入正确的金额');
  //   return;
  // }
->>>>>>> v1.3
  cancelRegister({
    paymentEnum: 0,
    kindEnum: 1,
--- a/openhis-ui-vue3/src/views/charge/outpatientregistration/index.vue
+++ b/openhis-ui-vue3/src/views/charge/outpatientregistration/index.vue
@@ -43,8 +43,6 @@
                  </el-popover>
                </el-form-item>
              </el-col>
-<<<<<<< HEAD
-=======
              <el-col :span="6" style="padding: 0">
                <el-button type="primary" icon="Plus" @click="handleAddPatient" style="width: 65px">
                  新建
@@ -77,7 +75,6 @@
                  学生卡
                </el-button> -->
              </el-col>
->>>>>>> v1.3
              <el-col :span="5">
                <el-form-item label="姓名：" prop="name">
                  <el-input v-model="form.name" placeholder="姓名" :disabled="true" />
@@ -280,10 +277,6 @@
                        setchargeItem;
                      }
                    "
-<<<<<<< HEAD
-                    @clear="handleOrgClear"
-=======
->>>>>>> v1.3
                    clearable
                  />
                </el-form-item>
@@ -554,100 +547,6 @@
                <span>{{ parseTime(scope.row.registerTime) }}</span>
              </template>
            </el-table-column>
-<<<<<<< HEAD
-            <!-- 退号记录相关列 -->
-            <el-table-column
-              v-if="queryType === 'returned'"
-              label="退号日期/时间"
-              align="center"
-              key="returnDate"
-              prop="returnDate"
-              width="180"
-            >
-              <template #default="scope">
-                <span>{{ scope.row.returnDate ? parseTime(scope.row.returnDate) : '-' }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column
-              v-if="queryType === 'returned'"
-              label="退号原因"
-              align="center"
-              key="returnReason"
-              prop="returnReason"
-              width="200"
-              :show-overflow-tooltip="true"
-            >
-              <template #default="scope">
-                <span>{{ scope.row.returnReason || '-' }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column
-              v-if="queryType === 'returned'"
-              label="退号操作人"
-              align="center"
-              key="operatorName"
-              prop="operatorName"
-              width="120"
-            >
-              <template #default="scope">
-                <span>{{ scope.row.operatorName || '-' }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column
-              v-if="queryType === 'returned'"
-              label="退号操作工号"
-              align="center"
-              key="operatorId"
-              prop="operatorId"
-              width="120"
-            >
-              <template #default="scope">
-                <span>{{ scope.row.operatorId || '-' }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column
-              v-if="queryType === 'returned'"
-              label="退款金额"
-              align="center"
-              key="refundAmount"
-              prop="refundAmount"
-              width="120"
-            >
-              <template #default="scope">
-                <span>{{ scope.row.refundAmount ? scope.row.refundAmount.toFixed(2) + ' 元' : '-' }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column
-              v-if="queryType === 'returned'"
-              label="退款方式"
-              align="center"
-              key="refundMethod"
-              prop="refundMethod"
-              width="150"
-            >
-              <template #default="scope">
-                <span>{{ scope.row.refundMethod || '-' }}</span>
-              </template>
-            </el-table-column>
-            <!-- 操作列：只在全部和正常挂号标签页显示，退号记录标签页不显示 -->
-            <el-table-column
-              v-if="queryType !== 'returned'"
-              label="操作"
-              align="center"
-              width="120"
-              fixed="right"
-            >
-              <template #default="scope">
-                <el-button
-                  link
-                  type="primary"
-                  :disabled="scope.row.statusEnum === 6 || scope.row.statusEnum !== 1"
-                  :title="getReturnTooltip(scope.row)"
-                  @click="handleReturn(scope.row)"
-                >
-                  退号
-                </el-button>
-=======
            <el-table-column label="操作" align="center" key="registerTime" prop="registerTime" do>
              <template #default="scope">
                <!-- <el-tooltip
@@ -675,7 +574,6 @@
                  </el-button>
                </div>
                <!-- </el-tooltip> -->
->>>>>>> v1.3
              </template>
            </el-table-column>
          </el-table>
@@ -725,25 +623,7 @@
      :patientInfo="patientInfo"
      :paymentId="paymentId"
      :chargeItemIds="chargeItemIdList"
-<<<<<<< HEAD
-      :feeType="patientInfo.medfeePaymtdCode || ''"   
-      :contractName="patientInfo.contractName || ''"  
-      :medfee_paymtd_code="medfee_paymtd_code"
-      :registerInfo="registerInfo"
-    />
-    <ReprintDialog
-      :open="openReprintDialog"
-      @close="
-        (value) => {
-          if (value == 'success') {
-            getList();
-          }
-          openReprintDialog = false;
-        }
-      "
-=======
      :eventType="eventType"
->>>>>>> v1.3
    />
  </div>
 </template>
@@ -776,26 +656,11 @@ import ReprintDialog from './components/reprintDialog.vue';
 import { handleColor } from '@/utils/his';
 import useUserStore from '@/store/modules/user';
 import { formatDate, formatDateStr } from '@/utils/index';
-<<<<<<< HEAD
-import { getConfigKey } from '@/api/system/config';
-
-const patientInfo = ref({});
-// 监护人规定年龄配置
-const guardianAgeConfig = ref(null);
-
-// 跳转到患者档案管理页面
-  const goToPatientRecord = () => {
-    // 使用Vue Router进行路由导航，在当前页面打开新的路由层级
-    router.push('/system/basicmanage/patientmanagement');
-  };
-
-=======
 import { isValidCNPhoneNumber } from '../../../utils/validate';
 import { ElMessage } from 'element-plus';

 const patientInfo = ref({});
 const eventType = ref(0);
->>>>>>> v1.3
 const router = useRouter();
 const { proxy } = getCurrentInstance();
 const { sys_normal_disable, sys_user_sex, med_chrgitm_type,medfee_paymtd_code } = proxy.useDict(
@@ -846,14 +711,8 @@ const patientInfoList = ref(undefined);
 // 费用性质
 const contractList = ref(undefined);
 // const locationOptions = ref(undefined); // 地点树选项
-<<<<<<< HEAD
-const doctorList = ref(undefined); // 医生选项（过滤后的）
-const allDoctorList = ref(undefined); // 所有医生选项（用于过滤）
-const healthcareList = ref(undefined); // 挂号项目选项
-=======
 const doctorList = ref(undefined); // 医生选项
 const healthcareList = ref([]); // 挂号项目选项
->>>>>>> v1.3
 const orgOptions = ref(undefined); // 科室选项
 const readCardLoading = ref(false);
 const transformedData = ref({});
@@ -1171,32 +1030,6 @@ function setchargeItem() {
      healthcareData.length > 0 ? healthcareData[0].price + healthcareData[0].activityPrice : '';
    form.value.definitionId = healthcareData.length > 0 ? healthcareData[0].definitionId : '';
  }
-<<<<<<< HEAD
-}
-
-/** 处理挂号类型变化 */
-function handleServiceTypeChange() {
-  // 先设置费用项信息
-  setchargeItem();
-  // 然后根据就诊科室和挂号类型过滤医生
-  filterDoctorsByHealthcare();
-}
-
-/** 处理科室清空 */
-function handleOrgClear() {
-  // 清空科室时，清空相关数据
-  form.value.orgId = undefined;
-  form.value.organizationId = undefined;
-  healthcareList.value = [];
-  form.value.serviceTypeId = undefined;
-  form.value.practitionerId = undefined;
-  form.value.doctorName = '';
-  // 如果有医生列表，显示所有医生
-  if (allDoctorList.value) {
-    doctorList.value = allDoctorList.value;
-  }
-=======
->>>>>>> v1.3
 }
 /**  查询患者信息 */
 function getList() {
@@ -1479,10 +1312,6 @@ function handleAdd() {
  transformedData.value = transformFormData(form.value);
  console.log(transformedData, 'transformedData门诊挂号');
  chargeItemIdList.value = [];
-<<<<<<< HEAD
-  patientInfo.value.patientId = form.value.patientId;
-  patientInfo.value.medfeePaymtdCode = form.value.contractNo; // 设置费用性质
-=======
  // patientInfo.value.patientId = form.value.patientId;
  patientInfo.value = {
    patientId: form.value.patientId,
@@ -1500,7 +1329,6 @@ function handleAdd() {
    practitionerName: form.value.doctorName || '',
    healthcareName: '', // 可根据实际情况补充
  };
->>>>>>> v1.3
  proxy.$refs['outpatientRegistrationRef'].validate((valid) => {
    if (valid) {
      if (!isValidCNPhoneNumber(patientInfo.value.phone)) {
@@ -1518,15 +1346,8 @@ function handleAdd() {
      addOutpatientRegistration(transformedData.value)
        .then((res) => {
          if (res.code == 200) {
-<<<<<<< HEAD
-            console.log('挂号成功，返回数据:', res.data);
-            // 立即刷新列表，确保挂号信息显示在当日已挂号列表中
-            getList();
-            
-=======
            console.log('78989798', 'res', res);
            // proxy.$modal.msgSuccess('挂号成功');
->>>>>>> v1.3
            chrgBchno.value = res.data.chrgBchno;
            registerBusNo.value = res.data.busNo;
            totalAmount.value = res.data.psnCashPay;
@@ -1583,56 +1404,15 @@ function handleSearchPatient(value) {
  patientSearchKey.value = value;
 }

-<<<<<<< HEAD
-function getReturnTooltip(row) {
-  if (!row) {
-    return '';
-  }
-  if (row.statusEnum == 6) {
-    return '已退号';
-  }
-  if (row.statusEnum != 1) {
-    return '该患者医生已接诊，不能退号！';
-  }
-  return '';
-}
-
-function handleReturn(row) {
-  if (row.statusEnum != 1) {
-    proxy.$modal.msgError('该患者医生已接诊，不能退号！');
-    return;
-  }
-=======
 function handleReturn(row, type = '1') {
->>>>>>> v1.3
  openRefundDialog.value = true;
  patientInfo.value.patientId = row.patientId;
  patientInfo.value.encounterId = row.encounterId;
  totalAmount.value = row.totalPrice;
  chargeItemIdList.value = row.chargeItemIds.split(',');
  paymentId.value = row.paymentId;
-<<<<<<< HEAD
-    // 从挂号记录中获取正确的费用性质
-  patientInfo.value.medfeePaymtdCode = row.contractNo; // 使用挂号记录中的费用性质代码
-  patientInfo.value.contractName = row.contractName;   // 保存费用性质名称用于显示
-  
-  // 保存完整的原挂号记录信息，用于退号记录
-  registerInfo.value = {
-    ...row, // 保存完整的挂号记录
-    patientName: row.patientName,
-    age: row.age,
-    genderEnum_enumText: row.genderEnum_enumText,
-    registerTime: row.registerTime,
-    totalPrice: row.totalPrice,
-    encounterId: row.encounterId,
-    patientId: row.patientId,
-  };
-  
-  console.log('退号费用性质:', row.contractNo, row.contractName);
-=======
  eventType.value = type;
  console.log(paymentId.value);
->>>>>>> v1.3
 }

 function handleReturnRegister() {