From 937b4508ae827efcdfeadd06cce601255ddb248d Mon Sep 17 00:00:00 2001
From: duzhongxu <15039018447@163.com>
Date: Thu, 23 Apr 2026 16:48:55 +0800
Subject: [PATCH] =?UTF-8?q?374=20=E3=80=90=E8=AF=8A=E7=96=97=E7=9B=AE?=
 =?UTF-8?q?=E5=BD=95=E3=80=91=E7=BC=96=E8=BE=91=E9=A1=B9=E7=9B=AE=E6=97=B6?=
 =?UTF-8?q?=E2=80=9C=E6=89=80=E5=B1=9E=E7=A7=91=E5=AE=A4=E2=80=9D=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5=E6=98=BE=E7=A4=BA=E5=8E=9F=E5=A7=8BID=E8=80=8C?=
 =?UTF-8?q?=E9=9D=9E=E5=90=8D=E7=A7=B0=EF=BC=8C=E4=B8=94=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E5=9B=9E=E6=98=BE=E9=80=BB=E8=BE=91=E5=BC=82=E5=B8=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/openhis/workflow/domain/ActivityDefinition.java | 4 ++++
 .../components/diagnosisTreatmentDialog.vue                  | 5 +++++
 .../diagnosistreatment/components/diagnosistreatment.js      | 2 +-
 3 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/domain/ActivityDefinition.java b/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/domain/ActivityDefinition.java
index 952e9018..8a7b7e2d 100644
--- a/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/domain/ActivityDefinition.java
+++ b/openhis-server-new/openhis-domain/src/main/java/com/openhis/workflow/domain/ActivityDefinition.java
@@ -1,6 +1,8 @@
 package com.openhis.workflow.domain;
 
+import com.baomidou.mybatisplus.annotation.FieldStrategy;
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.core.common.core.domain.HisBaseEntity;
@@ -46,9 +48,11 @@ public class ActivityDefinition extends HisBaseEntity {
     private String permittedUnitCode;
 
     /** 所属科室 */
+    @TableField(updateStrategy = FieldStrategy.ALWAYS)
     private Long orgId;
 
     /** 所在位置 */
+    @TableField(updateStrategy = FieldStrategy.ALWAYS)
     private Long locationId;
 
     /** 医保标记 */
diff --git a/openhis-ui-vue3/src/views/catalog/diagnosistreatment/components/diagnosisTreatmentDialog.vue b/openhis-ui-vue3/src/views/catalog/diagnosistreatment/components/diagnosisTreatmentDialog.vue
index b798ac75..f575501a 100644
--- a/openhis-ui-vue3/src/views/catalog/diagnosistreatment/components/diagnosisTreatmentDialog.vue
+++ b/openhis-ui-vue3/src/views/catalog/diagnosistreatment/components/diagnosisTreatmentDialog.vue
@@ -545,6 +545,11 @@ function edit() {
   title.value = props.title;
   form.value = props.item;
   form.value.chrgitmLv = form.value.chrgitmLv ? form.value.chrgitmLv.toString() : undefined;
+  // 所属科室：如果后端无法翻译科室名称（orgId_dictText为空），则清空orgId，
+  // 避免el-tree-select回退显示原始数字ID，而是显示"请选择..."占位符
+  if (!form.value.orgId_dictText) {
+    form.value.orgId = undefined;
+  }
   // 划价标记：编辑时若原值为null/undefined则默认为1（允许划价）
   if (form.value.pricingFlag === null || form.value.pricingFlag === undefined) {
     form.value.pricingFlag = 1;
diff --git a/openhis-ui-vue3/src/views/catalog/diagnosistreatment/components/diagnosistreatment.js b/openhis-ui-vue3/src/views/catalog/diagnosistreatment/components/diagnosistreatment.js
index 71bb4689..6eed428d 100644
--- a/openhis-ui-vue3/src/views/catalog/diagnosistreatment/components/diagnosistreatment.js
+++ b/openhis-ui-vue3/src/views/catalog/diagnosistreatment/components/diagnosistreatment.js
@@ -76,7 +76,7 @@ export function deptTreeSelect (queryParams) {
   return request ({
     url: '/base-data-manage/organization/organization',
     method: 'get',
-    param: queryParams,
+    params: queryParams,
   });
 }
 // 查询身体部位树形数据