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:
2026-05-29 00:39:26 +08:00
parent b149cc3f3e
commit 3e7d27ee61
564 changed files with 69505 additions and 23137 deletions

View File

@@ -1,15 +1,15 @@
<template>
<div>
<el-dialog
title="订单列表"
v-model="localDialogVisible"
title="订单列表"
width="960px"
append-to-body
@close="resetAllData"
>
<el-table
:data="orderList"
ref="tableRef"
:data="orderList"
width="100%"
highlight-current-row
height="470px"
@@ -21,26 +21,63 @@
prop="supplyBusNo"
width="200"
align="center"
></el-table-column>
<el-table-column label="采购员" prop="applicantId_dictText" width="100" align="center" />
<el-table-column label="供应商" prop="supplierId_dictText" width="220" align="center" />
<el-table-column label="审核状态" prop="statusEnum_enumText" width="100" align="center">
/>
<el-table-column
label="采购员"
prop="applicantId_dictText"
width="100"
align="center"
/>
<el-table-column
label="供应商"
prop="supplierId_dictText"
width="220"
align="center"
/>
<el-table-column
label="审核状态"
prop="statusEnum_enumText"
width="100"
align="center"
>
<template #default="scope">
<el-tag v-if="scope.row.statusEnum_enumText === '同意'" type="success">
<el-tag
v-if="scope.row.statusEnum_enumText === '同意'"
type="success"
>
{{ scope.row.statusEnum_enumText }}
</el-tag>
<el-tag
v-else
type="danger"
>
{{ scope.row.statusEnum_enumText }}
</el-tag>
<el-tag v-else type="danger">{{ scope.row.statusEnum_enumText }}</el-tag>
</template>
</el-table-column>
<el-table-column label="单据类型" prop="typeEnum_enumText" width="100" align="center" />
<el-table-column label="单据日期" prop="applyTime" width="200" align="center">
<el-table-column
label="单据类型"
prop="typeEnum_enumText"
width="100"
align="center"
/>
<el-table-column
label="单据日期"
prop="applyTime"
width="200"
align="center"
>
<template #default="scope">
{{ parseTime(scope.row.applyTime, '{yy}-{mm}-{dd} {hh}:{ii}:{ss}') }}
</template>
</el-table-column>
</el-table>
<el-row justify="end" style="margin-top: 10px">
<el-row
justify="end"
style="margin-top: 10px"
>
<el-pagination
v-show="localTableDataTotal > 0"
:current-page="queryParams.pageNo"
:page-size="queryParams.pageSize"
:page-sizes="[10, 50, 100, 200]"
@@ -48,13 +85,19 @@
:total="localTableDataTotal"
@current-change="handleCurrentChange"
@size-change="handleSizeChange"
v-show="localTableDataTotal > 0"
/>
</el-row>
<template #footer>
<div class="dialog-footer">
<el-button @click="handleCancel">取消</el-button>
<el-button type="primary" @click="handleSubmit"> 确认 </el-button>
<el-button @click="handleCancel">
取消
</el-button>
<el-button
type="primary"
@click="handleSubmit"
>
确认
</el-button>
</div>
</template>
</el-dialog>
@@ -331,7 +374,7 @@ const handleCancel = () => {
});
};
defineOptions({
name: 'orderDialog',
name: 'OrderDialog',
});
defineExpose({