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:
@@ -1,179 +1,227 @@
|
||||
<template>
|
||||
<div class="app-container">
|
||||
<el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="68px">
|
||||
<el-form-item label="数据查询" prop="searchKey">
|
||||
<el-input
|
||||
v-model="queryParams.searchKey"
|
||||
placeholder="患者姓名/项目名称"
|
||||
clearable
|
||||
style="width: 240px"
|
||||
@keyup.enter="handleQuery"
|
||||
<div class="app-container">
|
||||
<el-form
|
||||
v-show="showSearch"
|
||||
ref="queryRef"
|
||||
:model="queryParams"
|
||||
:inline="true"
|
||||
label-width="68px"
|
||||
>
|
||||
<el-form-item
|
||||
label="数据查询"
|
||||
prop="searchKey"
|
||||
>
|
||||
<el-input
|
||||
v-model="queryParams.searchKey"
|
||||
placeholder="患者姓名/项目名称"
|
||||
clearable
|
||||
style="width: 240px"
|
||||
@keyup.enter="handleQuery"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item
|
||||
label="创建时间"
|
||||
style="width: 308px;"
|
||||
>
|
||||
<el-date-picker
|
||||
v-model="authoredTime"
|
||||
value-format="YYYY-MM-DD"
|
||||
type="daterange"
|
||||
range-separator="-"
|
||||
start-placeholder="开始日期"
|
||||
end-placeholder="结束日期"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item>
|
||||
<el-button
|
||||
type="primary"
|
||||
icon="Search"
|
||||
@click="handleQuery"
|
||||
>
|
||||
搜索
|
||||
</el-button>
|
||||
<el-button
|
||||
icon="Refresh"
|
||||
@click="resetQuery"
|
||||
>
|
||||
重置
|
||||
</el-button>
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
|
||||
<el-row
|
||||
:gutter="10"
|
||||
class="mb8"
|
||||
>
|
||||
<el-col :span="1.5">
|
||||
<el-button
|
||||
type="primary"
|
||||
plain
|
||||
icon="Plus"
|
||||
:disabled="collect"
|
||||
@click="handleCollect('已采集')"
|
||||
>
|
||||
采集
|
||||
</el-button>
|
||||
</el-col>
|
||||
<el-col :span="1.5">
|
||||
<el-button
|
||||
type="success"
|
||||
plain
|
||||
icon="Edit"
|
||||
:disabled="single"
|
||||
@click="handleUpdate"
|
||||
>
|
||||
合管
|
||||
</el-button>
|
||||
</el-col>
|
||||
<el-col :span="1.5">
|
||||
<el-button
|
||||
type="danger"
|
||||
plain
|
||||
icon="Delete"
|
||||
:disabled="multiple"
|
||||
@click="handleCollect('待采集')"
|
||||
>
|
||||
取消
|
||||
</el-button>
|
||||
</el-col>
|
||||
<el-col :span="1.5">
|
||||
<el-button
|
||||
type="primary"
|
||||
plain
|
||||
icon="Plus"
|
||||
:disabled="multiple"
|
||||
@click="handleDelete"
|
||||
>
|
||||
打印条码
|
||||
</el-button>
|
||||
</el-col>
|
||||
<right-toolbar
|
||||
v-model:show-search="showSearch"
|
||||
@query-table="getList"
|
||||
/>
|
||||
</el-row>
|
||||
|
||||
<el-table
|
||||
v-if="refreshTable"
|
||||
v-loading="loading"
|
||||
:data="dataList"
|
||||
row-key="chargeName"
|
||||
:default-expand-all="false"
|
||||
>
|
||||
<!-- 子表列 -->
|
||||
<el-table-column
|
||||
type="expand"
|
||||
width="50"
|
||||
fixed="left"
|
||||
>
|
||||
<template #default="props">
|
||||
<el-table
|
||||
ref="childTable"
|
||||
:data="props.row.children"
|
||||
style="width: 100%"
|
||||
:show-header="true"
|
||||
@selection-change="handleSelectionChange($event, props.row)"
|
||||
>
|
||||
<!-- 子表的多选框 -->
|
||||
<el-table-column
|
||||
type="selection"
|
||||
width="55"
|
||||
:selectable="selectable"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="创建时间" style="width: 308px;">
|
||||
<el-date-picker
|
||||
v-model="authoredTime"
|
||||
value-format="YYYY-MM-DD"
|
||||
type="daterange"
|
||||
range-separator="-"
|
||||
start-placeholder="开始日期"
|
||||
end-placeholder="结束日期"
|
||||
></el-date-picker>
|
||||
</el-form-item>
|
||||
<el-form-item>
|
||||
<el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
|
||||
<el-button icon="Refresh" @click="resetQuery">重置</el-button>
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
|
||||
<el-row :gutter="10" class="mb8">
|
||||
<el-col :span="1.5">
|
||||
<el-button
|
||||
type="primary"
|
||||
plain
|
||||
icon="Plus"
|
||||
:disabled="collect"
|
||||
@click="handleCollect('已采集')"
|
||||
>采集</el-button>
|
||||
</el-col>
|
||||
<el-col :span="1.5">
|
||||
<el-button
|
||||
type="success"
|
||||
plain
|
||||
icon="Edit"
|
||||
:disabled="single"
|
||||
@click="handleUpdate"
|
||||
>合管</el-button>
|
||||
</el-col>
|
||||
<el-col :span="1.5">
|
||||
<el-button
|
||||
type="danger"
|
||||
plain
|
||||
icon="Delete"
|
||||
:disabled="multiple"
|
||||
@click="handleCollect('待采集')"
|
||||
>取消</el-button>
|
||||
</el-col>
|
||||
<el-col :span="1.5">
|
||||
<el-button
|
||||
type="primary"
|
||||
plain
|
||||
icon="Plus"
|
||||
:disabled="multiple"
|
||||
@click="handleDelete"
|
||||
>打印条码</el-button>
|
||||
</el-col>
|
||||
<right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
|
||||
</el-row>
|
||||
|
||||
<el-table
|
||||
v-if="refreshTable"
|
||||
v-loading="loading"
|
||||
:data="dataList"
|
||||
row-key="chargeName"
|
||||
:default-expand-all="false"
|
||||
>
|
||||
<!-- 子表列 -->
|
||||
<el-table-column
|
||||
type="expand"
|
||||
width="50"
|
||||
fixed="left"
|
||||
>
|
||||
<template #default="props">
|
||||
<el-table
|
||||
:data="props.row.children"
|
||||
style="width: 100%"
|
||||
:show-header="true"
|
||||
@selection-change="handleSelectionChange($event, props.row)"
|
||||
ref="childTable"
|
||||
>
|
||||
<!-- 子表的多选框 -->
|
||||
<el-table-column
|
||||
type="selection"
|
||||
width="55"
|
||||
:selectable="selectable"
|
||||
></el-table-column>
|
||||
<el-table-column
|
||||
prop="specimenName"
|
||||
label="样本名称"
|
||||
></el-table-column>
|
||||
<el-table-column
|
||||
prop="specimenVolume"
|
||||
label="样本数量"
|
||||
>
|
||||
<template #default="innerProps">
|
||||
{{ innerProps.row.specimenVolume }} {{ innerProps.row.specimenUnit }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="collectionStatusEnumText"
|
||||
label="采集状态"
|
||||
<el-table-column
|
||||
prop="specimenName"
|
||||
label="样本名称"
|
||||
/>
|
||||
<el-table-column
|
||||
prop="specimenVolume"
|
||||
label="样本数量"
|
||||
>
|
||||
<template #default="innerProps">
|
||||
{{ innerProps.row.specimenVolume }} {{ innerProps.row.specimenUnit }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="collectionStatusEnumText"
|
||||
label="采集状态"
|
||||
>
|
||||
<template #default="nerProp">
|
||||
<span
|
||||
v-if="nerProp.row.collectionStatusEnum == 1"
|
||||
style="color:green"
|
||||
>
|
||||
<template #default="nerProp">
|
||||
<span v-if="nerProp.row.collectionStatusEnum == 1" style="color:green">
|
||||
已采集
|
||||
</span>
|
||||
<span v-else-if="nerProp.row.collectionStatusEnum == 0" style="color:orange">
|
||||
<span
|
||||
v-else-if="nerProp.row.collectionStatusEnum == 0"
|
||||
style="color:orange"
|
||||
>
|
||||
待采集
|
||||
</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="collectionDate"
|
||||
label="采集时间"
|
||||
></el-table-column>
|
||||
</el-table>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<!-- 母表列 -->
|
||||
<el-table-column
|
||||
prop="chargeName"
|
||||
label="项目名称"
|
||||
:sortable="true"
|
||||
></el-table-column>
|
||||
<el-table-column
|
||||
prop="patientName"
|
||||
label="患者姓名"
|
||||
:sortable="true"
|
||||
></el-table-column>
|
||||
<el-table-column
|
||||
prop="genderEnumText"
|
||||
label="性别"
|
||||
:sortable="true"
|
||||
></el-table-column>
|
||||
<el-table-column
|
||||
label="样本状态"
|
||||
>
|
||||
<template #default="sprops">
|
||||
<span v-if="hasPendingCollection(sprops.row.children)" style="color:orange">
|
||||
待采集
|
||||
</span>
|
||||
<span v-else style="color:green">
|
||||
已采集
|
||||
</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="doctorName"
|
||||
label="开单医生"
|
||||
:sortable="true"
|
||||
></el-table-column>
|
||||
<el-table-column
|
||||
prop="authoredTime"
|
||||
label="开单时间"
|
||||
:sortable="true"
|
||||
></el-table-column>
|
||||
</el-table>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="collectionDate"
|
||||
label="采集时间"
|
||||
/>
|
||||
</el-table>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<!-- 母表列 -->
|
||||
<el-table-column
|
||||
prop="chargeName"
|
||||
label="项目名称"
|
||||
:sortable="true"
|
||||
/>
|
||||
<el-table-column
|
||||
prop="patientName"
|
||||
label="患者姓名"
|
||||
:sortable="true"
|
||||
/>
|
||||
<el-table-column
|
||||
prop="genderEnumText"
|
||||
label="性别"
|
||||
:sortable="true"
|
||||
/>
|
||||
<el-table-column
|
||||
label="样本状态"
|
||||
>
|
||||
<template #default="sprops">
|
||||
<span
|
||||
v-if="hasPendingCollection(sprops.row.children)"
|
||||
style="color:orange"
|
||||
>
|
||||
待采集
|
||||
</span>
|
||||
<span
|
||||
v-else
|
||||
style="color:green"
|
||||
>
|
||||
已采集
|
||||
</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column
|
||||
prop="doctorName"
|
||||
label="开单医生"
|
||||
:sortable="true"
|
||||
/>
|
||||
<el-table-column
|
||||
prop="authoredTime"
|
||||
label="开单时间"
|
||||
:sortable="true"
|
||||
/>
|
||||
</el-table>
|
||||
|
||||
<pagination
|
||||
v-show="total > 0"
|
||||
:total="total"
|
||||
v-model:page="queryParams.pageNum"
|
||||
v-model:limit="queryParams.pageSize"
|
||||
@pagination="getList"
|
||||
/>
|
||||
|
||||
</div>
|
||||
<pagination
|
||||
v-show="total > 0"
|
||||
v-model:page="queryParams.pageNum"
|
||||
v-model:limit="queryParams.pageSize"
|
||||
:total="total"
|
||||
@pagination="getList"
|
||||
/>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script setup name="Config">
|
||||
|
||||
Reference in New Issue
Block a user