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:
@@ -7,67 +7,134 @@
|
||||
destroy-on-close
|
||||
>
|
||||
<div class="detail-container">
|
||||
<div class="detail-content" v-if="itemList.length > 0">
|
||||
<el-table :data="itemList" style="width: 100%" size="small" border>
|
||||
<div
|
||||
v-if="itemList.length > 0"
|
||||
class="detail-content"
|
||||
>
|
||||
<el-table
|
||||
:data="itemList"
|
||||
style="width: 100%"
|
||||
size="small"
|
||||
border
|
||||
>
|
||||
<!-- 挂号调价单特殊显示 -->
|
||||
<el-table-column label="科室" align="center" prop="orgName" v-if="categoryType.includes('挂号调价')"/>
|
||||
<el-table-column
|
||||
v-if="categoryType.includes('挂号调价')"
|
||||
label="科室"
|
||||
align="center"
|
||||
prop="orgName"
|
||||
/>
|
||||
<el-table-column
|
||||
v-if="categoryType.includes('挂号调价')"
|
||||
label="号源"
|
||||
align="center"
|
||||
prop="name"
|
||||
v-if="categoryType.includes('挂号调价')"
|
||||
/>
|
||||
<el-table-column label="项目名称" align="center" prop="itemName" v-else />
|
||||
<el-table-column label="当前进货价" align="center" prop="originBuyingPrice">
|
||||
<el-table-column
|
||||
v-else
|
||||
label="项目名称"
|
||||
align="center"
|
||||
prop="itemName"
|
||||
/>
|
||||
<el-table-column
|
||||
label="当前进货价"
|
||||
align="center"
|
||||
prop="originBuyingPrice"
|
||||
>
|
||||
<template #default="scope">
|
||||
<el-tag type="danger" size="small">
|
||||
<el-tag
|
||||
type="danger"
|
||||
size="small"
|
||||
>
|
||||
{{ scope.row.originBuyingPrice ? scope.row.originBuyingPrice + ' 元' : '-' }}
|
||||
</el-tag>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="调后进货价" align="center" prop="newBuyingPrice">
|
||||
<el-table-column
|
||||
label="调后进货价"
|
||||
align="center"
|
||||
prop="newBuyingPrice"
|
||||
>
|
||||
<template #default="scope">
|
||||
<el-tag type="success" size="small">
|
||||
<el-tag
|
||||
type="success"
|
||||
size="small"
|
||||
>
|
||||
{{ scope.row.newBuyingPrice ? scope.row.newBuyingPrice + ' 元' : '-' }}
|
||||
</el-tag>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="当前零售价" align="center" prop="originRetailPrice">
|
||||
<el-table-column
|
||||
label="当前零售价"
|
||||
align="center"
|
||||
prop="originRetailPrice"
|
||||
>
|
||||
<template #default="scope">
|
||||
<el-tag type="danger" size="small">
|
||||
<el-tag
|
||||
type="danger"
|
||||
size="small"
|
||||
>
|
||||
{{ scope.row.originRetailPrice ? scope.row.originRetailPrice + ' 元' : '-' }}
|
||||
</el-tag>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="调后零售价" align="center" prop="newRetailPrice">
|
||||
<el-table-column
|
||||
label="调后零售价"
|
||||
align="center"
|
||||
prop="newRetailPrice"
|
||||
>
|
||||
<template #default="scope">
|
||||
<el-tag type="success" size="small">
|
||||
<el-tag
|
||||
type="success"
|
||||
size="small"
|
||||
>
|
||||
{{ scope.row.newRetailPrice ? scope.row.newRetailPrice + ' 元' : '-' }}
|
||||
</el-tag>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="进货价盈负差" align="center" prop="differenceBuyingPrice">
|
||||
<el-table-column
|
||||
label="进货价盈负差"
|
||||
align="center"
|
||||
prop="differenceBuyingPrice"
|
||||
>
|
||||
<template #default="scope">
|
||||
{{ scope.row.differenceBuyingPrice ? scope.row.differenceBuyingPrice + ' 元' : '-' }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="影响库存数量" align="center" prop="itemQuantity">
|
||||
<el-table-column
|
||||
label="影响库存数量"
|
||||
align="center"
|
||||
prop="itemQuantity"
|
||||
>
|
||||
<template #default="scope">
|
||||
{{ scope.row.itemQuantity ? scope.row.itemQuantity + (scope.row.label || '') : '-' }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="调后零售价盈负差" align="center" prop="differenceRetailPrice">
|
||||
<el-table-column
|
||||
label="调后零售价盈负差"
|
||||
align="center"
|
||||
prop="differenceRetailPrice"
|
||||
>
|
||||
<template #default="scope">
|
||||
{{ scope.row.differenceRetailPrice ? scope.row.differenceRetailPrice + ' 元' : '-' }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column label="调价原因" align="center" prop="reason" />
|
||||
<el-table-column
|
||||
label="调价原因"
|
||||
align="center"
|
||||
prop="reason"
|
||||
/>
|
||||
</el-table>
|
||||
<div class="creator-info">
|
||||
<span class="creator-label">制单人:{{ props.createName || '-' }}</span>
|
||||
</div>
|
||||
</div>
|
||||
<div v-else class="empty-tip">暂无调价项目数据</div>
|
||||
<div
|
||||
v-else
|
||||
class="empty-tip"
|
||||
>
|
||||
暂无调价项目数据
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<template #footer>
|
||||
|
||||
Reference in New Issue
Block a user