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, }); } // 查询身体部位树形数据