wangyizhe/his
1
3
Fork 0
Code Issues Pull Requests 2 Actions Packages Projects Releases Wiki Activity

提交merge1.3

Browse Source
This commit is contained in:
chenqi
2025-12-27 15:30:40 +08:00
parent 088861f66e
commit 3c497417dc
167 changed files with 0 additions and 17577 deletions
Download Patch File Download Diff File Expand all files Collapse all files

220
openhis-ui-vue3/src/views/charge/outpatientregistration/index.vue
View File

@@ -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() {