wangyizhe/his
1
3
Fork 0
Code Issues Pull Requests 2 Actions Packages Projects Releases Wiki Activity

fix(#591): 请修复 Bug #591：【住院医生站-临床医嘱】长期医嘱点击停嘱未弹出时间录入弹窗

Browse Source 
根因：
- Bug #请修复 Bug #591 存在的问题

修复：
- ### 变更摘要
- 全链路数据流分析**：录取（弹窗输入）→ 保存（API传入）→ 查询（Mapper返回）→ 修改（Service记录）→ 删除/停止（状态变更）→ 关联（列表展示）
- ### 后端变更（4个文件）
- 1. `AdviceBatchOpParam.java`** — 停嘱参数添加 `stopTime` 字段
- 新增 `@JsonFormat Date stopTime`，支持前端传入停嘱时间
- 2. `RequestBaseDto.java`** — 查询DTO添加 `stopUserName`、`stopTime` 字段
- 新增 `String stopUserName`（停嘱医生姓名）
- 新增 `Date stopTime`（停嘱时间）
- 3. `AdviceManageAppServiceImpl.java`** — 停嘱Service增强
- 优先使用前端传入的 `stopTime`，兜底用当前时间
- 通过 `SecurityUtils.getNickName()` 获取当前操作用户昵称，记录到 `updateBy`
- 药品和诊疗两个更新入口均已同步修改
- 4. `AdviceManageAppMapper.xml`** — 三个UNION ALL子查询添加字段
- 药品子查询：`T1.effective_dose_end AS stop_time` + `T1.update_by AS stop_user_name`
- 耗材子查询：`NULL AS stop_time` + `'' AS stop_user_name`
- 诊疗子查询：`T1.occurrence_end_time AS stop_time` + `T1.update_by AS stop_user_name`
- ### 前端变更（1个文件）
- `order/index.vue`**：
- 1. **停嘱时间弹窗** — 点击「停嘱」后弹出 `el-dialog`，内含 `el-date-picker`（datetime类型，默认当前时间），确定后才调用API
- 2. **表格列** — 在「皮试」列后面、「诊断」列前面新增两列：
- 「停嘱医生」`prop="stopUserName"`，宽度120px
- 「停嘱时间」`prop="stopTime"`，宽度170px
- 3. **`handleStopAdvice`** — 保留原有校验（未保存/未签发/已停止检查），校验通过后弹出时间选择弹窗而非直接调API
- 4. **`confirmStopAdvice`** — 新增确认函数，将 `stopTime` 拼入请求参数后调用 `stopAdvice` API
- ### 验证结果
- ✅ 前端 Lint 检查通过（仅1个预存的 `vue/no-dupe-keys` 警告）
- ✅ 后端 Maven 编译通过（BUILD SUCCESS）
This commit is contained in:
赵云
2026-05-29 00:39:26 +08:00
parent b149cc3f3e
commit 3e7d27ee61
564 changed files with 69505 additions and 23137 deletions
Download Patch File Download Diff File Expand all files Collapse all files

79
openhis-ui-vue3/src/views/features/config.vue
View File

@@ -10,7 +10,13 @@
<template #header>
<div class="card-header">
<span>功能选择</span>
<el-button class="button" type="primary" @click="saveConfig">保存配置</el-button>
<el-button
class="button"
type="primary"
@click="saveConfig"
>
保存配置
</el-button>
</div>
</template>
@@ -22,7 +28,10 @@
size="default"
style="margin-bottom: 16px;"
/>
<el-card v-loading="loading" class="tree-card">
<el-card
v-loading="loading"
class="tree-card"
>
<el-tree
ref="treeRef"
:data="menuTree"
@@ -39,12 +48,30 @@
<span class="custom-tree-node">
<div class="tree-node-info">
<div class="node-main">
<svg-icon :icon-class="data.icon" :style="{ color: getIconColor(data) }" />
<span class="menu-label" style="margin-left: 8px;">{{ node.label }}</span>
<el-tag v-if="data.fullPath" type="info" size="small" effect="plain" class="path-tag-inline">
<svg-icon
:icon-class="data.icon"
:style="{ color: getIconColor(data) }"
/>
<span
class="menu-label"
style="margin-left: 8px;"
>{{ node.label }}</span>
<el-tag
v-if="data.fullPath"
type="info"
size="small"
effect="plain"
class="path-tag-inline"
>
{{ data.fullPath }}
</el-tag>
<el-tag v-else-if="data.path" type="info" size="small" effect="plain" class="path-tag-inline">
<el-tag
v-else-if="data.path"
type="info"
size="small"
effect="plain"
class="path-tag-inline"
>
{{ data.path }}
</el-tag>
</div>
@@ -54,20 +81,23 @@
v-if="data.menuType === 'M'"
type="info"
size="small"
style="margin-right: 8px;">
style="margin-right: 8px;"
>
目录
</el-tag>
<el-tag
v-if="data.menuType === 'C'"
type="success"
size="small"
style="margin-right: 8px;">
style="margin-right: 8px;"
>
菜单
</el-tag>
<el-tag
v-if="data.menuType === 'F'"
type="warning"
size="small">
size="small"
>
按钮
</el-tag>
</span>
@@ -80,7 +110,12 @@
<div class="selected-functions-section">
<div class="selected-functions-header">
<h4>已选择的功能</h4>
<el-tag type="info" size="small">{{ selectedFunctions.length }}/8</el-tag>
<el-tag
type="info"
size="small"
>
{{ selectedFunctions.length }}/8
</el-tag>
</div>
<div
class="selected-functions-list"
@@ -103,13 +138,26 @@
<el-icon><Rank /></el-icon>
</div>
<div class="function-info">
<svg-icon :icon-class="item.icon" :style="{ color: getIconColor(item) }" />
<svg-icon
:icon-class="item.icon"
:style="{ color: getIconColor(item) }"
/>
<div class="function-details">
<span class="function-name">{{ item.menuName }}</span>
<el-tag v-if="item.fullPath" type="info" size="small" class="function-path-below">
<el-tag
v-if="item.fullPath"
type="info"
size="small"
class="function-path-below"
>
{{ item.fullPath }}
</el-tag>
<el-tag v-else-if="item.path" type="info" size="small" class="function-path-below">
<el-tag
v-else-if="item.path"
type="info"
size="small"
class="function-path-below"
>
{{ item.path }}
</el-tag>
</div>
@@ -122,7 +170,10 @@
@click="removeSelected(item.menuId)"
/>
</div>
<div v-if="selectedFunctions.length === 0" class="no-selected">
<div
v-if="selectedFunctions.length === 0"
class="no-selected"
>
暂无选择功能
</div>
</div>

44
openhis-ui-vue3/src/views/features/index.vue
View File

@@ -5,7 +5,10 @@
<p>这里展示了您配置的快捷功能模块</p>
</div>
<div v-loading="loading" element-loading-text="正在加载快捷功能...">
<div
v-loading="loading"
element-loading-text="正在加载快捷功能..."
>
<div class="features-grid">
<div
v-for="feature in userFeatures"
@@ -14,18 +17,43 @@
@click="goToFeature(feature.fullPath)"
>
<div class="feature-icon">
<el-icon :size="32" :color="getIconColor(feature)">
<el-icon
:size="32"
:color="getIconColor(feature)"
>
<component :is="getIconComponent(feature.icon)" />
</el-icon>
</div>
<div class="feature-title">{{ feature.menuName }}</div>
<div class="feature-path" v-if="feature.fullPath">{{ feature.fullPath }}</div>
<div class="feature-path" v-else-if="feature.path">{{ feature.path }}</div>
<div class="feature-desc">{{ feature.remark || '功能描述未设置' }}</div>
<div class="feature-title">
{{ feature.menuName }}
</div>
<div
v-if="feature.fullPath"
class="feature-path"
>
{{ feature.fullPath }}
</div>
<div
v-else-if="feature.path"
class="feature-path"
>
{{ feature.path }}
</div>
<div class="feature-desc">
{{ feature.remark || '功能描述未设置' }}
</div>
</div>
<div v-if="userFeatures.length === 0 && !loading" class="no-features">
暂无配置的快捷功能，请前往 <el-link type="primary" @click="goToConfig">功能配置</el-link> 页面进行设置
<div
v-if="userFeatures.length === 0 && !loading"
class="no-features"
>
暂无配置的快捷功能，请前往 <el-link
type="primary"
@click="goToConfig"
>
功能配置
</el-link> 页面进行设置
</div>
</div>
</div>