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

166
openhis-ui-vue3/src/views/patientmanagement/outpatienrecords/index.vue
View File

@@ -1,7 +1,15 @@
<template>
<div class="app-container">
<el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch">
<el-form-item label="查询内容" prop="searchKey">
<el-form
v-show="showSearch"
ref="queryRef"
:model="queryParams"
:inline="true"
>
<el-form-item
label="查询内容"
prop="searchKey"
>
<el-input
v-model="queryParams.searchKey"
placeholder="姓名/身份证号/病人ID/门诊号"
@@ -10,7 +18,10 @@
@keyup.enter="handleQuery"
/>
</el-form-item>
<el-form-item label="电话" prop="phone">
<el-form-item
label="电话"
prop="phone"
>
<el-input
v-model="queryParams.phone"
placeholder="请输入联系方式"
@@ -28,36 +39,72 @@
start-placeholder="开始日期"
end-placeholder="结束日期"
style="width: 240px"
></el-date-picker>
/>
</el-form-item>
<el-form-item label="性别" prop="genderEnum">
<el-form-item
label="性别"
prop="genderEnum"
>
<el-select
v-model="queryParams.genderEnum"
placeholder="请选择性别"
clearable
style="width: 100px"
>
<el-option label="男" :value="1" />
<el-option label="女" :value="2" />
<el-option label="未知" :value="3" />
<el-option
label="男"
:value="1"
/>
<el-option
label="女"
:value="2"
/>
<el-option
label="未知"
:value="3"
/>
</el-select>
</el-form-item>
<el-form-item label="状态" prop="subjectStatusEnum">
<el-form-item
label="状态"
prop="subjectStatusEnum"
>
<el-select
v-model="queryParams.subjectStatusEnum"
placeholder="请选择状态"
clearable
style="width: 120px"
>
<el-option label="已到达" :value="1" />
<el-option label="已分诊" :value="2" />
<el-option label="已看诊" :value="3" />
<el-option label="已离开" :value="4" />
<el-option label="已完成" :value="5" />
<el-option label="无状态" :value="0" />
<el-option
label="已到达"
:value="1"
/>
<el-option
label="已分诊"
:value="2"
/>
<el-option
label="已看诊"
:value="3"
/>
<el-option
label="已离开"
:value="4"
/>
<el-option
label="已完成"
:value="5"
/>
<el-option
label="无状态"
:value="0"
/>
</el-select>
</el-form-item>
<el-form-item label="医生" prop="doctorName">
<el-form-item
label="医生"
prop="doctorName"
>
<el-select
v-model="queryParams.doctorName"
placeholder="请选择医生"
@@ -73,29 +120,86 @@
</el-select>
</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-button
type="primary"
icon="Search"
@click="handleQuery"
>
搜索
</el-button>
<el-button
icon="Refresh"
@click="resetQuery"
>
重置
</el-button>
</el-form-item>
</el-form>
<el-table
v-loading="loading"
:data="outpatienRecordsList"
border
border
style="width: 100%"
:default-sort="{ prop: 'encounterTime', order: 'descending' }"
v-loading="loading"
:header-cell-style="{ background: '#f5f7fa', fontWeight: 'bold' }"
>
<el-table-column prop="name" label="患者" min-width="100" />
<el-table-column prop="genderEnum_enumText" label="性别" width="80" align="center" />
<el-table-column prop="idCard" label="身份证" min-width="160" :show-overflow-tooltip="true" />
<el-table-column prop="phone" label="电话" width="120" />
<el-table-column prop="patientBusNo" label="病人ID" width="100" align="center" />
<el-table-column prop="encounterBusNo" label="门诊号" width="120" align="center" />
<el-table-column prop="encounterTime" label="就诊时间" width="160" sortable />
<el-table-column prop="doctorName" label="接诊医生" width="120" />
<el-table-column prop="organizationName" label="医疗机构" min-width="120" :show-overflow-tooltip="true" />
<el-table-column label="状态" width="100" align="center">
<el-table-column
prop="name"
label="患者"
min-width="100"
/>
<el-table-column
prop="genderEnum_enumText"
label="性别"
width="80"
align="center"
/>
<el-table-column
prop="idCard"
label="身份证"
min-width="160"
:show-overflow-tooltip="true"
/>
<el-table-column
prop="phone"
label="电话"
width="120"
/>
<el-table-column
prop="patientBusNo"
label="病人ID"
width="100"
align="center"
/>
<el-table-column
prop="encounterBusNo"
label="门诊号"
width="120"
align="center"
/>
<el-table-column
prop="encounterTime"
label="就诊时间"
width="160"
sortable
/>
<el-table-column
prop="doctorName"
label="接诊医生"
width="120"
/>
<el-table-column
prop="organizationName"
label="医疗机构"
min-width="120"
:show-overflow-tooltip="true"
/>
<el-table-column
label="状态"
width="100"
align="center"
>
<template #default="scope">
<el-tag
:type="getStatusTagType(scope.row.subjectStatusEnum)"
@@ -109,9 +213,9 @@
</el-table>
<pagination
v-show="total > 0"
:total="total"
v-model:page="queryParams.pageNo"
v-model:limit="queryParams.pageSize"
:total="total"
@pagination="getList"
/>
</div>

