Yajentine/his
2
2
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: Yajentine:83e0c663c99de9eed860129a29e0c60ada138238
Branches Tags
Yajentine:develop Yajentine:master Yajentine:wangjunping
...
compare: Yajentine:642c4a0941354431bbf00d031b8b3d7b1f7eb2ee
Branches Tags
Yajentine:develop Yajentine:master Yajentine:wangjunping

2 Commits
83e0c663c9 ... 642c4a0941

Author SHA1 Message Date
wzk
642c4a0941 Merge remote-tracking branch 'origin/develop' into develop 2025-10-31 12:38:34 +08:00
wzk
30953d5771 开立医嘱的执行科室默认获取诊疗项目维护的所属科室 2025-10-31 12:38:22 +08:00
1 changed files with 10 additions and 6 deletions
Expand all files Collapse all files

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

@@ -1103,7 +1103,9 @@ function selectAdviceBase(key, row) {
prescriptionList.value[rowIndex.value].positionName = stock.locationName; prescriptionList.value[rowIndex.value].positionName = stock.locationName;
} }
} else { } else {
prescriptionList.value[rowIndex.value].orgId = JSON.parse(JSON.stringify(row)).positionId; // 执行科室默认逻辑：优先使用诊疗项目维护的所属科室，如果没有则使用开单科室
const defaultOrgId = row.positionId || props.patientInfo.orgId;
prescriptionList.value[rowIndex.value].orgId = defaultOrgId;
prescriptionList.value[rowIndex.value].unitPrice = row.priceList[0].price; prescriptionList.value[rowIndex.value].unitPrice = row.priceList[0].price;
} }
expandOrder.value = [key]; expandOrder.value = [key];
@@ -1499,7 +1501,9 @@ function setValue(row) {
.toFixed(2); .toFixed(2);
} }
} else { } else {
prescriptionList.value[rowIndex.value].orgId = JSON.parse(JSON.stringify(row)).positionId; // 执行科室默认逻辑：优先使用诊疗项目维护的所属科室，如果没有则使用开单科室
const defaultOrgId = row.positionId || props.patientInfo.orgId;
prescriptionList.value[rowIndex.value].orgId = defaultOrgId;
prescriptionList.value[rowIndex.value].unitPrice = row.priceList[0].price; prescriptionList.value[rowIndex.value].unitPrice = row.priceList[0].price;
} }
} }