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

@@ -1,28 +1,57 @@
<template>
<el-dialog :title="dialogTitle" v-model="dialogVisible" width="1300px" @close="handleDialogClose">
<el-form ref="formRef" :model="formData" :rules="formRules" label-width="80px">
<el-dialog
v-model="dialogVisible"
:title="dialogTitle"
width="1300px"
@close="handleDialogClose"
>
<el-form
ref="formRef"
:model="formData"
:rules="formRules"
label-width="80px"
>
<div class="dialog-top-row">
<el-form-item label="名称" prop="name">
<el-input v-model="formData.name" placeholder="请输入名称" style="width: 220px" />
<el-form-item
label="名称"
prop="name"
>
<el-input
v-model="formData.name"
placeholder="请输入名称"
style="width: 220px"
/>
</el-form-item>
<el-form-item label="使用范围" v-if="showRangeSelector && !isEdit">
<el-form-item
v-if="showRangeSelector && !isEdit"
label="使用范围"
>
<el-select
v-model="rangeSelectValue"
placeholder="个人/科室/全院"
style="width: 220px"
@change="handleRangeChange"
>
<el-option label="个人" value="personal" />
<el-option label="科室" value="department" />
<el-option label="全院" value="hospital" />
<el-option
label="个人"
value="personal"
/>
<el-option
label="科室"
value="department"
/>
<el-option
label="全院"
value="hospital"
/>
</el-select>
</el-form-item>
<el-form-item
v-if="currentTab === 'personal' && !isDoctorStation && !showRangeSelector"
label="参与者"
prop="practitionerId"
v-if="currentTab === 'personal' && !isDoctorStation && !showRangeSelector"
>
<el-select
v-model="formData.practitionerId"
@@ -39,10 +68,14 @@
</el-select>
</el-form-item>
<el-form-item label="科室" prop="organizationId" v-if="currentTab === 'department'">
<el-form-item
v-if="currentTab === 'department'"
label="科室"
prop="organizationId"
>
<el-tree-select
clearable
v-model="formData.organizationId"
clearable
:data="organization"
:props="{ value: 'id', label: 'name', children: 'children' }"
value-key="id"
@@ -58,33 +91,61 @@
</el-form>
<div style="margin-bottom: 10px">
<el-button type="primary" @click="handleAddRow">新增</el-button>
<el-button @click="handleCombineGroup">组合</el-button>
<el-button @click="handleSplitGroup">拆组</el-button>
<el-button
type="primary"
@click="handleAddRow"
>
新增
</el-button>
<el-button @click="handleCombineGroup">
组合
</el-button>
<el-button @click="handleSplitGroup">
拆组
</el-button>
</div>
<el-table
max-height="650"
ref="prescriptionRef"
max-height="650"
:data="prescriptionList"
row-key="uniqueKey"
border
:expand-row-keys="expandOrder"
@cell-click="clickRow"
@selection-change="handleSelectionChange"
:expand-row-keys="expandOrder"
>
<el-table-column type="selection" width="55" :selectable="isRowSelectable" />
<el-table-column label="组" align="center" width="60">
<el-table-column
type="selection"
width="55"
:selectable="isRowSelectable"
/>
<el-table-column
label="组"
align="center"
width="60"
>
<template #default="scope">
<span v-if="scope.row.groupId">{{ getGroupIcon(scope.row) }}</span>
</template>
</el-table-column>
<el-table-column label="类型" align="center" width="120">
<el-table-column
label="类型"
align="center"
width="120"
>
<template #default="scope">
<template v-if="!scope.row.groupPackageId">
<el-radio-group v-model="scope.row.therapyEnum" size="small">
<el-radio-button label="1">长期</el-radio-button>
<el-radio-button label="2">临时</el-radio-button>
<el-radio-group
v-model="scope.row.therapyEnum"
size="small"
>
<el-radio-button label="1">
长期
</el-radio-button>
<el-radio-button label="2">
临时
</el-radio-button>
</el-radio-group>
</template>
<span v-else>
@@ -94,7 +155,12 @@
</span>
</template>
</el-table-column>
<el-table-column label="医嘱" align="center" prop="productName" width="300">
<el-table-column
label="医嘱"
align="center"
prop="productName"
width="300"
>
<template #default="scope">
<template v-if="getRowDisabled(scope.row)">
<el-popover
@@ -105,15 +171,15 @@
>
<adviceBaseList
ref="adviceTableRef"
:popoverVisible="scope.row.showPopover"
:adviceQueryParams="adviceQueryParams"
@selectAdviceBase="(row) => selectAdviceBase(scope.row.uniqueKey, row)"
:popover-visible="scope.row.showPopover"
:advice-query-params="adviceQueryParams"
@select-advice-base="(row) => selectAdviceBase(scope.row.uniqueKey, row)"
/>
<template #reference>
<el-input
:ref="'adviceRef' + scope.$index"
style="width: 100%"
v-model="scope.row.adviceName"
style="width: 100%"
placeholder="请选择项目"
@input="(value) => handleInput(value, scope.row, scope.$index)"
@click="handleFocus(scope.row, scope.$index)"
@@ -136,14 +202,19 @@
</template>
</el-table-column>
<el-table-column label="单次剂量" align="center" width="250" prop="sortNumber">
<el-table-column
label="单次剂量"
align="center"
width="250"
prop="sortNumber"
>
<template #default="scope">
<template v-if="!scope.row.groupPackageId">
<template v-if="scope.row.adviceType == 1 || !scope.row.adviceDefinitionId">
<!-- 新增/未保存行:统一按"数量 + 单位 = 剂量 + 单位"展示 -->
<el-input
style="width: 70px; margin-right: 10px"
v-model="scope.row.doseQuantity"
style="width: 70px; margin-right: 10px"
@input="
(value) => {
scope.row.dose = value * scope.row.unitConversionRatio;
@@ -153,15 +224,15 @@
<span>
{{
scope.row.minUnitCode_dictText ||
scope.row.unitCodeName ||
scope.row.unitCode_dictText ||
''
scope.row.unitCodeName ||
scope.row.unitCode_dictText ||
''
}}
</span>
<span>{{ ' = ' }}</span>
<el-input
style="width: 70px; margin-right: 10px"
v-model="scope.row.dose"
style="width: 70px; margin-right: 10px"
@input="
(value) => {
scope.row.doseQuantity = value / scope.row.unitConversionRatio;
@@ -171,9 +242,9 @@
<span>
{{
scope.row.doseUnitCode_dictText ||
scope.row.unitCodeName ||
scope.row.unitCode_dictText ||
''
scope.row.unitCodeName ||
scope.row.unitCode_dictText ||
''
}}
</span>
</template>
@@ -186,11 +257,21 @@
</template>
</el-table-column>
<el-table-column label="给药途径" align="center" width="150" prop="sortNumber">
<el-table-column
label="给药途径"
align="center"
width="150"
prop="sortNumber"
>
<template #default="scope">
<template v-if="!scope.row.groupPackageId">
<template v-if="scope.row.adviceType == 1 || !scope.row.adviceDefinitionId">
<el-select v-model="scope.row.methodCode" placeholder="给药途径" clearable filterable>
<el-select
v-model="scope.row.methodCode"
placeholder="给药途径"
clearable
filterable
>
<el-option
v-for="dict in method_code"
:key="dict.value"
@@ -208,7 +289,12 @@
</template>
</el-table-column>
<el-table-column label="用药频次" align="center" width="150" prop="sortNumber">
<el-table-column
label="用药频次"
align="center"
width="150"
prop="sortNumber"
>
<template #default="scope">
<template v-if="!scope.row.groupPackageId">
<template v-if="scope.row.adviceType == 1 || !scope.row.adviceDefinitionId">
@@ -235,7 +321,12 @@
</template>
</el-table-column>
<el-table-column label="用药天数" align="center" width="100" prop="sortNumber">
<el-table-column
label="用药天数"
align="center"
width="100"
prop="sortNumber"
>
<template #default="scope">
<template v-if="!scope.row.groupPackageId">
<template v-if="scope.row.adviceType == 1 || !scope.row.adviceDefinitionId">
@@ -253,7 +344,12 @@
</template>
</el-table-column>
<el-table-column label="总量/执行次数" align="center" width="150" prop="sortNumber">
<el-table-column
label="总量/执行次数"
align="center"
width="150"
prop="sortNumber"
>
<template #default="scope">
<template v-if="!scope.row.groupPackageId">
<el-input
@@ -267,7 +363,12 @@
</template>
</el-table-column>
<el-table-column label="单位" align="center" width="120" prop="unitCode">
<el-table-column
label="单位"
align="center"
width="120"
prop="unitCode"
>
<template #default="scope">
<template v-if="!scope.row.groupPackageId">
<el-select
@@ -293,7 +394,11 @@
</template>
</el-table-column>
<el-table-column label="操作" align="center" width="80">
<el-table-column
label="操作"
align="center"
width="80"
>
<template #default="scope">
<el-button
type="danger"
@@ -307,8 +412,16 @@
</el-table>
<template #footer>
<el-button @click="dialogVisible = false"> </el-button>
<el-button type="primary" @click="submitForm" :loading="submitLoading"> </el-button>
<el-button @click="dialogVisible = false">
取 消
</el-button>
<el-button
type="primary"
:loading="submitLoading"
@click="submitForm"
>
</el-button>
</template>
</el-dialog>
</template>

View File

@@ -1,26 +1,75 @@
<template>
<div @keyup="handleKeyDown" tabindex="0" ref="tableWrapper" class="table-container">
<div
ref="tableWrapper"
tabindex="0"
class="table-container"
@keyup="handleKeyDown"
>
<el-table
ref="adviceBaseRef"
v-loading="loading"
height="350"
:data="adviceBaseList"
highlight-current-row
@current-change="handleCurrentChange"
row-key="patientId"
v-loading="loading"
@current-change="handleCurrentChange"
@cell-click="clickRow"
>
<el-table-column label="名称" align="center" prop="adviceName" />
<el-table-column label="类型" align="center" prop="activityType_enumText" />
<el-table-column label="包装单位" align="center" prop="unitCode_dictText" />
<el-table-column label="最小单位" align="center" prop="minUnitCode_dictText" />
<el-table-column label="规格" align="center" prop="volume" />
<el-table-column label="用法" align="center" prop="methodCode_dictText" />
<el-table-column label="频次" align="center" prop="rateCode_dictText" />
<el-table-column label="单次剂量" align="center" prop="dose" />
<el-table-column label="剂量单位" align="center" prop="doseUnitCode_dictText" />
<el-table-column label="注射药品" align="center" prop="injectFlag_enumText" />
<el-table-column label="皮试" align="center" prop="skinTestFlag_enumText" />
<el-table-column
label="名称"
align="center"
prop="adviceName"
/>
<el-table-column
label="类型"
align="center"
prop="activityType_enumText"
/>
<el-table-column
label="包装单位"
align="center"
prop="unitCode_dictText"
/>
<el-table-column
label="最小单位"
align="center"
prop="minUnitCode_dictText"
/>
<el-table-column
label="规格"
align="center"
prop="volume"
/>
<el-table-column
label="用法"
align="center"
prop="methodCode_dictText"
/>
<el-table-column
label="频次"
align="center"
prop="rateCode_dictText"
/>
<el-table-column
label="单次剂量"
align="center"
prop="dose"
/>
<el-table-column
label="剂量单位"
align="center"
prop="doseUnitCode_dictText"
/>
<el-table-column
label="注射药品"
align="center"
prop="injectFlag_enumText"
/>
<el-table-column
label="皮试"
align="center"
prop="skinTestFlag_enumText"
/>
</el-table>
<!-- 分页组件 -->
<div class="pagination-wrapper">