From 5fa4497f685508ea8c2b86a64c0b7740020899ae Mon Sep 17 00:00:00 2001
From: wangjian963 <15215920+aprilry@user.noreply.gitee.com>
Date: Mon, 1 Jun 2026 09:40:52 +0800
Subject: [PATCH] =?UTF-8?q?=20=20fix:=20=E4=BF=AE=E5=A4=8D=E4=B8=A4?=
 =?UTF-8?q?=E4=B8=AA=E5=89=8D=E7=AB=AF=20Bug=20=E2=80=94=20=E8=AF=8A?=
 =?UTF-8?q?=E7=96=97=E7=B1=BB=E5=8C=BB=E5=98=B1=E6=89=A7=E8=A1=8C=E7=A7=91?=
 =?UTF-8?q?=E5=AE=A4=E5=9B=9E=E6=98=BE=20+=20diagnosis.vue=20=E6=9C=AA?=
 =?UTF-8?q?=E5=AE=9A=E4=B9=89=E5=87=BD=E6=95=B0=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

  ## Bug #631: 诊疗类医嘱"药房/科室"列未回显

  - 文件: openhis-ui-vue3/src/views/inpatientDoctor/home/components/order/index.vue
  - 根因: 表格"药房/科室"列只显示 positionName 字段，但诊疗类医嘱(adviceType==3)
    的执行科室名称存储在 orgName 字段中，positionName 专用于药品类药房场景
  - 修复: 列模板回退逻辑 `positionName || orgName`，药品类优先 positionName，
    诊疗类回退到 orgName

  ## diagnosis.vue: loadTcmSyndromeOptions is not defined

  - 文件: openhis-ui-vue3/src/views/inpatientDoctor/home/components/diagnosis/diagnosis.vue
  - 根因: commit a0a5d7e76 (fix #627) 在 init() 中添加了 loadTcmSyndromeOptions() 调用，
    但遗漏了函数定义，导致运行时 ReferenceError
  - 修复: 删除该无效调用（子组件 addDiagnosisDialog.vue、index.vue 各自独立加载证候选项）
---
 .../inpatientDoctor/home/components/diagnosis/diagnosis.vue     | 1 -
 .../src/views/inpatientDoctor/home/components/order/index.vue   | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/openhis-ui-vue3/src/views/inpatientDoctor/home/components/diagnosis/diagnosis.vue b/openhis-ui-vue3/src/views/inpatientDoctor/home/components/diagnosis/diagnosis.vue
index 13c1c0349..9d97ac0e6 100755
--- a/openhis-ui-vue3/src/views/inpatientDoctor/home/components/diagnosis/diagnosis.vue
+++ b/openhis-ui-vue3/src/views/inpatientDoctor/home/components/diagnosis/diagnosis.vue
@@ -451,7 +451,6 @@ function getList() {
 
 init();
 function init() {
-  loadTcmSyndromeOptions();
   diagnosisInit().then((res) => {
     if (res.code == 200) {
       diagnosisOptions.value = res.data.verificationStatusOptions;
diff --git a/openhis-ui-vue3/src/views/inpatientDoctor/home/components/order/index.vue b/openhis-ui-vue3/src/views/inpatientDoctor/home/components/order/index.vue
index 0f86fb7f1..153ab0cf2 100755
--- a/openhis-ui-vue3/src/views/inpatientDoctor/home/components/order/index.vue
+++ b/openhis-ui-vue3/src/views/inpatientDoctor/home/components/order/index.vue
@@ -287,7 +287,7 @@
         <el-table-column label="药房/科室" align="center" prop="" width="240">
           <template #default="scope">
             <span v-if="!scope.row.isEdit">
-              {{ scope.row.positionName }}
+              {{ scope.row.positionName || scope.row.orgName }}
             </span>
           </template>
         </el-table-column>