403 住院医生工作站：应用医嘱组套后，药品明细字段内容丢失未正确引入表格 521 [住院医生站-临床医嘱-检查申请] 手工选择执行科室后，保存仍提示“未找到项目执行的科室” 528 [住院医生工作站-检查申请] 修改申请单成功后，弹窗未自动关闭且列表数据未自动刷新 531 [住院医生站-临床医嘱-检查] 检查申请单打开数据没有正常加载
This commit is contained in:
Ranyunqiao
@@ -564,22 +564,74 @@ function handleRemoveItem(index) {
|
||||
editingGroup.value.detailList.splice(index, 1);
|
||||
}
|
||||
|
||||
// 单击应用按钮
|
||||
function handleUseOrderGroup(row) {
|
||||
// 单击应用按钮（应用组套）
|
||||
async function handleUseOrderGroup(row) {
|
||||
if (!row.detailList || row.detailList.length === 0) {
|
||||
ElMessage.warning('该组套没有明细项');
|
||||
return;
|
||||
}
|
||||
|
||||
// 🔧 Bug 修复：组套保存时未持久化 orderDetailInfos，导致应用时缺失医嘱库信息。
|
||||
// 通过 API 批量查询补全，确保 setValue 能获取到 adviceType、inventoryList、priceList 等关键字段。
|
||||
const itemsMissingDetail = row.detailList.filter(
|
||||
item => !item.orderDetailInfos || Object.keys(item.orderDetailInfos).length === 0
|
||||
);
|
||||
const detailMap = {};
|
||||
if (itemsMissingDetail.length > 0) {
|
||||
const ids = itemsMissingDetail
|
||||
.map(item => item.orderDefinitionId)
|
||||
.filter(Boolean)
|
||||
.join(',');
|
||||
if (ids) {
|
||||
try {
|
||||
const res = await getAdviceBaseInfo({
|
||||
adviceDefinitionIdParamList: ids,
|
||||
organizationId: props.organizationId,
|
||||
});
|
||||
const records = res.data?.records || res.rows || [];
|
||||
records.forEach(rec => {
|
||||
if (rec.adviceDefinitionId) {
|
||||
detailMap[rec.adviceDefinitionId] = rec;
|
||||
}
|
||||
});
|
||||
} catch (e) {
|
||||
// 批量查询失败，使用原始 orderDetailInfos
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// 🔧 辅助函数：根据字典 code 查找对应的 dictText
|
||||
const findDictText = (dictList, code) => {
|
||||
if (!code || !dictList?.value?.length) return '';
|
||||
const found = dictList.value.find(d => d.value === code);
|
||||
return found?.label || '';
|
||||
};
|
||||
|
||||
// 🔧 数据预处理：确保每个明细项都有完整的医嘱信息
|
||||
const processedDetailList = row.detailList.map(item => {
|
||||
const orderDetail = item.orderDetailInfos || {};
|
||||
// 优先使用组套中已带的 orderDetailInfos，否则使用 API 查询结果
|
||||
const orderDetail = (item.orderDetailInfos && Object.keys(item.orderDetailInfos).length > 0)
|
||||
? item.orderDetailInfos
|
||||
: (detailMap[item.orderDefinitionId] || {});
|
||||
|
||||
// 🔧 修复：组套明细只存了 methodCode/rateCode，没有 dictText。
|
||||
// 用字典查找补充 dictText，确保界面显示正确的用法/频次名称。
|
||||
const resolvedMethodCode = item.methodCode ?? orderDetail.methodCode;
|
||||
const resolvedRateCode = item.rateCode ?? orderDetail.rateCode;
|
||||
const methodCodeDictText = item.methodCode_dictText
|
||||
|| findDictText(method_code, resolvedMethodCode)
|
||||
|| orderDetail.methodCode_dictText
|
||||
|| '';
|
||||
const rateCodeDictText = item.rateCode_dictText
|
||||
|| findDictText(rate_code, resolvedRateCode)
|
||||
|| orderDetail.rateCode_dictText
|
||||
|| '';
|
||||
|
||||
return {
|
||||
// 组套明细字段
|
||||
...item,
|
||||
|
||||
// 医嘱库字段（可能为空，需要兜底）
|
||||
// 医嘱库字段
|
||||
adviceName: orderDetail.adviceName || item.orderDefinitionName || '未知项目',
|
||||
adviceType: orderDetail.adviceType,
|
||||
adviceDefinitionId: item.orderDefinitionId || orderDetail.adviceDefinitionId,
|
||||
@@ -592,7 +644,6 @@ function handleUseOrderGroup(row) {
|
||||
partPercent: orderDetail.partPercent ?? 1,
|
||||
partAttributeEnum: orderDetail.partAttributeEnum,
|
||||
unitConversionRatio: orderDetail.unitConversionRatio,
|
||||
// 🔧 Bug #218 修复：positionId 可能存储在 item 本身，优先使用 item.positionId
|
||||
positionId: item.positionId ?? orderDetail.positionId,
|
||||
defaultLotNumber: orderDetail.defaultLotNumber,
|
||||
|
||||
@@ -602,6 +653,10 @@ function handleUseOrderGroup(row) {
|
||||
unitCodeName: item.unitCodeName || orderDetail.unitCode_dictText,
|
||||
minUnitCode: orderDetail.minUnitCode,
|
||||
doseUnitCode: orderDetail.doseUnitCode,
|
||||
|
||||
// 字典文本（传递到 item 层级，避免后续代码依赖 mergedDetail 再查一次）
|
||||
methodCode_dictText: methodCodeDictText,
|
||||
rateCode_dictText: rateCodeDictText,
|
||||
|
||||
// 合并后的完整对象（用于 setValue）
|
||||
// 先展开 orderDetail 获取所有药品基础字段（categoryCode、minUnitCode、doseUnitCode、
|
||||
@@ -616,19 +671,19 @@ function handleUseOrderGroup(row) {
|
||||
categoryCode: item.categoryCode ?? orderDetail.categoryCode,
|
||||
unitCodeName: item.unitCodeName,
|
||||
dose: item.dose ?? orderDetail.dose,
|
||||
rateCode: item.rateCode ?? orderDetail.rateCode,
|
||||
methodCode: item.methodCode ?? orderDetail.methodCode,
|
||||
rateCode: resolvedRateCode,
|
||||
rateCode_dictText: rateCodeDictText,
|
||||
methodCode: resolvedMethodCode,
|
||||
methodCode_dictText: methodCodeDictText,
|
||||
dispensePerDuration: item.dispensePerDuration ?? orderDetail.dispensePerDuration,
|
||||
doseQuantity: item.doseQuantity ?? orderDetail.doseQuantity,
|
||||
// 🔧 Bug #218 / #403 修复：positionId 可能存储在 item 本身，优先使用 item.positionId
|
||||
positionId: item.positionId ?? orderDetail.positionId,
|
||||
// 执行科室：优先使用组套明细中保存的 orgId
|
||||
orgId: item.orgId ?? orderDetail.orgId,
|
||||
orgName: item.orgName ?? orderDetail.orgName,
|
||||
// 组号（保留组套中的分组信息）
|
||||
groupId: item.groupId,
|
||||
groupOrder: item.groupOrder,
|
||||
therapyEnum: item.therapyEnum ?? orderDetail.therapyEnum ?? '1',
|
||||
// 🔧 类型默认为临时医嘱（2=临时，1=长期）
|
||||
therapyEnum: item.therapyEnum ?? orderDetail.therapyEnum ?? '2',
|
||||
}
|
||||
};
|
||||
});
|
||||
@@ -645,9 +700,9 @@ function handlePreviewGroup(row) {
|
||||
}
|
||||
|
||||
// 确认应用组套（从预览对话框）
|
||||
function confirmUseGroup() {
|
||||
async function confirmUseGroup() {
|
||||
if (currentGroup.value) {
|
||||
handleUseOrderGroup(currentGroup.value);
|
||||
await handleUseOrderGroup(currentGroup.value);
|
||||
previewVisible.value = false;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -3662,6 +3662,13 @@ function handleSaveGroup(orderGroupList) {
|
||||
defaultLotNumber: item.orderDetailInfos?.defaultLotNumber,
|
||||
};
|
||||
|
||||
// 🔧 Bug 修复：字典查找兜底，防止 mergedDetail 中 dictText 为空
|
||||
const findDictText = (dictList, code) => {
|
||||
if (!code || !dictList?.length) return '';
|
||||
const found = dictList.find(d => d.value === code);
|
||||
return found?.label || '';
|
||||
};
|
||||
|
||||
// 在 setValue 之前预初始化空行
|
||||
prescriptionList.value[rowIndex.value] = {
|
||||
uniqueKey: nextId.value++,
|
||||
@@ -3672,43 +3679,105 @@ function handleSaveGroup(orderGroupList) {
|
||||
// 使用医嘱项目详情设置值
|
||||
setValue(mergedDetail);
|
||||
|
||||
// 🔧 Bug 修复：使用 mergedDetail 优先，避免 item 中 undefined 覆盖 setValue 中已设置的字段
|
||||
const resolvedQuantity = mergedDetail.quantity ?? item.quantity ?? 1;
|
||||
const resolvedDose = mergedDetail.dose ?? item.dose;
|
||||
const resolvedMethodCode = mergedDetail.methodCode ?? item.methodCode;
|
||||
const resolvedRateCode = mergedDetail.rateCode ?? item.rateCode;
|
||||
const resolvedUnitCode = mergedDetail.unitCode ?? item.unitCode;
|
||||
|
||||
// 🔧 Bug 修复：setValue 可能因库存不足提前 return，导致 unitPrice/minUnitPrice 等字段未设置。
|
||||
// 从 mergedDetail 或 item 中获取兜底值，避免价格计算产生 NaN。
|
||||
const safePrice = (val) => {
|
||||
const n = Number(val);
|
||||
return (n !== undefined && n !== null && !isNaN(n) && isFinite(n)) ? n : 0;
|
||||
};
|
||||
const resolvedUnitPrice = safePrice(
|
||||
prescriptionList.value[rowIndex.value]?.unitPrice
|
||||
?? mergedDetail.unitPrice
|
||||
?? item.unitPrice
|
||||
?? 0
|
||||
);
|
||||
const resolvedMinUnitPrice = safePrice(
|
||||
prescriptionList.value[rowIndex.value]?.minUnitPrice
|
||||
?? mergedDetail.minUnitPrice
|
||||
?? item.minUnitPrice
|
||||
?? 0
|
||||
);
|
||||
const resolvedPartPercent = safePrice(
|
||||
item.orderDetailInfos?.partPercent
|
||||
?? mergedDetail.partPercent
|
||||
?? 1
|
||||
);
|
||||
|
||||
// 创建新的处方项目
|
||||
const newRow = {
|
||||
...prescriptionList.value[rowIndex.value],
|
||||
patientId: props.patientInfo.patientId,
|
||||
encounterId: props.patientInfo.encounterId,
|
||||
accountId: accountId.value,
|
||||
quantity: item.quantity,
|
||||
methodCode: item.methodCode,
|
||||
rateCode: item.rateCode,
|
||||
dispensePerDuration: item.dispensePerDuration,
|
||||
dose: item.dose,
|
||||
doseQuantity: item.doseQuantity,
|
||||
quantity: resolvedQuantity,
|
||||
methodCode: resolvedMethodCode,
|
||||
methodCode_dictText: mergedDetail.methodCode_dictText
|
||||
|| findDictText(method_code.value, resolvedMethodCode)
|
||||
|| '',
|
||||
rateCode: resolvedRateCode,
|
||||
rateCode_dictText: mergedDetail.rateCode_dictText
|
||||
|| findDictText(rate_code.value, resolvedRateCode)
|
||||
|| '',
|
||||
dispensePerDuration: mergedDetail.dispensePerDuration ?? item.dispensePerDuration,
|
||||
dose: resolvedDose,
|
||||
doseQuantity: mergedDetail.doseQuantity ?? item.doseQuantity,
|
||||
executeNum: 1,
|
||||
unitCode: item.unitCode,
|
||||
unitCode_dictText: item.unitCodeName || '',
|
||||
unitCode: resolvedUnitCode,
|
||||
unitCode_dictText: item.unitCodeName
|
||||
|| mergedDetail.unitCodeName
|
||||
|| findDictText(unit_code.value, resolvedUnitCode)
|
||||
|| '',
|
||||
doseUnitCode: mergedDetail.doseUnitCode,
|
||||
doseUnitCode_dictText: mergedDetail.doseUnitCode_dictText || '',
|
||||
// 🔧 确保 price/adviceType 字段有安全默认值（避免 NaN 导致模板条件判断失效）
|
||||
unitPrice: resolvedUnitPrice,
|
||||
minUnitPrice: resolvedMinUnitPrice,
|
||||
unitTempPrice: resolvedUnitPrice,
|
||||
adviceType: prescriptionList.value[rowIndex.value]?.adviceType
|
||||
|| Number(mergedDetail.adviceType)
|
||||
|| Number(item.adviceType)
|
||||
|| 0,
|
||||
adviceType_dictText: prescriptionList.value[rowIndex.value]?.adviceType_dictText
|
||||
|| mergedDetail.adviceType_dictText
|
||||
|| item.adviceType_dictText
|
||||
|| '',
|
||||
statusEnum: 1,
|
||||
// 🔧 类型：组套应用默认为临时医嘱（2=临时，1=长期）
|
||||
therapyEnum: mergedDetail.therapyEnum ?? item.therapyEnum ?? '2',
|
||||
// 🔧 修复执行科室逻辑：优先使用 orgId(所属科室)，其次 positionId
|
||||
// 🔧 Bug #455: 诊疗类(adviceType=3)使用患者就诊科室，不使用目录配置的ID
|
||||
orgId: item.adviceType === 3
|
||||
? props.patientInfo?.orgId
|
||||
: (item.orderDetailInfos?.orgId || mergedDetail.orgId || item.positionId || item.orderDetailInfos?.positionId || mergedDetail.positionId),
|
||||
positionName: prescriptionList.value[rowIndex.value]?.positionName
|
||||
|| mergedDetail.orgName
|
||||
|| mergedDetail.positionName
|
||||
|| findOrgNameById(mergedDetail.orgId || props.patientInfo?.orgId)
|
||||
|| '',
|
||||
dbOpType: prescriptionList.value[rowIndex.value].requestId ? '2' : '1',
|
||||
conditionId: conditionId.value,
|
||||
conditionDefinitionId: conditionDefinitionId.value,
|
||||
encounterDiagnosisId: encounterDiagnosisId.value,
|
||||
diagnosisName: diagnosisName.value,
|
||||
};
|
||||
|
||||
// 计算价格和总量
|
||||
const unitInfo = unitCodeList.value.find((k) => k.value == item.unitCode);
|
||||
// 计算价格和总量（使用安全值）
|
||||
const unitInfo = unitCodeList.value.find((k) => k.value == resolvedUnitCode);
|
||||
if (unitInfo && unitInfo.type == 'minUnit') {
|
||||
newRow.price = newRow.minUnitPrice;
|
||||
newRow.totalPrice = (item.quantity * newRow.minUnitPrice).toFixed(6);
|
||||
newRow.minUnitQuantity = item.quantity;
|
||||
newRow.price = resolvedMinUnitPrice;
|
||||
newRow.totalPrice = (resolvedQuantity * resolvedMinUnitPrice).toFixed(6);
|
||||
newRow.minUnitQuantity = resolvedQuantity;
|
||||
} else {
|
||||
newRow.price = newRow.unitPrice;
|
||||
newRow.totalPrice = (item.quantity * newRow.unitPrice).toFixed(6);
|
||||
newRow.minUnitQuantity = item.quantity * (item.orderDetailInfos?.partPercent || mergedDetail.partPercent || 1);
|
||||
newRow.price = resolvedUnitPrice;
|
||||
newRow.totalPrice = (resolvedQuantity * resolvedUnitPrice).toFixed(6);
|
||||
newRow.minUnitQuantity = resolvedQuantity * resolvedPartPercent;
|
||||
}
|
||||
|
||||
newRow.contentJson = JSON.stringify(newRow);
|
||||
|
||||
Reference in New Issue
Block a user