根因: - 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)
250 lines
7.2 KiB
Vue
Executable File
250 lines
7.2 KiB
Vue
Executable File
<template>
|
||
<div class="recordBill">
|
||
<div
|
||
:id="'exeSheetTitle' + printData.id"
|
||
class="printView_header"
|
||
>
|
||
<div style="text-align: center; height: 60px">
|
||
{{ userStore.hospitalName }}医嘱执行单
|
||
</div>
|
||
<div>
|
||
<span style="display: inline-block; width: 100px">床号:{{ printData.patientInfo.encounterLocationName }}</span>
|
||
<span style="display: inline-block; width: 180px">姓名:{{ printData.patientInfo.name }}</span>
|
||
<span style="display: inline-block; width: 140px">年龄:{{ printData.patientInfo.patientAge }}</span>
|
||
<span style="display: inline-block; width: 280px">诊断:{{ printData.patientInfo.diag }}</span>
|
||
</div>
|
||
<!-- <div>
|
||
<span style="display: inline-block; width: 200px">档案号:{{printData.patientInfo.hisNo}}</span>
|
||
<span style="display: inline-block; width: 260px">入室时间:{{printData.patientInfo.checkInTime}}</span>
|
||
<span style="display: inline-block; width: 140px">性别:{{!printData.patientInfo.gender? '':printData.patientInfo.gender.display}}</span>
|
||
</div>-->
|
||
</div>
|
||
<div
|
||
:id="'exeSheet' + printData.id"
|
||
class="printView_content"
|
||
>
|
||
<table
|
||
border="1"
|
||
cellSpacing="0"
|
||
width="97%"
|
||
cellPadding="1"
|
||
style=" border-collapse:collapse; font-size: 13px"
|
||
bordercolor="#333333"
|
||
>
|
||
<thead>
|
||
<TR>
|
||
<TD rowspan="1">
|
||
<DIV style="width: 65px;text-align: center">
|
||
医嘱日期
|
||
</DIV>
|
||
</TD>
|
||
|
||
<TD colspan="1">
|
||
<DIV
|
||
style="width: 120px"
|
||
align="center"
|
||
>
|
||
医嘱
|
||
</DIV>
|
||
</TD>
|
||
<TD colspan="1">
|
||
<DIV
|
||
style="width: 10px"
|
||
align="center"
|
||
/>
|
||
</TD>
|
||
<TD colspan="1">
|
||
<DIV
|
||
style="width: 70px"
|
||
align="center"
|
||
>
|
||
嘱托
|
||
</DIV>
|
||
</TD>
|
||
<TD rowspan="1">
|
||
<DIV
|
||
style="width: 60px"
|
||
align="center"
|
||
>
|
||
用量
|
||
</DIV>
|
||
</TD>
|
||
<TD colspan="1">
|
||
<DIV
|
||
style="width: 40px"
|
||
align="center"
|
||
>
|
||
用法
|
||
</DIV>
|
||
</TD>
|
||
<TD colspan="1">
|
||
<DIV
|
||
style="width: 40px"
|
||
align="center"
|
||
>
|
||
频次
|
||
</DIV>
|
||
</TD>
|
||
<TD rowspan="1">
|
||
<DIV
|
||
style="width: 65px"
|
||
align="center"
|
||
>
|
||
开立医生
|
||
</DIV>
|
||
</TD>
|
||
<TD rowspan="1">
|
||
<DIV
|
||
style="width: 65px"
|
||
align="center"
|
||
>
|
||
执行时间
|
||
</DIV>
|
||
</TD>
|
||
<TD colspan="1">
|
||
<DIV
|
||
style="width: 65px"
|
||
align="center"
|
||
>
|
||
执行护士
|
||
</DIV>
|
||
</TD>
|
||
<TD colspan="1">
|
||
<DIV
|
||
style="width: 55px"
|
||
align="center"
|
||
>
|
||
终止时间
|
||
</DIV>
|
||
</TD>
|
||
<TD colspan="1">
|
||
<DIV
|
||
style="width: 55px"
|
||
align="center"
|
||
>
|
||
终止人
|
||
</DIV>
|
||
</TD>
|
||
</TR>
|
||
</thead>
|
||
<tbody>
|
||
<tr
|
||
v-for="item in printData.recordData"
|
||
:key="item.id"
|
||
>
|
||
<td v-html="item.moTime" />
|
||
<td v-html="item.orderName" />
|
||
<td v-html="item.flag" />
|
||
<td v-html="item.remark" />
|
||
<td v-html="item.doseOnce<=0?'':(item.doseOnce+ item.doseUnit)" />
|
||
<td v-html="item.usageName" />
|
||
<td v-html="item.frequency" />
|
||
<td :id="item.id">
|
||
<span v-if="(item.docSignImage === ''||item.docSignImage === null)">{{ item.moDocName }}</span>
|
||
<img
|
||
v-if="(item.docSignImage !== ''&&item.docSignImage !== null)"
|
||
:src="'data:image/png;base64,'+ item.docSignImage"
|
||
style="height: 100%; width: 100%;object-fit: cover;"
|
||
>
|
||
</td>
|
||
<td v-html="item.occurrence" />
|
||
<td :id="item.id">
|
||
<span v-if="(item.perNurserSignImage === ''||item.perNurserSignImage === null)">{{ item.performName }}</span>
|
||
<img
|
||
v-if="(item.perNurserSignImage !== ''&&item.perNurserSignImage !== null)"
|
||
:src="'data:image/png;base64,'+ item.perNurserSignImage"
|
||
style="height: 100%; width: 100%;object-fit: cover;"
|
||
>
|
||
</td>
|
||
<td />
|
||
<td />
|
||
</tr>
|
||
</tbody>
|
||
</table>
|
||
</div>
|
||
</div>
|
||
</template>
|
||
<script>
|
||
// 迁移到 hiprint
|
||
import { simplePrint, PRINT_TEMPLATE } from '@/utils/printUtils.js'
|
||
import useUserStore from '@/store/modules/user'
|
||
|
||
export default {
|
||
props: {
|
||
printData: {
|
||
type: Object,
|
||
default() {
|
||
return {}
|
||
}
|
||
}
|
||
},
|
||
setup() {
|
||
const userStore = useUserStore();
|
||
return { userStore };
|
||
},
|
||
data() {
|
||
return {}
|
||
},
|
||
mounted() {},
|
||
methods: {
|
||
/**
|
||
* 使用 hiprint 执行打印
|
||
*/
|
||
async printTest() {
|
||
try {
|
||
// 构建打印数据
|
||
const recordData = (this.printData.recordData || []).map(item => ({
|
||
moTime: item.moTime || '',
|
||
orderName: item.orderName || '',
|
||
flag: item.flag || '',
|
||
remark: item.remark || '',
|
||
doseOnceUnit: item.doseOnce <= 0 ? '' : (item.doseOnce + item.doseUnit),
|
||
usageName: item.usageName || '',
|
||
frequency: item.frequency || '',
|
||
moDocName: item.moDocName || '',
|
||
occurrence: item.occurrence || '',
|
||
performName: item.performName || ''
|
||
}))
|
||
|
||
const printData = {
|
||
hospitalName: this.userStore.hospitalName,
|
||
bedName: this.printData.patientInfo ? this.printData.patientInfo.encounterLocationName : '',
|
||
patientName: this.printData.patientInfo ? this.printData.patientInfo.name : '',
|
||
patientAge: this.printData.patientInfo ? this.printData.patientInfo.patientAge : '',
|
||
diag: this.printData.patientInfo ? this.printData.patientInfo.diag : '',
|
||
recordData: recordData
|
||
}
|
||
// 使用 hiprint 打印
|
||
await simplePrint(PRINT_TEMPLATE.EXE_ORDER_SHEET, printData)
|
||
} catch (error) {
|
||
console.error('医嘱执行单打印失败:', error)
|
||
}
|
||
}
|
||
}
|
||
}
|
||
</script>
|
||
<style scoped lang="less">
|
||
.recordBill {
|
||
display: grid;
|
||
grid-template-rows: 90px 1fr;
|
||
height: 500px !important;
|
||
width: 680px;
|
||
|
||
/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>
|