372 【住院医生站】医嘱录入执行科室显示ID乱码,且缺乏动态匹配逻辑

373 【住院医生站】医嘱搜索缺失“II级护理”项目(与诊疗目录配置不符)
This commit is contained in:
2026-04-22 15:35:25 +08:00
parent d663c46422
commit f125c8dc85
8 changed files with 213 additions and 39 deletions

View File

@@ -3305,8 +3305,9 @@ function syncGroupFields(row) {
}
// 同步执行科室
if (row.positionId || row.orgId) {
prescriptionList.value[rowIndex.value].orgId = row.positionId || row.orgId;
if (row.orgId || row.positionId) {
// 🔧 修复:优先使用项目所属科室(orgId)其次positionId
prescriptionList.value[rowIndex.value].orgId = row.orgId || row.positionId;
}
// 同步皮试标记
@@ -3390,9 +3391,8 @@ function setValue(row) {
showPopover: false, // 确保查询框关闭
};
console.log('[BugFix] setValue - prescriptionList[rowIndex].adviceType_dictText:', prescriptionList.value[rowIndex.value].adviceType_dictText);
// 🔧 Bug #218 修复保留组套中的值不要强制设为undefined
// 只有当值未定义时才使用默认值
prescriptionList.value[rowIndex.value].orgId = row.positionId || row.orgId;
// 🔧 修复执行科室逻辑:优先使用项目维护的所属科室(row.orgId)其次使用positionId最后回退到患者科室
prescriptionList.value[rowIndex.value].orgId = row.orgId || row.positionId || props.patientInfo?.orgId;
prescriptionList.value[rowIndex.value].dose = row.dose || row.doseQuantity;
prescriptionList.value[rowIndex.value].quantity = row.quantity || 1;
prescriptionList.value[rowIndex.value].unitCodeList = unitCodeList.value;
@@ -3619,8 +3619,8 @@ function handleSaveGroup(orderGroupList) {
unitCode: item.unitCode,
unitCode_dictText: item.unitCodeName || '',
statusEnum: 1,
// 🔧 Bug #218 修复:优先使用 item.positionId其次使用 orderDetailInfos.positionId
orgId: item.positionId || item.orderDetailInfos?.positionId || mergedDetail.positionId,
// 🔧 修复执行科室逻辑:优先使用 orgId(所属科室),其次 positionId
orgId: item.orderDetailInfos?.orgId || mergedDetail.orgId || item.positionId || item.orderDetailInfos?.positionId || mergedDetail.positionId,
dbOpType: prescriptionList.value[rowIndex.value].requestId ? '2' : '1',
conditionId: conditionId.value,
conditionDefinitionId: conditionDefinitionId.value,