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

@@ -2,7 +2,11 @@
<div class="app-container">
<!-- 顶部查询条件 -->
<div class="table-header">
<el-select class="table-header-search" v-model="searchParams.locationId" placeholder="请选择库房">
<el-select
v-model="searchParams.locationId"
class="table-header-search"
placeholder="请选择库房"
>
<el-option
v-for="item in locationOptions"
:key="item.value"
@@ -19,14 +23,25 @@
/>
<el-date-picker
class="table-header-search"
v-model="searchParams.endTime"
class="table-header-search"
type="date"
placeholder="选择结束时间"
value-format="YYYY-MM-DD"
/>
<el-button class="table-header-button" type="primary" @click="handleSearch">查询</el-button>
<el-button class="table-header-button" @click="resetForm">重置</el-button>
<el-button
class="table-header-button"
type="primary"
@click="handleSearch"
>
查询
</el-button>
<el-button
class="table-header-button"
@click="resetForm"
>
重置
</el-button>
</div>
<!-- 数据表格 -->
@@ -37,84 +52,224 @@
style="width: 100%"
border
>
<el-table-column prop="locationId_dictText" label="库房" min-width="150" show-overflow-tooltip />
<el-table-column prop="initialAmount" label="期初金额" min-width="160" align="right" />
<el-table-column prop="finalAmount" label="期末金额" min-width="160" align="right">
<el-table-column
prop="locationId_dictText"
label="库房"
min-width="150"
show-overflow-tooltip
/>
<el-table-column
prop="initialAmount"
label="期初金额"
min-width="160"
align="right"
/>
<el-table-column
prop="finalAmount"
label="期末金额"
min-width="160"
align="right"
>
<template #default="scope">
<div style="color: dodgerblue;cursor: pointer;" @click="skipToPage(scope, 1)">
<div
style="color: dodgerblue;cursor: pointer;"
@click="skipToPage(scope, 1)"
>
{{ scope.row.finalAmount }}
</div>
</template>
</el-table-column>
<el-table-column prop="expectFinalAmount" label="预期期末金额" min-width="160" align="right" />
<el-table-column prop="offsetAmount" label="偏移量" min-width="100" align="right" />
<el-table-column prop="purchaseInAmount" label="采购入库金额" min-width="120" align="right">
<el-table-column
prop="expectFinalAmount"
label="预期期末金额"
min-width="160"
align="right"
/>
<el-table-column
prop="offsetAmount"
label="偏移量"
min-width="100"
align="right"
/>
<el-table-column
prop="purchaseInAmount"
label="采购入库金额"
min-width="120"
align="right"
>
<template #default="scope">
<div style="color: dodgerblue;cursor: pointer;" @click="skipToPage(scope, 2)">
<div
style="color: dodgerblue;cursor: pointer;"
@click="skipToPage(scope, 2)"
>
{{ scope.row.purchaseInAmount }}
</div>
</template>
</el-table-column>
<el-table-column prop="purchaseInNumber" label="采购入库单据数" min-width="120" align="right" />
<el-table-column prop="purchaseReturnAmount" label="采购出库金额" min-width="120" align="right">
<el-table-column
prop="purchaseInNumber"
label="采购入库单据数"
min-width="120"
align="right"
/>
<el-table-column
prop="purchaseReturnAmount"
label="采购出库金额"
min-width="120"
align="right"
>
<template #default="scope">
<div style="color: dodgerblue;cursor: pointer;" @click="skipToPage(scope, 3)">
<div
style="color: dodgerblue;cursor: pointer;"
@click="skipToPage(scope, 3)"
>
{{ scope.row.purchaseReturnAmount }}
</div>
</template>
</el-table-column>
<el-table-column prop="purchaseReturnNumber" label="采购出库单据数" min-width="120" align="right" />
<el-table-column prop="applyOutAmount" label="领用出库金额" min-width="120" align="right">
<el-table-column
prop="purchaseReturnNumber"
label="采购出库单据数"
min-width="120"
align="right"
/>
<el-table-column
prop="applyOutAmount"
label="领用出库金额"
min-width="120"
align="right"
>
<template #default="scope">
<div style="color: dodgerblue;cursor: pointer;" @click="skipToPage(scope, 4)">
<div
style="color: dodgerblue;cursor: pointer;"
@click="skipToPage(scope, 4)"
>
{{ scope.row.applyOutAmount }}
</div>
</template>
</el-table-column>
<el-table-column prop="applyOutNumber" label="领用出库单据数" min-width="120" align="right" />
<el-table-column prop="applyReturnAmount" label="领用退货金额" min-width="120" align="right">
<el-table-column
prop="applyOutNumber"
label="领用出库单据数"
min-width="120"
align="right"
/>
<el-table-column
prop="applyReturnAmount"
label="领用退货金额"
min-width="120"
align="right"
>
<template #default="scope">
<div style="color: dodgerblue;cursor: pointer;" @click="skipToPage(scope, 5)">
<div
style="color: dodgerblue;cursor: pointer;"
@click="skipToPage(scope, 5)"
>
{{ scope.row.applyReturnAmount }}
</div>
</template>
</el-table-column>
<el-table-column prop="applyReturnNumber" label="领用退货单据数" min-width="120" align="right" />
<el-table-column prop="transferInAmount" label="调拨入库金额" min-width="120" align="right">
<el-table-column
prop="applyReturnNumber"
label="领用退货单据数"
min-width="120"
align="right"
/>
<el-table-column
prop="transferInAmount"
label="调拨入库金额"
min-width="120"
align="right"
>
<template #default="scope">
<div style="color: dodgerblue;cursor: pointer;" @click="skipToPage(scope, 6)">
<div
style="color: dodgerblue;cursor: pointer;"
@click="skipToPage(scope, 6)"
>
{{ scope.row.transferInAmount }}
</div>
</template>
</el-table-column>
<el-table-column prop="transferInNumber" label="调拨入库单据数" min-width="120" align="right" />
<el-table-column prop="transferOutAmount" label="调拨出库金额" min-width="120" align="right">
<el-table-column
prop="transferInNumber"
label="调拨入库单据数"
min-width="120"
align="right"
/>
<el-table-column
prop="transferOutAmount"
label="调拨出库金额"
min-width="120"
align="right"
>
<template #default="scope">
<div style="color: dodgerblue;cursor: pointer;" @click="skipToPage(scope, 10)">
<div
style="color: dodgerblue;cursor: pointer;"
@click="skipToPage(scope, 10)"
>
{{ scope.row.transferOutAmount }}
</div>
</template>
</el-table-column>
<el-table-column prop="transferOutNumber" label="调拨出库单据数" min-width="120" align="right" />
<el-table-column prop="checkProfitLossAmount" label="盘点盈亏金额" min-width="120" align="right">
<el-table-column
prop="transferOutNumber"
label="调拨出库单据数"
min-width="120"
align="right"
/>
<el-table-column
prop="checkProfitLossAmount"
label="盘点盈亏金额"
min-width="120"
align="right"
>
<template #default="scope">
<div style="color: dodgerblue;cursor: pointer;" @click="skipToPage(scope, 7)">
<div
style="color: dodgerblue;cursor: pointer;"
@click="skipToPage(scope, 7)"
>
{{ scope.row.checkProfitLossAmount }}
</div>
</template>
</el-table-column>
<el-table-column prop="checkProfitLossNumber" label="盘点盈亏单据数" min-width="120" align="right" />
<el-table-column prop="lossAmount" label="报损金额" min-width="100" align="right">
<el-table-column
prop="checkProfitLossNumber"
label="盘点盈亏单据数"
min-width="120"
align="right"
/>
<el-table-column
prop="lossAmount"
label="报损金额"
min-width="100"
align="right"
>
<template #default="scope">
<div style="color: dodgerblue;cursor: pointer;" @click="skipToPage(scope, 8)">
<div
style="color: dodgerblue;cursor: pointer;"
@click="skipToPage(scope, 8)"
>
{{ scope.row.lossAmount }}
</div>
</template>
</el-table-column>
<el-table-column prop="lossNumber" label="报损单据数" min-width="100" align="right" />
<el-table-column prop="drugIssueAmount" label="药品发放金额" min-width="120" align="right">
<el-table-column
prop="lossNumber"
label="报损单据数"
min-width="100"
align="right"
/>
<el-table-column
prop="drugIssueAmount"
label="药品发放金额"
min-width="120"
align="right"
>
<template #default="scope">
<div style="color: dodgerblue;cursor: pointer;" @click="skipToPage(scope, 9)">
<div
style="color: dodgerblue;cursor: pointer;"
@click="skipToPage(scope, 9)"
>
{{ scope.row.drugIssueAmount }}
</div>
</template>