wangyizhe/his
1
3
Fork 0
Code Issues Pull Requests 2 Actions Packages Projects Releases Wiki Activity

fix(#591): 请修复 Bug #591：【住院医生站-临床医嘱】长期医嘱点击停嘱未弹出时间录入弹窗

Browse Source 
根因：
- 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
Download Patch File Download Diff File Expand all files Collapse all files

63
openhis-ui-vue3/src/views/datadictionary/definition/components/edit.vue
View File

@@ -1,7 +1,7 @@
<template>
<el-dialog
:title="title"
v-model="localOpen"
:title="title"
width="800px"
append-to-body
@close="cancel"
@@ -12,26 +12,58 @@
</div>
</template>
<div class="scrollable-content">
<el-form ref="definitionRef" :model="fromModel" label-width="140px">
<el-form
ref="definitionRef"
:model="fromModel"
label-width="140px"
>
<el-row>
<el-col :span="8">
<el-form-item label-width="100" label="项目名称" prop="chargeName">
<el-input v-model="fromModel.chargeName" disabled="true" />
<el-form-item
label-width="100"
label="项目名称"
prop="chargeName"
>
<el-input
v-model="fromModel.chargeName"
disabled="true"
/>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label-width="100" label="所属科室" prop="orgId_dictText">
<el-input v-model="fromModel.orgId_dictText" disabled="true" />
<el-form-item
label-width="100"
label="所属科室"
prop="orgId_dictText"
>
<el-input
v-model="fromModel.orgId_dictText"
disabled="true"
/>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label-width="100" label="财务类别" prop="typeCode_dictText">
<el-input v-model="fromModel.typeCode_dictText" disabled="true" />
<el-form-item
label-width="100"
label="财务类别"
prop="typeCode_dictText"
>
<el-input
v-model="fromModel.typeCode_dictText"
disabled="true"
/>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label-width="100" label="医保类别" prop="ybType_dictText">
<el-input v-model="fromModel.ybType_dictText" disabled="true" />
<el-form-item
label-width="100"
label="医保类别"
prop="ybType_dictText"
>
<el-input
v-model="fromModel.ybType_dictText"
disabled="true"
/>
</el-form-item>
</el-col>
<el-col :span="8">
@@ -56,8 +88,15 @@
</div>
<template #footer>
<div class="dialog-footer">
<el-button type="primary" @click="submitForm">确 定</el-button>
<el-button @click="cancel">取 消</el-button>
<el-button
type="primary"
@click="submitForm"
>
确 定
</el-button>
<el-button @click="cancel">
取 消
</el-button>
</div>
</template>
</el-dialog>

245
openhis-ui-vue3/src/views/datadictionary/definition/index.vue
View File

@@ -1,22 +1,29 @@
<template>
<div class="app-container">
<el-form
:model="queryParams"
ref="queryRef"
:inline="true"
v-show="showSearch"
ref="queryRef"
:model="queryParams"
:inline="true"
label-width="90px"
>
<el-tabs v-model="activeName" class="demo-tabs" @tab-click="handleClick">
<el-tab-pane label="药品定价" name="1">
<el-tabs
v-model="activeName"
class="demo-tabs"
@tab-click="handleClick"
>
<el-tab-pane
label="药品定价"
name="1"
>
<el-row :gutter="16">
<!-- <el-col :span="4" style="width: 20%"> -->
<el-form-item
label-width="100"
label="财务类别"
<el-form-item
label-width="100"
label="财务类别"
prop="chargeItem"
>
prop="chargeItem"
>
<el-select
v-model="queryParams.typeCode"
placeholder="请选择财务类别"
@@ -27,19 +34,20 @@
>
<el-option
v-for="dict in fin_type_code"
:key="dict.value" :label="dict.label"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
</el-form-item>
<!-- </el-col> -->
<!-- <el-col :span="4" style="width: 20%"> -->
<el-form-item
label-width="100"
label="状态"
<el-form-item
label-width="100"
label="状态"
prop="chargeItem"
>
prop="chargeItem"
>
<el-select
v-model="queryParams.statusEnum"
placeholder="请选择状态"
@@ -50,27 +58,28 @@
>
<el-option
v-for="dict in options"
:key="dict.value" :label="dict.label"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
</el-form-item>
<!-- </el-col> -->
<!-- <el-col :span="4" style="width: 20%"> -->
<el-form-item
label-width="100"
label="名称"
<el-form-item
label-width="100"
label="名称"
prop="searchKey"
>
<el-input
v-model="queryParams.searchKey"
placeholder="名称/编码/拼音"
clearable
@keyup.enter="handleQuery"
@blur="handleQuery"
/>
</el-form-item>
prop="searchKey"
>
<el-input
v-model="queryParams.searchKey"
placeholder="名称/编码/拼音"
clearable
@keyup.enter="handleQuery"
@blur="handleQuery"
/>
</el-form-item>
<!-- </el-col> -->
</el-row>
<el-table
@@ -153,8 +162,9 @@
link
type="primary"
@click="handleDetails(scope.row)"
>{{ thousandNumber(scope.row.detailCount) }}</el-button
>
{{ thousandNumber(scope.row.detailCount) }}
</el-button>
</div>
<div v-else>
{{ scope.row.detailCount == 0 ? "0" : "-" }}
@@ -183,29 +193,36 @@
fixed="right"
>
<template #default="scope">
<el-button link type="primary" @click="handleUpdate(scope.row)"
>修改</el-button
<el-button
link
type="primary"
@click="handleUpdate(scope.row)"
>
修改
</el-button>
</template>
</el-table-column>
</el-table>
<pagination
v-show="total > 0"
:total="total"
v-model:page="queryParams.pageNo"
v-model:limit="queryParams.pageSize"
:total="total"
@pagination="getList"
/>
</el-tab-pane>
<el-tab-pane label="器具定价" name="2">
<el-tab-pane
label="器具定价"
name="2"
>
<el-row :gutter="16">
<!-- <el-col :span="4" style="width: 20%"> -->
<el-form-item
label-width="100"
label="财务类别"
<el-form-item
label-width="100"
label="财务类别"
prop="chargeItem"
>
prop="chargeItem"
>
<el-select
v-model="queryParams.typeCode"
placeholder="请选择财务类别"
@@ -216,19 +233,20 @@
>
<el-option
v-for="dict in fin_type_code"
:key="dict.value" :label="dict.label"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
</el-form-item>
<!-- </el-col> -->
<!-- <el-col :span="4" style="width: 20%"> -->
<el-form-item
label-width="100"
label="状态"
<el-form-item
label-width="100"
label="状态"
prop="chargeItem"
>
prop="chargeItem"
>
<el-select
v-model="queryParams.statusEnum"
placeholder="请选择状态"
@@ -239,27 +257,28 @@
>
<el-option
v-for="dict in options"
:key="dict.value" :label="dict.label"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
</el-form-item>
<!-- </el-col> -->
<!-- <el-col :span="4" style="width: 20%"> -->
<el-form-item
label-width="100"
label="名称"
<el-form-item
label-width="100"
label="名称"
prop="searchKey"
>
<el-input
v-model="queryParams.searchKey"
placeholder="名称/编码/拼音"
clearable
@keyup.enter="handleQuery"
@blur="handleQuery"
/>
</el-form-item>
prop="searchKey"
>
<el-input
v-model="queryParams.searchKey"
placeholder="名称/编码/拼音"
clearable
@keyup.enter="handleQuery"
@blur="handleQuery"
/>
</el-form-item>
<!-- </el-col> -->
</el-row>
<el-table
@@ -342,8 +361,9 @@
link
type="primary"
@click="handleDetails(scope.row)"
>{{ thousandNumber(scope.row.detailCount) }}</el-button
>
{{ thousandNumber(scope.row.detailCount) }}
</el-button>
</div>
<div v-else>
{{ scope.row.detailCount == 0 ? "0" : "-" }}
@@ -372,29 +392,36 @@
fixed="right"
>
<template #default="scope">
<el-button link type="primary" @click="handleUpdate(scope.row)"
>修改</el-button
<el-button
link
type="primary"
@click="handleUpdate(scope.row)"
>
修改
</el-button>
</template>
</el-table-column>
</el-table>
<pagination
v-show="total > 0"
:total="total"
v-model:page="queryParams.pageNo"
v-model:limit="queryParams.pageSize"
:total="total"
@pagination="getList"
/>
</el-tab-pane>
<el-tab-pane label="活动定价" name="3">
<el-tab-pane
label="活动定价"
name="3"
>
<el-row :gutter="16">
<!-- <el-col :span="4" style="width: 20%"> -->
<el-form-item
label-width="100"
label="财务类别"
<el-form-item
label-width="100"
label="财务类别"
prop="chargeItem"
>
prop="chargeItem"
>
<el-select
v-model="queryParams.typeCode"
placeholder="请选择财务类别"
@@ -405,19 +432,20 @@
>
<el-option
v-for="dict in fin_type_code"
:key="dict.value" :label="dict.label"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
</el-form-item>
<!-- </el-col> -->
<!-- <el-col :span="4" style="width: 20%"> -->
<el-form-item
label-width="100"
label="状态"
<el-form-item
label-width="100"
label="状态"
prop="chargeItem"
>
prop="chargeItem"
>
<el-select
v-model="queryParams.statusEnum"
placeholder="请选择状态"
@@ -428,27 +456,28 @@
>
<el-option
v-for="dict in options"
:key="dict.value" :label="dict.label"
:key="dict.value"
:label="dict.label"
:value="dict.value"
/>
</el-select>
</el-form-item>
</el-form-item>
<!-- </el-col> -->
<!-- <el-col :span="4" style="width: 20%"> -->
<el-form-item
label-width="100"
label="名称"
<el-form-item
label-width="100"
label="名称"
prop="searchKey"
>
<el-input
v-model="queryParams.searchKey"
placeholder="名称/编码/拼音"
clearable
@keyup.enter="handleQuery"
@blur="handleQuery"
/>
</el-form-item>
prop="searchKey"
>
<el-input
v-model="queryParams.searchKey"
placeholder="名称/编码/拼音"
clearable
@keyup.enter="handleQuery"
@blur="handleQuery"
/>
</el-form-item>
<!-- </el-col> -->
</el-row>
<el-table
@@ -531,8 +560,9 @@
link
type="primary"
@click="handleDetails(scope.row)"
>{{ thousandNumber(scope.row.detailCount) }}</el-button
>
{{ thousandNumber(scope.row.detailCount) }}
</el-button>
</div>
<div v-else>
{{ scope.row.detailCount == 0 ? "0" : "-" }}
@@ -561,25 +591,29 @@
fixed="right"
>
<template #default="scope">
<el-button link type="primary" @click="handleUpdate(scope.row)"
>修改</el-button
<el-button
link
type="primary"
@click="handleUpdate(scope.row)"
>
修改
</el-button>
</template>
</el-table-column>
</el-table>
<pagination
v-show="total > 0"
:total="total"
v-model:page="queryParams.pageNo"
v-model:limit="queryParams.pageSize"
:total="total"
@pagination="getList"
/>
</el-tab-pane>
</el-tabs>
</el-form>
<el-dialog
:title="title"
v-model="openDetails"
:title="title"
width="600px"
append-to-body
>
@@ -602,7 +636,12 @@
}}
</template>
</el-table-column>
<el-table-column label="价格" width="200" prop="amount" align="center">
<el-table-column
label="价格"
width="200"
prop="amount"
align="center"
>
<template #default="scope">
{{ scope.row.amount ? scope.row.amount : "-" }}
</template>
@@ -612,7 +651,7 @@
<edit
:title="title"
:open="open"
:formData="form"
:form-data="form"
@submit="submitForm"
@update:open="handleOpenChange"
@update:form="handleFormChange"