257
openhis-ui-vue3/src/views/patientmanagement/patientmanagement/index.vue
View File

@@ -1,9 +1,21 @@
<template>
<div class="app-container">
<!-- 患者添加/修改/查看对话框组件 -->
<patient-add-dialog ref="patientAddRef" @submit="handlePatientAdded" />
<el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" class="query-form">
<el-form-item label="病人名称" prop="searchKey">
<patient-add-dialog
ref="patientAddRef"
@submit="handlePatientAdded"
/>
<el-form
v-show="showSearch"
ref="queryRef"
:model="queryParams"
:inline="true"
class="query-form"
>
<el-form-item
label="病人名称"
prop="searchKey"
>
<el-input
v-model="queryParams.searchKey"
placeholder="请输入病人名称/拼音码/病人ID"
@@ -20,28 +32,81 @@
range-separator="-"
start-placeholder="开始日期"
end-placeholder="结束日期"
></el-date-picker>
/>
</el-form-item>
<el-form-item class="search-buttons">
<el-button type="primary" icon="Search" @click="handleQuery"> 搜索 </el-button>
<el-button icon="Refresh" @click="resetQuery">重置</el-button>
<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="button-group">
<el-row
:gutter="10"
class="button-group"
>
<el-col :span="1.5">
<el-button type="primary" plain icon="Plus" @click="handleAdd">新增患者</el-button>
<el-button
type="primary"
plain
icon="Plus"
@click="handleAdd"
>
新增患者
</el-button>
</el-col>
<right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
<right-toolbar
v-model:show-search="showSearch"
@query-table="getList"
/>
</el-row>
<el-table :data="patientList" border size="small" :header-cell-style="{padding: '8px 0'}" :cell-style="{padding: '6px 0'}">
<el-table-column prop="idCard" label="身份证号" min-width="120" show-overflow-tooltip />
<el-table-column prop="busNo" label="病人ID" width="100" show-overflow-tooltip />
<el-table-column prop="name" label="病人名称" width="80" />
<el-table-column prop="genderEnum_enumText" label="性别" width="60" align="center">
<el-table
:data="patientList"
border
size="small"
:header-cell-style="{padding: '8px 0'}"
:cell-style="{padding: '6px 0'}"
>
<el-table-column
prop="idCard"
label="身份证号"
min-width="120"
show-overflow-tooltip
/>
<el-table-column
prop="busNo"
label="病人ID"
width="100"
show-overflow-tooltip
/>
<el-table-column
prop="name"
label="病人名称"
width="80"
/>
<el-table-column
prop="genderEnum_enumText"
label="性别"
width="60"
align="center"
>
<template #default="scope">
<dict-tag :options="patient_gender_enum" :value="scope.row.genderEnum" class="dict-tag" />
<dict-tag
:options="patient_gender_enum"
:value="scope.row.genderEnum"
class="dict-tag"
/>
</template>
</el-table-column>
<el-table-column
@@ -51,43 +116,131 @@
align="center"
>
<template #default="scope">
<dict-tag :options="marital_status_enum" :value="scope.row.maritalStatusEnum" class="dict-tag" />
<dict-tag
:options="marital_status_enum"
:value="scope.row.maritalStatusEnum"
class="dict-tag"
/>
</template>
</el-table-column>
<el-table-column prop="nationalityCode" label="民族" width="60" align="center">
<el-table-column
prop="nationalityCode"
label="民族"
width="60"
align="center"
>
<template #default="scope">
<dict-tag :options="nationality_code" :value="scope.row.nationalityCode" class="dict-tag" />
<dict-tag
:options="nationality_code"
:value="scope.row.nationalityCode"
class="dict-tag"
/>
</template>
</el-table-column>
<el-table-column prop="birthDate" label="生日" width="100" />
<el-table-column prop="phone" label="电话" width="110" />
<el-table-column prop="bloodAbo_enumText" label="血型ABO" width="70" align="center">
<el-table-column
prop="birthDate"
label="生日"
width="100"
/>
<el-table-column
prop="phone"
label="电话"
width="110"
/>
<el-table-column
prop="bloodAbo_enumText"
label="血型ABO"
width="70"
align="center"
>
<template #default="scope">
<dict-tag :options="blood_abo" :value="scope.row.bloodAbo" class="dict-tag" />
<dict-tag
:options="blood_abo"
:value="scope.row.bloodAbo"
class="dict-tag"
/>
</template>
</el-table-column>
<el-table-column prop="bloodRh_enumText" label="血型RH" width="70" align="center">
<el-table-column
prop="bloodRh_enumText"
label="血型RH"
width="70"
align="center"
>
<template #default="scope">
<dict-tag :options="blood_rh" :value="scope.row.bloodRh" class="dict-tag" />
<dict-tag
:options="blood_rh"
:value="scope.row.bloodRh"
class="dict-tag"
/>
</template>
</el-table-column>
<el-table-column prop="linkName" label="联系人" width="80" />
<el-table-column prop="linkTelcom" label="联系人电话" width="110" />
<el-table-column prop="linkRelationCode_enumText" label="联系人关系" width="80" align="center">
<el-table-column
prop="linkName"
label="联系人"
width="80"
/>
<el-table-column
prop="linkTelcom"
label="联系人电话"
width="110"
/>
<el-table-column
prop="linkRelationCode_enumText"
label="联系人关系"
width="80"
align="center"
>
<template #default="scope">
<dict-tag :options="link_relation_code" :value="scope.row.linkRelationCode" class="dict-tag" />
<dict-tag
:options="link_relation_code"
:value="scope.row.linkRelationCode"
class="dict-tag"
/>
</template>
</el-table-column>
<el-table-column prop="address" label="家庭地址" min-width="150" show-overflow-tooltip />
<el-table-column prop="prfsEnum_enumText" label="职业" width="80" align="center">
<el-table-column
prop="address"
label="家庭地址"
min-width="150"
show-overflow-tooltip
/>
<el-table-column
prop="prfsEnum_enumText"
label="职业"
width="80"
align="center"
>
<template #default="scope">
<dict-tag :options="prfs_enum" :value="scope.row.prfsEnum" class="dict-tag" />
<dict-tag
:options="prfs_enum"
:value="scope.row.prfsEnum"
class="dict-tag"
/>
</template>
</el-table-column>
<el-table-column prop="workCompany" label="工作单位" min-width="120" show-overflow-tooltip />
<el-table-column prop="organizationName" label="登记医院" width="100" show-overflow-tooltip />
<el-table-column prop="deceasedDate" label="死亡时间" width="100" />
<el-table-column prop="createTime" label="登记时间" width="140" />
<el-table-column
prop="workCompany"
label="工作单位"
min-width="120"
show-overflow-tooltip
/>
<el-table-column
prop="organizationName"
label="登记医院"
width="100"
show-overflow-tooltip
/>
<el-table-column
prop="deceasedDate"
label="死亡时间"
width="100"
/>
<el-table-column
prop="createTime"
label="登记时间"
width="140"
/>
<el-table-column
label="操作"
align="center"
@@ -95,23 +248,45 @@
fixed="right"
>
<template #default="scope">
<el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" class="action-button">修改</el-button>
<el-button link type="primary" icon="View" @click="handleSee(scope.row)" class="action-button">查看</el-button>
<el-button link type="success" icon="Clock" @click="handleVisitHistory(scope.row)" class="action-button">就诊历史</el-button>
<el-button
link
type="primary"
icon="Edit"
class="action-button"
@click="handleUpdate(scope.row)"
>
修改
</el-button>
<el-button
link
type="primary"
icon="View"
class="action-button"
@click="handleSee(scope.row)"
>
查看
</el-button>
<el-button
link
type="success"
icon="Clock"
class="action-button"
@click="handleVisitHistory(scope.row)"
>
就诊历史
</el-button>
</template>
</el-table-column>
</el-table>
<div class="pagination-container">
<pagination
v-show="total > 0"
:total="total"
v-model:page="queryParams.pageNo"
v-model:limit="queryParams.pageSize"
:total="total"
@pagination="getList"
/>
</div>
</div>
</template>