Merge remote-tracking branch 'origin/develop' into develop

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

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