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

Fix Bug #403: 住院医生工作站：应用医嘱组套后，药品明细字段内容丢失未正确引入表格

Browse Source 
修复 handleSaveGroup 中 mergedDetail 和 newRow 构建时的空值处理问题：
1. mergedDetail 中 dose/doseQuantity/dispensePerDuration 使用严格 null 检查，
   避免组套中值为 null 时错误回退到 orderDetailInfos
2. newRow 中关键字段增加 mergedDetail 回退（?? 操作符），
   确保当 item 中字段为 null/undefined 时能从 setValue 填充的完整数据中获取

Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
This commit is contained in:
赵云
2026-05-13 14:13:56 +08:00
parent e98901096e
commit 7f7d28e10b
1 changed files with 17 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
openhis-ui-vue3/src/views/inpatientDoctor/home/components/order/index.vue
View File

@@ -1571,17 +1571,21 @@ function handleSaveGroup(orderGroupList) {
// 🔥 新版组件已经预处理了数据，优先使用 mergedDetail // 🔥 新版组件已经预处理了数据，优先使用 mergedDetail
const mergedDetail = item.mergedDetail || { const mergedDetail = item.mergedDetail || {
...(item.orderDetailInfos || {}), ...(item.orderDetailInfos || {}),
adviceName: item.orderDetailInfos?.adviceName || item.orderDefinitionName || '未知项目', adviceName: item.orderDefinitionName || item.orderDetailInfos?.adviceName || '未知项目',
adviceType: item.orderDetailInfos?.adviceType, adviceType: item.orderDetailInfos?.adviceType,
adviceDefinitionId: item.orderDefinitionId || item.orderDetailInfos?.adviceDefinitionId, adviceDefinitionId: item.orderDefinitionId || item.orderDetailInfos?.adviceDefinitionId,
quantity: item.quantity, quantity: item.quantity,
unitCode: item.unitCode || item.orderDetailInfos?.unitCode, unitCode: item.unitCode || item.orderDetailInfos?.unitCode,
unitCodeName: item.unitCodeName, unitCodeName: item.unitCodeName,
dose: item.dose || item.orderDetailInfos?.dose, // 🔧 Bug #403 修复：dose/doseQuantity/dispensePerDuration 需用 null 检查，
// 避免组套中值为 null 时回退到医嘱库的 orderDetailInfos
dose: item.dose !== undefined && item.dose !== null ? item.dose : item.orderDetailInfos?.dose,
rateCode: item.rateCode || item.orderDetailInfos?.rateCode, rateCode: item.rateCode || item.orderDetailInfos?.rateCode,
methodCode: item.methodCode || item.orderDetailInfos?.methodCode, methodCode: item.methodCode || item.orderDetailInfos?.methodCode,
dispensePerDuration: item.dispensePerDuration || item.orderDetailInfos?.dispensePerDuration, dispensePerDuration: item.dispensePerDuration !== undefined && item.dispensePerDuration !== null
doseQuantity: item.doseQuantity, ? item.dispensePerDuration : item.orderDetailInfos?.dispensePerDuration,
doseQuantity: item.doseQuantity !== undefined && item.doseQuantity !== null
? item.doseQuantity : item.orderDetailInfos?.doseQuantity,
inventoryList: item.orderDetailInfos?.inventoryList || [], inventoryList: item.orderDetailInfos?.inventoryList || [],
priceList: item.orderDetailInfos?.priceList || [], priceList: item.orderDetailInfos?.priceList || [],
partPercent: item.orderDetailInfos?.partPercent || 1, partPercent: item.orderDetailInfos?.partPercent || 1,
@@ -1600,20 +1604,21 @@ function handleSaveGroup(orderGroupList) {
setValue(mergedDetail); setValue(mergedDetail);
// 创建新的处方项目 // 创建新的处方项目
// 🔧 Bug #403 修复：关键字段使用 null-safe 回退到 mergedDetail（已由 setValue 填充完整数据）
const newRow = { const newRow = {
...prescriptionList.value[rowIndex.value], ...prescriptionList.value[rowIndex.value],
patientId: patientInfo.value.patientId, patientId: patientInfo.value.patientId,
encounterId: patientInfo.value.encounterId, encounterId: patientInfo.value.encounterId,
accountId: accountId.value, accountId: accountId.value,
quantity: item.quantity, quantity: item.quantity ?? mergedDetail.quantity,
methodCode: item.methodCode, methodCode: item.methodCode ?? mergedDetail.methodCode,
rateCode: item.rateCode, rateCode: item.rateCode ?? mergedDetail.rateCode,
dispensePerDuration: item.dispensePerDuration, dispensePerDuration: item.dispensePerDuration ?? mergedDetail.dispensePerDuration,
dose: item.dose, dose: item.dose ?? mergedDetail.dose,
doseQuantity: item.doseQuantity, doseQuantity: item.doseQuantity ?? mergedDetail.doseQuantity,
executeNum: 1, executeNum: 1,
unitCode: item.unitCode, unitCode: item.unitCode ?? mergedDetail.unitCode,
unitCode_dictText: item.unitCodeName || '', unitCode_dictText: item.unitCodeName || mergedDetail.unitCodeName || '',
statusEnum: 1, statusEnum: 1,
orgId: resolveOrgId(item.orderDetailInfos?.orgId || mergedDetail.orgId || patientInfo.value?.inHospitalOrgId) || '', orgId: resolveOrgId(item.orderDetailInfos?.orgId || mergedDetail.orgId || patientInfo.value?.inHospitalOrgId) || '',
// 🔧 修复：同时保存 orgName，确保树匹配不到时仍有中文名称可显示 // 🔧 修复：同时保存 orgName，确保树匹配不到时仍有中文名称可显示