根因: - 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)
186 lines
4.7 KiB
Vue
Executable File
186 lines
4.7 KiB
Vue
Executable File
<template>
|
||
<div class="recordBill">
|
||
<div
|
||
id="div1"
|
||
class="printView_header"
|
||
>
|
||
<div style="text-align: center; height: 40px">
|
||
护理交接班
|
||
</div>
|
||
<div>
|
||
<span style="display: inline-block; width: 200px">日期:{{ printData.date.substring(0, 10) }}</span>
|
||
<span style="display: inline-block; width: 180px">发起人:{{ printData.initiator.name }}</span>
|
||
<span style="display: inline-block; width: 140px">接收人:{{ printData.heir.name }}</span>
|
||
</div>
|
||
<div>
|
||
<span
|
||
v-for="item in printData.cols"
|
||
:key="item.propertyType"
|
||
style="display: inline-block; width: 90px"
|
||
v-text="item.display + ':' + printData[item.propertyType]"
|
||
/>
|
||
</div>
|
||
</div>
|
||
<div
|
||
id="div2"
|
||
class="printView_content"
|
||
>
|
||
<table
|
||
border="1"
|
||
cellSpacing="0"
|
||
width="98%"
|
||
cellPadding="1"
|
||
style=" border-collapse:collapse; font-size: 14px"
|
||
bordercolor="#333333"
|
||
>
|
||
<thead>
|
||
<TR>
|
||
<TD colspan="1">
|
||
<DIV
|
||
style="width: 40px"
|
||
align="center"
|
||
>
|
||
类别
|
||
</DIV>
|
||
</TD>
|
||
<TD colspan="1">
|
||
<DIV
|
||
style="width: 50px"
|
||
align="center"
|
||
>
|
||
床号
|
||
</DIV>
|
||
</TD>
|
||
<TD colspan="1">
|
||
<DIV
|
||
style="width: 60px"
|
||
align="center"
|
||
>
|
||
姓名
|
||
</DIV>
|
||
</TD>
|
||
<TD colspan="1">
|
||
<DIV
|
||
style="width: 90px"
|
||
align="center"
|
||
>
|
||
主诉
|
||
</DIV>
|
||
</TD>
|
||
<TD colspan="1">
|
||
<DIV
|
||
style="width: 90px"
|
||
align="center"
|
||
>
|
||
既往史
|
||
</DIV>
|
||
</TD>
|
||
<TD colspan="1">
|
||
<DIV
|
||
style="width: 90px"
|
||
align="center"
|
||
>
|
||
诊断
|
||
</DIV>
|
||
</TD>
|
||
<TD colspan="1">
|
||
<DIV
|
||
style="width: 155px"
|
||
align="center"
|
||
>
|
||
交接信息
|
||
</DIV>
|
||
</TD>
|
||
</TR>
|
||
</thead>
|
||
<tbody>
|
||
<tr
|
||
v-for="item in printData.shiftRecordItems"
|
||
:key="item.id"
|
||
>
|
||
<td v-html="item.typeDisplay" />
|
||
<td v-html="item.bedName" />
|
||
<td v-html="item.patientName" />
|
||
<td v-html="item.mainSuit" />
|
||
<td v-html="item.previousHistory" />
|
||
<td v-html="item.diagnosis" />
|
||
<td v-html="item.content" />
|
||
</tr>
|
||
</tbody>
|
||
</table>
|
||
</div>
|
||
</div>
|
||
</template>
|
||
<script>
|
||
// 迁移到 hiprint
|
||
import { simplePrint, PRINT_TEMPLATE } from '@/utils/printUtils.js'
|
||
|
||
export default {
|
||
data() {
|
||
return {
|
||
printData: {
|
||
patientInfo: {},
|
||
recordData: {},
|
||
cols: []
|
||
}
|
||
}
|
||
},
|
||
mounted() {},
|
||
methods: {
|
||
/**
|
||
* 使用 hiprint 执行打印
|
||
*/
|
||
async printTest() {
|
||
try {
|
||
// 构建打印数据
|
||
const shiftRecordItems = (this.printData.shiftRecordItems || []).map(item => ({
|
||
typeDisplay: item.typeDisplay || '',
|
||
bedName: item.bedName || '',
|
||
patientName: item.patientName || '',
|
||
mainSuit: item.mainSuit || '',
|
||
previousHistory: item.previousHistory || '',
|
||
diagnosis: item.diagnosis || '',
|
||
content: item.content || ''
|
||
}))
|
||
|
||
const printData = {
|
||
date: this.printData.date ? this.printData.date.substring(0, 10) : '',
|
||
initiatorName: this.printData.initiator ? this.printData.initiator.name : '',
|
||
heirName: this.printData.heir ? this.printData.heir.name : '',
|
||
shiftRecordItems: shiftRecordItems
|
||
}
|
||
// 使用 hiprint 打印
|
||
await simplePrint(PRINT_TEMPLATE.CHANGE_SHIFT_BILL, printData)
|
||
} catch (error) {
|
||
console.error('护理交接班打印失败:', error)
|
||
}
|
||
}
|
||
}
|
||
}
|
||
</script>
|
||
<style scoped lang="less">
|
||
.recordBill {
|
||
border: #8d8d8d 1px solid;
|
||
display: grid;
|
||
grid-template-rows: 90px 1fr;
|
||
height: 200px !important;
|
||
width: 740px;
|
||
|
||
/deep/ .el-table .cell {
|
||
font-size: 10px !important;
|
||
}
|
||
.printView_header {
|
||
grid-template-rows: 40px 30px 30px;
|
||
height: 200px !important;
|
||
h4{
|
||
text-align: center;
|
||
margin: 15px;
|
||
}
|
||
}
|
||
.printView_content{
|
||
|
||
}
|
||
}
|
||
|
||
</style>
|