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

bug550\556569

Browse Source
This commit is contained in:
yangkexiang
2026-05-21 17:40:26 +08:00
parent 966e4f6544
commit bcc2f490a0
16 changed files with 1230 additions and 331 deletions
Download Patch File Download Diff File Expand all files Collapse all files

735
openhis-ui-vue3/src/views/doctorstation/components/examination/examinationApplication.vue
View File

@@ -397,117 +397,165 @@
</div>
</div>
<!-- 右侧：已选择 项目卡片（可展开显示检查方法） -->
<!-- 右侧：已选择（检查项目、检查方法为两类独立选择结果） -->
<div class="selected-panel">
<div class="panel-label">已选择:</div>
<div class="selected-tags">
<div v-if="selectedItems.length === 0" class="empty-selected">–</div>
<template v-if="selectedItems.length === 0 && selectedMethods.length === 0 && methodsForActiveCategory.length === 0">
<div class="empty-selected">–</div>
</template>
<template v-else>
<div
v-else
v-for="(item, idx) in selectedItems"
:key="idx"
:key="'project-' + item.id"
class="selected-item-card"
:class="{ 'is-expanded': item.expanded }"
:class="{ 'is-expanded': item.projectFoldExpanded }"
>
<!-- 项目卡片头部：项目和检查方法解耦，点击展开查看方法/明细 -->
<div class="card-header" @click="toggleItemExpand(item)">
<el-tooltip :content="getDisplayItemName(item)" placement="top" :show-after="400">
<span class="card-name">{{ getDisplayItemName(item) }}</span>
</el-tooltip>
<span class="card-price">¥{{ formatDetailAmount(getSelectedItemAmount(item)) }}</span>
<el-icon :class="['expand-icon', { expanded: item.expanded }]">
<ArrowDown />
</el-icon>
<!-- 删除按钮 -->
<el-button link type="danger" size="small" @click.stop="handleRemoveItem(idx, item)">
<el-icon><Close /></el-icon>
</el-button>
</div>
<div v-if="item.expanded" class="selected-card-body">
<div v-if="shouldShowItemPackageBody(item)">
<div class="package-toggle" @click.stop="toggleItemPackageExpand(item)">
<span>项目套餐明细</span>
<el-icon :class="['expand-icon', { expanded: item.itemPackageExpanded }]">
<ArrowDown />
</el-icon>
<div
class="fold-strip fold-strip-project"
:class="{ 'is-open': item.projectFoldExpanded }"
>
<div class="fold-strip-header" @click="toggleProjectFold(item)">
<el-icon :class="['fold-chevron', { open: item.projectFoldExpanded }]">
<ArrowDown />
</el-icon>
<div class="fold-header-main">
<span class="fold-kicker">检查项目</span>
<el-tooltip :content="getDisplayItemName(item)" placement="top" :show-after="400">
<span class="fold-title line-clamp-2">{{ getDisplayItemName(item) }}</span>
</el-tooltip>
</div>
<div v-show="item.itemPackageExpanded">
<span class="fold-price-strong">¥{{ formatDetailAmount(item.price || 0) }}</span>
<el-button link type="danger" size="small" @click.stop="handleRemoveItem(idx, item)">
<el-icon><Close /></el-icon>
</el-button>
</div>
<div v-show="item.projectFoldExpanded" class="fold-strip-body">
<div v-if="shouldShowItemPackageBody(item)" class="fold-package-wrap">
<div v-if="item.packageDetailsLoading" class="package-details-loading">加载中...</div>
<template v-else>
<div v-if="getPackageDetailsList(item).length === 0" class="package-details-empty">
暂无套餐明细
</div>
<div v-else class="package-details-list">
<div
v-for="(detail, dIdx) in getPackageDetailsList(item)"
:key="detail.id ?? detail.itemCode ?? `d-${dIdx}`"
class="detail-row"
>
<el-tooltip :content="detail.name" placement="top" :show-after="500">
<span class="detail-name">{{ detail.name }}</span>
</el-tooltip>
<div class="detail-meta">
<span class="detail-qty">×{{ detail.quantity || 1 }}</span>
<span class="detail-price">¥{{ formatDetailAmount(detail.price) }}</span>
<div
v-for="(detail, dIdx) in getPackageDetailsList(item)"
:key="detail.id ?? detail.itemCode ?? `d-${dIdx}`"
class="detail-row"
>
<el-tooltip :content="detail.name" placement="top" :show-after="500">
<span class="detail-name">{{ detail.name }}</span>
</el-tooltip>
<div class="detail-meta">
<span class="detail-qty">×{{ detail.quantity || 1 }}</span>
<span class="detail-price">¥{{ formatDetailAmount(detail.price) }}</span>
</div>
</div>
</div>
</div>
</template>
</div>
</div>
<div class="selected-card-section">
<div class="selected-section-title">检查方法</div>
<div v-if="!item.methods || item.methods.length === 0" class="selected-method-empty">
暂无检查方法
</div>
<div
v-for="method in item.methods"
:key="method.id"
class="selected-method-option"
>
<el-checkbox
:model-value="item.selectedMethod?.id === method.id"
@change="(val) => selectMethodCheckbox(val, item, method)"
class="method-checkbox"
>
{{ method.name }}
</el-checkbox>
<span class="method-price-tag">¥{{ method.packagePrice || method.price || 0 }}</span>
</div>
</div>
<div v-if="shouldShowMethodPackageBody(item)">
<div class="package-toggle" @click.stop="toggleMethodPackageExpand(item)">
<span>检查方法套餐明细</span>
<el-icon :class="['expand-icon', { expanded: item.methodPackageExpanded }]">
<ArrowDown />
</el-icon>
</div>
<div v-show="item.methodPackageExpanded">
<div v-if="item.methodPackageLoading" class="package-details-loading">加载中...</div>
<template v-else>
<div v-if="getMethodPackageDetailsList(item).length === 0" class="package-details-empty">
暂无检查方法套餐明细
</div>
<div v-else class="package-details-list method-package-list">
<div
v-for="(detail, dIdx) in getMethodPackageDetailsList(item)"
:key="detail.id ?? detail.itemCode ?? `md-${dIdx}`"
class="detail-row"
>
<el-tooltip :content="detail.name" placement="top" :show-after="500">
<span class="detail-name">{{ detail.name }}</span>
</el-tooltip>
<div class="detail-meta">
<span class="detail-qty">×{{ detail.quantity || 1 }}</span>
<span class="detail-price">¥{{ formatDetailAmount(detail.price) }}</span>
</div>
</div>
</div>
</template>
</div>
<div v-else class="fold-strip-muted">暂无项目套餐明细</div>
</div>
</div>
</div>
<div
v-for="(method, idx) in selectedMethods"
:key="'method-' + method.id"
class="selected-item-card"
:class="{ 'is-expanded': method.expanded }"
>
<div
class="fold-strip fold-strip-method"
:class="{ 'is-open': method.expanded }"
>
<div class="fold-strip-header" @click="toggleSelectedMethodFold(method)">
<el-icon :class="['fold-chevron', { open: method.expanded }]">
<ArrowDown />
</el-icon>
<div class="fold-header-main">
<span class="fold-kicker">检查方法</span>
<span
class="fold-title fold-title-plain line-clamp-2"
:title="getDisplayMethodName(method)"
>
{{ getDisplayMethodName(method) }}
</span>
</div>
<span
v-if="hasStandaloneMethodPackage(method)"
class="fold-price-strong warn"
>
¥{{ formatDetailAmount(method.packagePrice || method.price || 0) }}
</span>
<el-button link type="danger" size="small" @click.stop="handleRemoveMethod(idx)">
<el-icon><Close /></el-icon>
</el-button>
</div>
<div v-show="method.expanded" class="fold-strip-body">
<template v-if="hasStandaloneMethodPackage(method)">
<div class="fold-package-wrap fold-method-package-wrap">
<div v-if="method.packageLoading" class="package-details-loading">加载中...</div>
<template v-else>
<div v-if="getStandaloneMethodPackageDetailsList(method).length === 0" class="package-details-empty">
暂无检查方法套餐明细
</div>
<div v-else class="package-details-list method-package-list">
<div
v-for="(detail, dIdx) in getStandaloneMethodPackageDetailsList(method)"
:key="detail.id ?? detail.itemCode ?? `md-${dIdx}`"
class="detail-row"
>
<el-tooltip :content="detail.name" placement="top" :show-after="500">
<span class="detail-name">{{ detail.name }}</span>
</el-tooltip>
<div class="detail-meta">
<span class="detail-qty">×{{ detail.quantity || 1 }}</span>
<span class="detail-price">¥{{ formatDetailAmount(detail.price) }}</span>
</div>
</div>
</div>
</template>
</div>
</template>
<template v-else>
<div class="fold-strip-muted">无单独的检查方法套餐明细。</div>
</template>
</div>
</div>
</div>
<!-- 底部：独立勾选检查方法，样式与左侧项目选择一致 -->
<div
v-if="methodsForActiveCategory.length > 0"
class="selected-global-method-picker"
@click.stop
>
<div class="method-picker-collapse-title" @click="methodPickerExpanded = !methodPickerExpanded">
<span class="method-picker-title-main">检查方法</span>
<span v-if="activeCategoryName" class="global-method-picker-scope">{{ activeCategoryName }}</span>
<el-icon :class="['method-picker-arrow', { expanded: methodPickerExpanded }]">
<ArrowDown />
</el-icon>
</div>
<div v-show="methodPickerExpanded" class="global-method-picker-list">
<div
v-for="method in methodsForActiveCategory"
:key="'g-m-' + method.id"
class="item-row method-picker-row"
>
<el-checkbox
:model-value="isStandaloneMethodSelected(method)"
@change="(val) => onStandaloneMethodChange(!!val, method)"
class="item-checkbox"
>
<span class="method-label-inner">{{ formatExamMethodCaption(method.name) }}</span>
</el-checkbox>
<span class="item-price">¥{{ formatDetailAmount(method.packagePrice || method.price || 0) }}</span>
</div>
</div>
</div>
</template>
</div>
</div>
</div>
@@ -539,6 +587,8 @@ const dictLoading = ref(false);
const activeDetailTab = ref('applyForm');
const applicationList = ref([]);
const selectedItems = ref([]);
const selectedMethods = ref([]);
const methodPickerExpanded = ref(true);
// Bug #499: 查询过滤状态
const searchForm = reactive({
@@ -705,13 +755,25 @@ function getDisplayItemName(item) {
return String(item?.name || '').replace(/^套餐[：:\-\s]*/, '');
}
function getSelectedItemAmount(item) {
const itemPrice = Number(item?.price || 0);
const methodPrice = Number(item?.selectedMethod?.packagePrice || 0);
if (!hasMethodPackage(item) || isSamePackage(item)) {
return itemPrice;
/** 检查方法展示：避免与后端文案重复出现「(方法)(方法)」 */
function formatExamMethodCaption(name) {
const raw = String(name || '').trim();
if (!raw) return '';
if (/^\(方法\)/.test(raw) || /^（方法）/.test(raw)) {
return raw;
}
return itemPrice + methodPrice;
return `(方法) ${raw}`;
}
/** 已选方法纯文本（用于标题下级展示，不包含「勾选」前缀，去掉后端自带的 (方法) 前缀） */
function getDisplaySelectedMethodName(item) {
const raw = String(item?.selectedMethod?.name || '').trim();
if (!raw) return '';
return raw.replace(/^\(方法\)\s*/, '').replace(/^（方法）\s*/, '').trim();
}
function getSelectedItemAmount(item) {
return Number(item?.price || 0);
}
function parsePackageDetailsPayload(res) {
@@ -843,6 +905,19 @@ const currentActiveCategory = ref(null); // Bug #500: 记录当前激活的分
const allMethods = ref([]);
const activeCategory = computed(() => {
const id = activeNames.value;
if (id === '' || id === null || id === undefined) return null;
return categoryList.value.find((cat) => String(cat.typeId) === String(id)) || null;
});
const activeCategoryName = computed(() => activeCategory.value?.typeName || activeCategory.value?.categoryName || '');
const methodsForActiveCategory = computed(() => {
const arr = activeCategory.value?.methods;
return Array.isArray(arr) ? arr : [];
});
// ====== 科室下拉（来源：科室管理）======
const orgLoading = ref(false);
const orgOptions = ref([]); // { label, value }
@@ -953,6 +1028,44 @@ const availableMethods = computed(() => {
return allMethods.value;
});
function isStandaloneMethodSelected(method) {
return selectedMethods.value.some((m) => String(m.id) === String(method?.id));
}
function getDisplayMethodName(method) {
const raw = String(method?.name || '').trim();
if (!raw) return '';
return raw.replace(/^\(方法\)\s*/, '').replace(/^（方法）\s*/, '').trim();
}
function hasStandaloneMethodPackage(method) {
return !!(method?.packageId || method?.packageName);
}
function getStandaloneMethodPackageDetailsList(method) {
return Array.isArray(method?.packageDetails) ? method.packageDetails : [];
}
async function onStandaloneMethodChange(checked, method) {
if (!method) return;
if (checked) {
if (!isStandaloneMethodSelected(method)) {
selectedMethods.value.push({
...method,
expanded: false,
packageLoading: false,
packageDetails: []
});
}
} else {
const idx = selectedMethods.value.findIndex((m) => String(m.id) === String(method.id));
if (idx > -1) selectedMethods.value.splice(idx, 1);
}
updateMethodDisplay();
await nextTick();
form.totalAmount = totalAmountCalc.value;
}
// 当可选方法列表改变时，如果当前选中的方法不在新列表中，则清空
// #428: 分类展开时联动加载检查方法
// Bug #500: 使用 categoryLoadingSet 替代 dictLoading，避免切换分类时整个区域闪烁
@@ -996,6 +1109,8 @@ async function handleCategoryExpand(cat) {
function handleCollapseChange(activeName) {
// 始终记录当前激活的分类，确保 handleCategoryExpand 能正确忽略过期请求
currentActiveCategory.value = activeName || null;
// 底部「检查方法」勾选区默认展开，不因切换左侧分类而收起
methodPickerExpanded.value = true;
if (activeName) {
// Bug #428修复: 直接从 categoryList（原始响应式数组）查找分类，
@@ -1005,6 +1120,7 @@ function handleCollapseChange(activeName) {
handleCategoryExpand(cat); // 异步加载，不 await
}
}
updateMethodDisplay();
}
watch(availableMethods, (newMethods) => {
@@ -1130,17 +1246,26 @@ const filteredCategoryList = computed(() => {
// ====== 合计 ======
const totalAmountCalc = computed(() => {
const total = selectedItems.value.reduce((sum, item) => {
const itemTotal = selectedItems.value.reduce((sum, item) => {
const effectivePrice = getSelectedItemAmount(item);
return sum + (effectivePrice * (item.quantity || 1));
}, 0);
const methodTotal = selectedMethods.value.reduce((sum, method) => {
return sum + Number(method?.packagePrice ?? method?.price ?? 0);
}, 0);
const total = itemTotal + methodTotal;
return total.toFixed(2);
});
// 监听已选项：自动更新申检部位
watch(selectedItems, () => {
form.inspectionArea = selectedItems.value.map(i => i.name).join('+');
form.isCharged = selectedItems.value.length > 0 ? 1 : 0;
form.isCharged = selectedItems.value.length > 0 || selectedMethods.value.length > 0 ? 1 : 0;
}, { deep: true });
watch(selectedMethods, () => {
form.isCharged = selectedItems.value.length > 0 || selectedMethods.value.length > 0 ? 1 : 0;
updateMethodDisplay();
}, { deep: true });
// 监听患者变化
@@ -1231,6 +1356,7 @@ function handleAdd() {
selectedMethodDisplay: '' // Bug #384修复: 重置检查方法显示
});
selectedItems.value = [];
selectedMethods.value = [];
resetCategoryChecked();
activeDetailTab.value = 'applyForm';
// 自动加载临床诊断
@@ -1244,22 +1370,27 @@ function handleSave() {
ElMessage.warning('请至少选择一个检查明细项目');
return;
}
// 检查每个项目是否已选择检查方法
const itemsWithoutMethod = selectedItems.value.filter(item => !item.selectedMethod);
if (itemsWithoutMethod.length > 0) {
const names = itemsWithoutMethod.map(item => item.name).join('、');
ElMessage.warning(`以下项目未选择检查方法：${names}，请在右侧勾选后再保存`);
if (selectedMethods.value.length === 0) {
ElMessage.warning('请选择检查方法');
return;
}
// 从已选项目推导检查类型编码（取第一个项目的 checkType，如 CT / ECG / GI）
const firstCheckType = selectedItems.value[0]?.checkType || 'unknown';
form.examTypeCode = firstCheckType;
form.totalAmount = totalAmountCalc.value;
const primaryMethod = selectedMethods.value[0] || null;
const payload = {
...form,
encounterId: props.patientInfo?.encounterId || null,
patientIdNum: props.patientInfo?.patientId || null,
checkMethods: selectedMethods.value.map((method) => ({
checkMethodId: method.id || null,
checkMethodName: method.name || null,
checkMethodCode: method.code || null,
checkMethodPackageName: method.packageName || null
})),
items: selectedItems.value.map((item, index) => ({
itemCode: String(item.id),
itemName: item.name,
@@ -1269,10 +1400,10 @@ function handleSave() {
itemStatus: 0,
itemSeq: index + 1,
// 检查方法信息
checkMethodId: item.selectedMethod?.id || null,
checkMethodName: item.selectedMethod?.name || null,
checkMethodCode: item.selectedMethod?.code || null,
checkMethodPackageName: item.selectedMethod?.packageName || null // Bug #384修复: 保存套餐名称
checkMethodId: primaryMethod?.id || null,
checkMethodName: primaryMethod?.name || null,
checkMethodCode: primaryMethod?.code || null,
checkMethodPackageName: primaryMethod?.packageName || null // Bug #384修复: 保存套餐名称
}))
};
request({
@@ -1293,6 +1424,7 @@ function handleRowClick(row) {
Object.assign(form, row);
form.selectedMethodDisplay = ''; // Bug #384修复: 先清空，后面根据回充数据更新
selectedItems.value = [];
selectedMethods.value = [];
activeDetailTab.value = 'applyForm';
request({ url: `/exam/apply/${row.applyNo}`, method: 'get' }).then(async res => {
// 响应结构: Axios拦截器对code===200返回res.data（AjaxResult体）
@@ -1317,8 +1449,9 @@ function handleRowClick(row) {
methods: [],
selectedMethod: null,
expanded: false,
itemPackageExpanded: true,
methodPackageExpanded: true,
projectFoldExpanded: false,
methodFoldExpanded: false,
methodPackageExpanded: false,
packageDetailsLoading: false,
isPackage: false,
packageId: null,
@@ -1362,7 +1495,21 @@ function handleRowClick(row) {
return item;
}));
// Bug #408修复: 确保明细数据正确加载到selectedItems
const methodMap = new Map();
for (const item of itemsWithMethods) {
if (item.selectedMethod && !methodMap.has(String(item.selectedMethod.id))) {
methodMap.set(String(item.selectedMethod.id), {
...item.selectedMethod,
expanded: false,
packageLoading: false,
packageDetails: []
});
}
item.selectedMethod = null;
item.methodPackageDetails = [];
}
selectedItems.value = itemsWithMethods;
selectedMethods.value = Array.from(methodMap.values());
// 加载套餐明细（单个失败不影响其他项目和明细显示）
for (const it of selectedItems.value) {
if (hasItemPackage(it)) {
@@ -1372,14 +1519,17 @@ function handleRowClick(row) {
console.error('加载套餐明细失败:', it.name, e);
}
}
if (hasMethodPackage(it) && !isSamePackage(it)) {
it.methodFoldExpanded = false;
syncItemExpandedFlag(it);
}
for (const method of selectedMethods.value) {
if (hasStandaloneMethodPackage(method)) {
try {
await loadMethodPackageDetails(it, it.selectedMethod);
await loadStandaloneMethodPackageDetails(method);
} catch (e) {
console.error('加载检查方法套餐明细失败:', it.name, e);
console.error('加载检查方法套餐明细失败:', method.name, e);
}
}
it.expanded = shouldShowPackageBody(it);
}
syncCategoryChecked();
// Bug #384修复: 回充后更新检查方法显示
@@ -1465,8 +1615,9 @@ async function handleItemSelect(checked, item, cat) {
methods: methods,
selectedMethod: null,
expanded: false,
itemPackageExpanded: true,
methodPackageExpanded: true,
projectFoldExpanded: false,
methodFoldExpanded: false,
methodPackageExpanded: false,
isPackage: !!(item.packageId || item.packageName),
packageName: item.packageName || null,
packageDetailsLoading: false,
@@ -1475,19 +1626,13 @@ async function handleItemSelect(checked, item, cat) {
};
selectedItems.value.push(newRow);
// 必须用数组里的响应式行，不能继续改局部 newRow：push 后列表内是 proxy，改 raw 对象不会触发右侧卡片更新（会一直卡在「加载中」）
const row = selectedItems.value[selectedItems.value.length - 1];
// 勾选项目只加入项目列表，检查方法由用户在“检查方法”区域手动选择
row.selectedMethod = null;
const rowJustAdded = selectedItems.value[selectedItems.value.length - 1];
syncItemExpandedFlag(rowJustAdded);
updateMethodDisplay();
// 新勾选项目后默认展开，直接展示检查方法状态和套餐明细
row.expanded = true;
row.itemPackageExpanded = true;
row.methodPackageExpanded = true;
if (hasItemPackage(row)) {
await loadPackageDetailsForItem(row);
}
await nextTick();
form.totalAmount = totalAmountCalc.value;
// 自动回填执行科室：按检查项目类型 → 检查类型管理里配置的执行科室
if (selectedItems.value.length === 1 && cat?.performDeptName) {
@@ -1508,25 +1653,16 @@ async function handleItemSelect(checked, item, cat) {
// Bug #382 修复：移除自动切换页签逻辑，保持当前页签状态
}
// Bug #384修复 + #426修复: 展开/收起项目卡片
async function toggleItemExpand(item) {
item.expanded = !item.expanded;
if (item.expanded && hasItemPackage(item) && getPackageDetailsList(item).length === 0 && !item.packageDetailsLoading) {
await loadPackageDetailsForItem(item);
}
if (
item.expanded &&
shouldShowMethodPackageBody(item) &&
getMethodPackageDetailsList(item).length === 0 &&
!item.methodPackageLoading
) {
await loadMethodPackageDetails(item, item.selectedMethod);
}
/** expanded 与各折叠条保持一致（明细表等仍可依赖 expanded） */
function syncItemExpandedFlag(row) {
if (!row) return;
row.expanded = !!(row.projectFoldExpanded || row.methodFoldExpanded);
}
async function toggleItemPackageExpand(item) {
item.itemPackageExpanded = !item.itemPackageExpanded;
if (item.itemPackageExpanded && getPackageDetailsList(item).length === 0 && !item.packageDetailsLoading) {
async function toggleProjectFold(item) {
item.projectFoldExpanded = !item.projectFoldExpanded;
syncItemExpandedFlag(item);
if (item.projectFoldExpanded && hasItemPackage(item) && getPackageDetailsList(item).length === 0 && !item.packageDetailsLoading) {
await loadPackageDetailsForItem(item);
}
}
@@ -1543,25 +1679,64 @@ async function toggleMethodPackageExpand(item) {
}
}
// Bug #384修复: 勾选框选择检查方法（单选逻辑）
async function selectMethodCheckbox(checked, item, method) {
if (checked) {
item.selectedMethod = method;
item.expanded = true;
item.methodPackageExpanded = true;
// 动态加载该方法对应的套餐明细
await loadMethodPackageDetails(item, method);
} else {
item.selectedMethod = null;
item.methodPackageDetails = [];
async function toggleSelectedMethodFold(method) {
method.expanded = !method.expanded;
if (
method.expanded &&
hasStandaloneMethodPackage(method) &&
getStandaloneMethodPackageDetailsList(method).length === 0 &&
!method.packageLoading
) {
await loadStandaloneMethodPackageDetails(method);
}
// 联动更新表单检查方法显示字段
updateMethodDisplay();
}
// #430: 套餐金额实时同步到申请单
nextTick(() => {
form.totalAmount = totalAmountCalc.value;
});
function handleRemoveMethod(idx) {
selectedMethods.value.splice(idx, 1);
updateMethodDisplay();
}
async function loadStandaloneMethodPackageDetails(method) {
method.packageLoading = true;
method.packageDetails = [];
try {
let packageId = method.packageId;
if (!packageId && !method.packageName) {
method.packageLoading = false;
return;
}
if (!packageId && method.packageName) {
const pkgRes = await listCheckPackage({ packageName: method.packageName });
let packages = pkgRes?.data || [];
if (!Array.isArray(packages)) {
packages = packages.records || packages.data || [];
}
if (packages.length === 0) {
method.packageLoading = false;
return;
}
packageId = packages[0].id;
method.packageId = packageId;
}
const detailRes = await request({
url: `/system/check-type/package/${packageId}/details`,
method: 'get'
});
method.packageDetails = parsePackageDetailsPayload(detailRes).map(d => ({
id: d.id,
name: d.name || d.itemName,
quantity: d.quantity || 1,
unit: d.unit || '次',
price: d.price ?? d.unitPrice ?? d.itemPrice ?? 0,
amount: d.amount || d.total || 0,
checked: true
}));
} catch (err) {
console.error('加载检查方法套餐明细失败:', err);
method.packageDetails = [];
} finally {
method.packageLoading = false;
}
}
// 根据检查方法的packageName加载对应的套餐明细
@@ -1623,9 +1798,12 @@ async function onDetailMethodChange(row, val) {
}
row.methodPackageDetails = [];
updateMethodDisplay();
row.expanded = shouldShowPackageBody(row);
row.itemPackageExpanded = true;
row.methodPackageExpanded = true;
const open = shouldShowPackageBody(row);
row.expanded = open;
row.projectFoldExpanded = shouldShowItemPackageBody(row) && open;
row.methodFoldExpanded = shouldShowMethodPackageBody(row) && open;
row.methodPackageExpanded = false;
syncItemExpandedFlag(row);
if (hasItemPackage(row)) {
await loadPackageDetailsForItem(row);
}
@@ -1637,26 +1815,13 @@ async function onDetailMethodChange(row, val) {
});
}
// Bug #384修复: 更新检查方法显示字段（联动）
// Bug #384修复: 更新检查方法显示字段（取自独立已选检查方法）
function updateMethodDisplay() {
// 找到第一个有选中检查方法的项目
const itemWithMethod = selectedItems.value.find(item => item.selectedMethod);
if (itemWithMethod?.selectedMethod) {
form.selectedMethodDisplay = itemWithMethod.selectedMethod.name; // 显示检查方法名称，不显示套餐名称
} else {
form.selectedMethodDisplay = '';
if (selectedMethods.value.length > 0) {
form.selectedMethodDisplay = selectedMethods.value.map((method) => method.name).join('、');
return;
}
}
// 选择检查方法
function selectMethod(item, method) {
if (item.selectedMethod?.id === method.id) {
item.selectedMethod = null;
} else {
item.selectedMethod = method;
}
// Bug #384修复: 联动更新表单检查方法显示字段
updateMethodDisplay();
form.selectedMethodDisplay = '';
}
function handleRemoveItem(idx, item) {
@@ -1670,7 +1835,7 @@ function handleRemoveItem(idx, item) {
if (selectedItems.value.length === 0) {
form.performDeptCode = '';
form.examTypeCode = '';
form.selectedMethodDisplay = ''; // Bug #384修复: 清空检查方法显示
updateMethodDisplay();
} else {
// Bug #384修复: 移除后重新计算检查方法显示
updateMethodDisplay();
@@ -1976,39 +2141,167 @@ defineExpose({ getList });
overflow: hidden;
}
.selected-item-card .card-header {
display: flex;
align-items: center;
padding: 10px 10px;
cursor: pointer;
gap: 8px;
background: linear-gradient(180deg, #f8fafc 0%, #f0f4f8 100%);
border-bottom: 1px solid transparent;
/* 项目上 / 方法下：各自独立下拉条 */
.fold-strip {
border-bottom: 1px solid var(--el-border-color-lighter);
}
.selected-item-card .card-header:hover {
.fold-strip:last-child {
border-bottom: none;
}
.fold-strip-header {
display: flex;
align-items: flex-start;
gap: 8px;
padding: 10px 10px;
cursor: pointer;
background: linear-gradient(180deg, #f8fafc 0%, #f0f4f8 100%);
}
.fold-strip-header:hover {
background: linear-gradient(180deg, #ecf5ff 0%, #e3eef8 100%);
}
.selected-item-card.is-expanded .card-header {
border-bottom-color: #ebeef5;
.fold-strip-method.is-method-target .fold-strip-header {
background: linear-gradient(180deg, #e8f3ff 0%, #dceaff 100%);
}
.card-name {
.fold-chevron {
font-size: 14px;
color: #909399;
transition: transform 0.2s ease;
flex-shrink: 0;
margin-top: 2px;
transform: rotate(-90deg);
}
.fold-chevron.open {
transform: rotate(0deg);
}
.fold-header-main {
flex: 1;
min-width: 0;
display: flex;
flex-direction: column;
gap: 4px;
}
.fold-kicker {
font-size: 11px;
font-weight: 600;
color: #909399;
letter-spacing: 0.03em;
}
.fold-title {
font-size: 13px;
font-weight: 500;
font-weight: 600;
color: #303133;
line-height: 1.4;
line-height: 1.35;
word-break: break-word;
}
.card-price {
.fold-title-plain {
font-weight: 500;
color: #606266;
}
.line-clamp-2 {
display: -webkit-box;
-webkit-line-clamp: 2;
-webkit-box-orient: vertical;
overflow: hidden;
}
.fold-price-strong {
font-size: 13px;
color: #409eff;
font-weight: 600;
flex-shrink: 0;
margin-top: 2px;
}
.fold-price-strong.warn {
color: #e6a23c;
}
.fold-strip-body {
background: #fafbfc;
padding: 0 10px 10px 36px;
border-top: 1px dashed var(--el-border-color-lighter);
}
.fold-package-wrap {
padding-top: 6px;
}
.fold-strip-muted {
font-size: 12px;
color: #909399;
padding: 10px 0 4px;
}
.selected-global-method-picker {
flex-shrink: 0;
margin-top: 8px;
border-radius: 6px;
border: 1px solid #e4e7ed;
background: #fff;
overflow: hidden;
}
.method-picker-collapse-title {
display: flex;
align-items: center;
gap: 10px;
padding: 10px 10px;
cursor: pointer;
background: #fff;
}
.method-picker-collapse-title:hover {
background: #f5f7fa;
}
.method-picker-title-main {
flex: 1;
min-width: 0;
font-size: 13px;
font-weight: 600;
color: #303133;
}
.global-method-picker-scope {
font-size: 12px;
color: #909399;
flex-shrink: 0;
}
.method-picker-arrow {
font-size: 14px;
color: #909399;
transition: transform 0.2s ease;
flex-shrink: 0;
transform: rotate(-90deg);
}
.method-picker-arrow.expanded {
transform: rotate(0deg);
}
.global-method-picker-list {
display: flex;
flex-direction: column;
gap: 0;
padding: 6px 8px 8px;
border-top: 1px solid #ebeef5;
}
.method-picker-row {
padding: 6px 4px;
border-radius: 3px;
}
.expand-icon {
@@ -2058,11 +2351,6 @@ defineExpose({ getList });
white-space: nowrap;
}
/* 展开区域 */
.selected-card-body {
background: #fafbfc;
}
.selected-card-section {
padding: 10px;
border-bottom: 1px solid #ebeef5;
@@ -2112,6 +2400,49 @@ defineExpose({ getList });
color: #409eff;
}
/* 收起态：仅展示折叠箭头，不显示「套餐明细」等冗余标题 */
.package-toggle-minimal {
display: flex;
align-items: center;
justify-content: flex-start;
padding: 8px 10px;
font-size: 12px;
color: var(--el-text-color-secondary);
cursor: pointer;
border-bottom: 1px dashed #e4e7ed;
background: #fafafa;
}
.package-toggle-minimal:hover {
color: #409eff;
background: #f5f9ff;
}
.nested-empty-text {
font-size: 12px;
color: var(--el-text-color-placeholder);
padding-left: 2px;
}
.nested-label-row {
margin-bottom: 6px;
}
.nested-label {
font-size: 11px;
font-weight: 600;
color: var(--el-text-color-secondary);
letter-spacing: 0.03em;
}
.method-label-inner {
font-size: 13px;
}
.package-details-loading,
.package-details-empty {
padding: 12px 10px;

41
openhis-ui-vue3/src/views/doctorstation/components/inspection/inspectionApplication.vue
View File

@@ -179,8 +179,8 @@
type="datetime"
placeholder="选择执行时间"
size="small"
format="YYYY-MM-DD HH:mm:ss"
value-format="YYYY-MM-DD HH:mm:ss"
format="YYYY-MM-DD HH:mm"
value-format="YYYY-MM-DD HH:mm"
style="width: 100%"
/>
</el-form-item>
@@ -445,7 +445,6 @@
>
<el-table-column label="项目名称" prop="itemName" min-width="180">
<template #default="scope">
<el-tag v-if="scope.row.isPackage" size="small" type="warning" style="margin-right: 4px">套餐</el-tag>
<span :style="{ fontWeight: scope.row.isPackage ? 'bold' : 'normal' }">
{{ scope.row.itemName }}
</span>
@@ -563,7 +562,6 @@
@change="toggleInspectionItem(item)"
@click.stop
/>
<el-tag v-if="item.isPackage" size="small" type="warning" style="margin-right: 4px">套餐</el-tag>
<span class="item-itemName">{{ item.itemName }}</span>
<span class="item-price">¥{{ item.itemPrice }}/{{ item.unit || "次" }}</span>
</div>
@@ -614,7 +612,6 @@
<template v-if="item.isPackage">{{ item.expanded ? '▼' : '▶' }}</template>
<template v-else>•</template>
</span>
<el-tag v-if="item.isPackage" size="small" type="warning" style="margin-right: 4px">套餐</el-tag>
<span class="item-itemName">{{ item.itemName }}</span>
<span class="item-price">¥{{ item.itemPrice }}/{{ item.unit || "次" }}</span>
<el-button
@@ -875,6 +872,30 @@ let applyTimeTimer = null
const userStore = useUserStore()
const { id: userId, name: userName, nickName: userNickName } = storeToRefs(userStore)
/** 执行时间默认值：当前系统时间，精确到分钟 */
const getDefaultExecuteTime = () => {
const d = new Date()
const year = d.getFullYear()
const month = String(d.getMonth() + 1).padStart(2, '0')
const day = String(d.getDate()).padStart(2, '0')
const hours = String(d.getHours()).padStart(2, '0')
const minutes = String(d.getMinutes()).padStart(2, '0')
return `${year}-${month}-${day} ${hours}:${minutes}`
}
/** 将后端时间规范为 YYYY-MM-DD HH:mm */
const normalizeExecuteTime = (value) => {
if (!value) return getDefaultExecuteTime()
const d = new Date(String(value).replace(/-/g, '/'))
if (Number.isNaN(d.getTime())) return getDefaultExecuteTime()
const year = d.getFullYear()
const month = String(d.getMonth() + 1).padStart(2, '0')
const day = String(d.getDate()).padStart(2, '0')
const hours = String(d.getHours()).padStart(2, '0')
const minutes = String(d.getMinutes()).padStart(2, '0')
return `${year}-${month}-${day} ${hours}:${minutes}`
}
// 修改 initData 函数
const initData = async () => {
// 先初始化患者信息（如果有）
@@ -897,6 +918,10 @@ const initData = async () => {
formData.applyNo = '自动生成'
// 申请日期实时更新（启动定时器）
startApplyTimeTimer()
// 执行时间默认当前系统时间（精确到分钟）
if (!formData.executeTime) {
formData.executeTime = getDefaultExecuteTime()
}
// 执行时间默认填充当前系统时间
formData.executeTime = formatDateTime(new Date())
@@ -978,7 +1003,7 @@ const formData = reactive({
applyDeptCode: '',
specimenName: '血液',
encounterId: '',
executeTime: null,
executeTime: getDefaultExecuteTime(),
applicationType: 0
})
@@ -1550,7 +1575,7 @@ const resetForm = async () => {
visitNo: '',
specimenName: '血液',
encounterId: props.patientInfo.encounterId || '',
executeTime: null,
executeTime: getDefaultExecuteTime(),
applicationType: 0,
})
selectedInspectionItems.value = []
@@ -1988,7 +2013,7 @@ const loadApplicationToForm = async (row) => {
visitNo: detail.visitNo,
specimenName: detail.specimenName,
encounterId: detail.encounterId,
executeTime: detail.executeTime || null,
executeTime: normalizeExecuteTime(detail.executeTime),
applicationType: detail.applicationType ?? 0
})

33
openhis-ui-vue3/src/views/doctorstation/components/prescription/prescriptionHistory.vue
View File

@@ -18,16 +18,12 @@
<!-- <el-table-column label="组套类型" align="center" prop="typeEnum_enumText" /> -->
<el-table-column label="单次剂量" align="center" prop="rangeCode_dictText">
<template #default="scope">
{{
scope.row.dose
? formatNumber(scope.row.dose) + ' ' + scope.row.doseUnitCode_dictText
: ''
}}
{{ formatHistoryDose(scope.row) }}
</template>
</el-table-column>
<el-table-column label="总量" align="center" prop="rangeCode_dictText">
<template #default="scope">
{{ scope.row.quantity ? scope.row.quantity + ' ' + scope.row.unitCode_dictText : '' }}
{{ formatHistoryTotalQuantity(scope.row) }}
</template>
</el-table-column>
<el-table-column label="频次/用法" align="center" prop="rangeCode_dictText" width="200">
@@ -90,6 +86,31 @@ const queryParams = ref({
typeEnum: 1,
});
function formatHistoryTotalQuantity(row) {
if (!row || row.quantity == null || row.quantity === '') return '';
const fromDict = row.unitCode_dictText ?? row.minUnitCode_dictText ?? row.unitCodeName;
let u =
fromDict != null && String(fromDict).trim() !== ''
&& String(fromDict).toLowerCase() !== 'null'
? String(fromDict).trim()
: '';
if (!u) {
const t = Number(row.adviceType);
if (t === 3 || t === 6 || t === 23 || t === 5) u = '次';
else if (t === 4) u = '个';
}
return u ? `${row.quantity} ${u}` : String(row.quantity);
}
function formatHistoryDose(row) {
if (!row?.dose) return '';
const du = row.doseUnitCode_dictText;
if (du != null && String(du).trim() !== '' && String(du).toLowerCase() !== 'null') {
return formatNumber(row.dose) + ' ' + du;
}
return formatNumber(row.dose);
}
function handleOpen() {
drawer.value = true;
getList();

18
openhis-ui-vue3/src/views/doctorstation/components/prescription/prescriptionInfo.vue
View File

@@ -82,7 +82,7 @@
<span>{{ index + 1 + '. ' }}</span>
<span>{{ medItem.adviceName }}</span>
<span>{{ '(' + medItem.volume + ')' }}</span>
<span>{{ medItem.quantity + ' ' + medItem.unitCode_dictText }}</span>
<span>{{ formatPrintLineQuantity(medItem) }}</span>
<span>{{ '批次号：' + medItem.lotNumber }}</span>
<div>
<span>用法用量：</span>
@@ -161,6 +161,22 @@ const props = defineProps({
const emit = defineEmits(['close']);
//合计
function formatPrintLineQuantity(row) {
if (row == null || row.quantity == null || row.quantity === '') return '';
const fromDict = row.unitCode_dictText ?? row.minUnitCode_dictText ?? row.unitCodeName;
let u =
fromDict != null && String(fromDict).trim() !== ''
&& String(fromDict).toLowerCase() !== 'null'
? String(fromDict).trim()
: '';
if (!u) {
const t = Number(row.adviceType);
if (t === 3 || t === 6 || t === 23 || t === 5) u = '次';
else if (t === 4) u = '个';
}
return u ? `${row.quantity} ${u}` : String(row.quantity);
}
function getTotalPrice(item) {
let totalPrice = new Decimal(0);
item.prescriptionInfoDetailList.forEach((medItem) => {

50
openhis-ui-vue3/src/views/doctorstation/components/prescription/prescriptionlist.vue
View File

@@ -686,7 +686,15 @@
<span style="margin-left: 4px">{{ scope.row.doseUnitCode_dictText }}</span>
</template>
<span v-else>
{{ scope.row.dose ? scope.row.dose + ' ' + scope.row.doseUnitCode_dictText : '' }}
{{
scope.row.dose
? scope.row.dose +
(scope.row.doseUnitCode_dictText &&
String(scope.row.doseUnitCode_dictText).toLowerCase() !== 'null'
? ' ' + scope.row.doseUnitCode_dictText
: '')
: ''
}}
</span>
</template>
</el-table-column>
@@ -703,10 +711,10 @@
@change="calculateTotalPrice(scope.row, scope.$index)"
@input="calculateTotalPrice(scope.row, scope.$index)"
/>
<span style="margin-left: 4px">{{ scope.row.unitCode_dictText }}</span>
<span style="margin-left: 4px">{{ resolveTotalQuantityUnit(scope.row) }}</span>
</template>
<span v-else>
{{ scope.row.quantity ? scope.row.quantity + ' ' + scope.row.unitCode_dictText : '' }}
{{ formatTotalQuantityWithUnit(scope.row) }}
</span>
</template>
</el-table-column>
@@ -917,6 +925,39 @@ const unitMap = ref({
minUnit: 'minUnit',
unit: 'unit',
});
/** 解析总量单位文案（无字典时：诊疗/手术/检查默认「次」，耗材默认「个」） */
const resolveTotalQuantityUnit = (row) => {
if (row == null) return '';
const fromDict =
row.unitCode_dictText ?? row.minUnitCode_dictText ?? row.unitCodeName;
let unitStr =
fromDict != null && String(fromDict).trim() !== ''
&& String(fromDict).toLowerCase() !== 'null'
? String(fromDict).trim()
: '';
if (!unitStr) {
const t = Number(row.adviceType);
// drord_doctor_type: 3=诊疗 4=耗材 5=会诊 6=手术；23=检查（特殊）
// 注意：2=中成药（药品），不可用「次」作为默认单位
if (t === 3 || t === 6 || t === 23 || t === 5) {
unitStr = '次';
} else if (t === 4) {
unitStr = '个';
}
}
return unitStr;
};
/** 总量列展示：避免 unitCode_dictText 为空时显示「1 null」 */
const formatTotalQuantityWithUnit = (row) => {
if (row == null) return '';
const q = row.quantity;
if (q === undefined || q === null || q === '') return '';
const unitStr = resolveTotalQuantityUnit(row);
return unitStr ? `${q} ${unitStr}` : String(q);
};
const buttonDisabled = computed(() => {
return !props.patientInfo;
});
@@ -2714,7 +2755,8 @@ function handleEmrTreatment() {
treatment += '诊疗[' + (index + 1) + ']' + ' ';
treatment += item.adviceName + ' ';
if (item.quantity) {
treatment += '数量：' + item.quantity + item.unitCode_dictText + ' ';
const u = resolveTotalQuantityUnit(item);
treatment += '数量：' + item.quantity + (u ? ' ' + u : '') + ' ';
}
treatment += '频次：' + item.rateCode_dictText + ' ';
if (item.methodCode_dictText) {