bug 470 494

This commit is contained in:
Ranyunqiao
2026-05-15 09:44:26 +08:00
parent 3ee09b22c7
commit 610fff704a
9 changed files with 235 additions and 51 deletions

View File

@@ -1,6 +1,15 @@
import request from '@/utils/request';
// 申请单相关接口
// 手术项目专用分页查询(仅手术 + 定价,无库存/草稿库存等无关逻辑)
export function getSurgeryPage(params) {
return request({
url: '/doctor-station/advice/surgery-page',
method: 'get',
params: params,
});
}
//医嘱大下拉
export function getApplicationList(queryParams) {
return request({

View File

@@ -274,7 +274,7 @@ const getList = () => {
}
loading.value = true;
getApplicationList({
pageSize: 500,
pageSize: 5000,
pageNum: 1,
categoryCode: '23',
organizationId: effectivePatientInfo.value.inHospitalOrgId,
@@ -542,6 +542,8 @@ const submit = () => {
let applicationListAllFilter = applicationListAll.value.filter((item) => {
return transferValue.value.includes(item.adviceDefinitionId);
});
// 从原始记录中提取检查项目名称,用于申请单名称字段
const selectedNames = applicationListAllFilter.map(item => item.adviceName).join('+');
applicationListAllFilter = applicationListAllFilter.map((item) => {
return {
adviceDefinitionId: item.adviceDefinitionId,
@@ -573,7 +575,7 @@ const submit = () => {
encounterId: effectivePatientInfo.value.encounterId,
organizationId: effectivePatientInfo.value.inHospitalOrgId,
requestFormId: requestFormId,
name: applicationListAllFilter.map(item => item.adviceName).join('、'),
name: selectedNames,
descJson: JSON.stringify(submitForm),
categoryEnum: '22',
}).then((res) => {

View File

@@ -5,13 +5,27 @@
-->
<template>
<div class="surgery-container">
<div v-loading="loading" class="transfer-wrapper" style="min-height: 300px;">
<div class="transfer-wrapper" style="min-height: 300px;">
<!-- 搜索框3字触发后端搜索 -->
<div style="padding: 6px 0;">
<el-input
v-model="searchKey"
placeholder="请输入3个字及以上搜索"
clearable
@input="onSearchInput"
style="width: 320px;"
/>
</div>
<!-- 加载提示不阻塞穿梭框操作 -->
<div v-if="loading" style="padding:8px 0; color:#909399; font-size:13px;">
<el-icon class="is-loading"><Loading /></el-icon> 手术项目加载中...
</div>
<el-transfer
ref="transferRef"
v-model="transferValue"
:data="applicationList"
filter-placeholder="项目代码/名称"
filterable
:titles="['未选择', '已选择']"
:titles="['待选择', '已选择']"
:format="leftPanelFormat"
/>
</div>
<div class="bloodTransfusion-form">
@@ -78,17 +92,26 @@
</div>
</template>
<script setup name="Surgery">
import {getCurrentInstance, onBeforeMount, onMounted, reactive, ref, watch} from 'vue';
import {computed, getCurrentInstance, onBeforeMount, onMounted, reactive, ref, watch} from 'vue';
import {patientInfo} from '../../../store/patient.js';
import {getDepartmentList} from '@/api/public.js';
import {getEncounterDiagnosis} from '../../api.js';
import {getApplicationList, saveSurgery} from './api';
import {getSurgeryPage, saveSurgery} from './api';
import {ElMessage} from 'element-plus';
const { proxy } = getCurrentInstance();
// 模块级缓存:避免每次打开弹窗都重新请求手术项目列表
let surgeryRecordsCache = null; // 原始 API 记录
let surgeryMappedCache = null; // 映射后的 el-transfer 数据
let searchDebounceTimer = null; // 搜索防抖
const transferRef = ref(null);
const dbTotal = ref(0); // 数据库中的手术项目总数
const searchKey = ref(''); // 搜索关键字
const checkedCount = computed(() => transferValue.value.length);
const leftPanelFormat = computed(() => ({
noChecked: ` 0/${dbTotal.value}`,
hasChecked: ` \${checked}/${dbTotal.value}`,
}));
// 递归查找树形科室节点
const findTreeItem = (list, id) => {
if (!list || list.length === 0) return null;
@@ -108,55 +131,82 @@ const applicationListAll = ref();
const applicationList = ref();
const orgOptions = ref([]); // 科室选项
const loading = ref(false); // 加载状态
const mapToTransferItem = (item) => {
const price = item.price != null ? Number(item.price).toFixed(2) : '0.00';
const unit = item.unitCodeDictText || item.unitCode || '';
return {
adviceDefinitionId: item.adviceDefinitionId,
orgId: item.orgId,
label: item.adviceName + ' (¥' + price + '/' + unit + ')',
key: item.adviceDefinitionId,
};
};
const getList = () => {
if (!patientInfo.value?.inHospitalOrgId) {
applicationList.value = [];
return;
}
// 命中缓存时直接使用,避免重复请求导致加载缓慢
// 命中内存缓存时直接使用
if (surgeryMappedCache && surgeryMappedCache.length > 0) {
applicationList.value = surgeryMappedCache;
applicationListAll.value = surgeryRecordsCache;
return;
}
loadPage('');
};
/**
* 加载手术项目分页数据
* @param {string} key 搜索关键字(可选)
*/
const loadPage = (key) => {
const orgId = patientInfo.value.inHospitalOrgId;
loading.value = true;
getApplicationList({
pageSize: 500,
pageNum: 1,
categoryCode: '24',
organizationId: patientInfo.value.inHospitalOrgId,
adviceTypes: [3, 6], //1 药品 2耗材 3诊疗 6手术
})
getSurgeryPage({ organizationId: orgId, pageNo: 1, pageSize: 100, searchKey: key || '' })
.then((res) => {
if (res.code === 200) {
applicationListAll.value = res.data.records;
applicationList.value = res.data.records.map((item) => {
const priceInfo = item.priceList?.[0] || {};
const price = priceInfo.price != null ? Number(priceInfo.price).toFixed(2) : '0.00';
const unit = item.unitCode_dictText || item.unitCode || '';
return {
adviceDefinitionId: item.adviceDefinitionId,
orgId: item.orgId,
label: item.adviceName + ' (¥' + price + '/' + unit + ')',
key: item.adviceDefinitionId,
};
});
// 写入模块缓存,后续打开弹窗直接复用
surgeryRecordsCache = res.data.records;
surgeryMappedCache = applicationList.value;
} else {
console.warn('获取手术项目列表失败:', res.message);
if (res.code !== 200 || !res.data?.records) {
applicationList.value = [];
dbTotal.value = 0;
loading.value = false;
return;
}
dbTotal.value = res.data.total || 0;
const records = res.data.records;
applicationListAll.value = records;
applicationList.value = records.map(mapToTransferItem);
// 仅在无搜索时缓存
if (!key) {
surgeryRecordsCache = records;
surgeryMappedCache = applicationList.value;
}
loading.value = false;
})
.catch((e) => {
console.warn('手术项目列表加载失败(可能无权限):', e?.message || e);
console.error('手术项目加载失败:', e);
applicationList.value = [];
})
.finally(() => {
dbTotal.value = 0;
loading.value = false;
});
};
/**
* 搜索输入框变化处理防抖300ms≥3字触发后端搜索
*/
const onSearchInput = () => {
clearTimeout(searchDebounceTimer);
const val = searchKey.value.trim();
if (!val) {
// 清空搜索框,恢复初始数据
loadPage('');
return;
}
if (val.length >= 3) {
searchDebounceTimer = setTimeout(() => {
loadPage(val);
}, 300);
}
};
const transferValue = ref([]);
const form = reactive({
// categoryType: '', // 项目类别
@@ -243,20 +293,15 @@ const submit = () => {
});
applicationListAllFilter = applicationListAllFilter.map((item) => {
return {
adviceDefinitionId: item.adviceDefinitionId /** 诊疗定义id */,
adviceDefinitionName: item.adviceDefinitionName /** 诊疗定义名称(手术项目名称) */,
quantity: 1, // /** 请求数量 */
unitCode: item.priceList[0].unitCode /** 请求单位编码 */,
unitPrice: item.priceList[0].price /** 单价 */,
totalPrice: item.priceList[0].price /** 总价 */,
positionId: item.positionId, //执行科室id
ybClassEnum: item.ybClassEnum, //类别医保编码
conditionId: item.conditionId, //诊断ID
encounterDiagnosisId: item.encounterDiagnosisId, //就诊诊断id
adviceType: item.adviceType, ///** 医嘱类型 */
definitionId: item.priceList[0].definitionId, //费用定价主表ID */
definitionDetailId: item.definitionDetailId, //费用定价子表ID */
accountId: patientInfo.value.accountId, // // 账户id
adviceDefinitionId: item.adviceDefinitionId,
adviceDefinitionName: item.adviceName,
quantity: 1,
unitCode: item.unitCode,
unitPrice: item.price,
totalPrice: item.price,
positionId: item.positionId,
definitionId: item.chargeItemDefinitionId,
accountId: patientInfo.value.accountId,
};
});
saveSurgery({