fix(#591): 请修复 Bug #591:【住院医生站-临床医嘱】长期医嘱点击停嘱未弹出时间录入弹窗
根因: - 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:
@@ -4,10 +4,16 @@
|
||||
<h3>护理状态</h3>
|
||||
</div>
|
||||
|
||||
<div v-if="loading" class="loading-container">
|
||||
<div
|
||||
v-if="loading"
|
||||
class="loading-container"
|
||||
>
|
||||
<el-row justify="center">
|
||||
<el-col :span="6">
|
||||
<el-empty description="正在加载数据..." image-size="100" />
|
||||
<el-empty
|
||||
description="正在加载数据..."
|
||||
image-size="100"
|
||||
/>
|
||||
</el-col>
|
||||
</el-row>
|
||||
</div>
|
||||
@@ -21,8 +27,18 @@
|
||||
class="nursing-table"
|
||||
:header-cell-style="{ backgroundColor: '#f5f7fa' }"
|
||||
>
|
||||
<el-table-column prop="item" label="项目" width="180" align="center" />
|
||||
<el-table-column prop="currentStatus" label="当前状态" width="260" align="center">
|
||||
<el-table-column
|
||||
prop="item"
|
||||
label="项目"
|
||||
width="180"
|
||||
align="center"
|
||||
/>
|
||||
<el-table-column
|
||||
prop="currentStatus"
|
||||
label="当前状态"
|
||||
width="260"
|
||||
align="center"
|
||||
>
|
||||
<template #default="scope">
|
||||
<el-tag
|
||||
v-if="scope.row.currentStatus"
|
||||
@@ -34,11 +50,18 @@
|
||||
</el-tag>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="operation" label="操作" align="center">
|
||||
<el-table-column
|
||||
prop="operation"
|
||||
label="操作"
|
||||
align="center"
|
||||
>
|
||||
<template #default="scope">
|
||||
<div class="operation-content">
|
||||
<!-- 护理级别选项 - 水平排列 -->
|
||||
<div v-if="scope.row.item === '护理级别'" class="options-horizontal">
|
||||
<div
|
||||
v-if="scope.row.item === '护理级别'"
|
||||
class="options-horizontal"
|
||||
>
|
||||
<div
|
||||
v-for="option in nursingLevelList"
|
||||
:key="option.definitionId"
|
||||
@@ -53,7 +76,10 @@
|
||||
</div>
|
||||
|
||||
<!-- 病情选项 - 水平排列 -->
|
||||
<div v-else-if="scope.row.item === '病情'" class="options-horizontal">
|
||||
<div
|
||||
v-else-if="scope.row.item === '病情'"
|
||||
class="options-horizontal"
|
||||
>
|
||||
<div
|
||||
v-for="option in conditionList"
|
||||
:key="option.definitionId"
|
||||
@@ -68,7 +94,10 @@
|
||||
</div>
|
||||
|
||||
<!-- 护理常规选项 - 水平排列 -->
|
||||
<div v-else-if="scope.row.item === '护理常规'" class="options-horizontal">
|
||||
<div
|
||||
v-else-if="scope.row.item === '护理常规'"
|
||||
class="options-horizontal"
|
||||
>
|
||||
<div
|
||||
v-for="option in nursingRoutineList"
|
||||
:key="option.definitionId"
|
||||
@@ -83,7 +112,10 @@
|
||||
</div>
|
||||
|
||||
<!-- 饮食选项 - 水平排列 -->
|
||||
<div v-else-if="scope.row.item === '饮食'" class="options-horizontal">
|
||||
<div
|
||||
v-else-if="scope.row.item === '饮食'"
|
||||
class="options-horizontal"
|
||||
>
|
||||
<div
|
||||
v-for="option in dietList"
|
||||
:key="option.definitionId"
|
||||
@@ -95,7 +127,10 @@
|
||||
</div>
|
||||
|
||||
<!-- 体位选项 - 水平排列 -->
|
||||
<div v-else-if="scope.row.item === '体位'" class="options-horizontal">
|
||||
<div
|
||||
v-else-if="scope.row.item === '体位'"
|
||||
class="options-horizontal"
|
||||
>
|
||||
<div
|
||||
v-for="option in positionList"
|
||||
:key="option.definitionId"
|
||||
@@ -110,7 +145,10 @@
|
||||
</div>
|
||||
|
||||
<!-- 陪护选项 - 水平排列 -->
|
||||
<div v-else-if="scope.row.item === '陪护'" class="options-horizontal">
|
||||
<div
|
||||
v-else-if="scope.row.item === '陪护'"
|
||||
class="options-horizontal"
|
||||
>
|
||||
<div
|
||||
v-for="option in companionCareList"
|
||||
:key="option.definitionId"
|
||||
@@ -125,7 +163,10 @@
|
||||
</div>
|
||||
|
||||
<!-- 隔离等级选项 - 水平排列 -->
|
||||
<div v-else-if="scope.row.item === '隔离等级'" class="options-horizontal">
|
||||
<div
|
||||
v-else-if="scope.row.item === '隔离等级'"
|
||||
class="options-horizontal"
|
||||
>
|
||||
<div
|
||||
v-for="option in isolationLevelList"
|
||||
:key="option.definitionId"
|
||||
@@ -144,8 +185,19 @@
|
||||
</el-table>
|
||||
<!-- 操作按钮区域 -->
|
||||
<div class="nursing-status-actions">
|
||||
<el-button @click="handleCancel" size="medium">取消</el-button>
|
||||
<el-button type="primary" @click="handleConfirm" size="medium">确定</el-button>
|
||||
<el-button
|
||||
size="medium"
|
||||
@click="handleCancel"
|
||||
>
|
||||
取消
|
||||
</el-button>
|
||||
<el-button
|
||||
type="primary"
|
||||
size="medium"
|
||||
@click="handleConfirm"
|
||||
>
|
||||
确定
|
||||
</el-button>
|
||||
</div>
|
||||
</template>
|
||||
</div>
|
||||
|
||||
Reference in New Issue
Block a user