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,9 +1,18 @@
|
||||
<template>
|
||||
<!-- search -->
|
||||
<el-card shadow="always" :body-style="{ padding: '20px' }">
|
||||
<el-card
|
||||
shadow="always"
|
||||
:body-style="{ padding: '20px' }"
|
||||
>
|
||||
<div class="domain">
|
||||
<el-form :inline="true" label-width="100px">
|
||||
<el-form-item label="录入时间" size="normal">
|
||||
<el-form
|
||||
:inline="true"
|
||||
label-width="100px"
|
||||
>
|
||||
<el-form-item
|
||||
label="录入时间"
|
||||
size="normal"
|
||||
>
|
||||
<el-date-picker
|
||||
v-model="searchFormData.recordingDate"
|
||||
type="date"
|
||||
@@ -14,7 +23,10 @@
|
||||
@change="selectTimeChange"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="体温单类型" size="normal">
|
||||
<el-form-item
|
||||
label="体温单类型"
|
||||
size="normal"
|
||||
>
|
||||
<el-select
|
||||
v-model="searchFormData.temperatureType"
|
||||
placeholder="请选择"
|
||||
@@ -24,27 +36,46 @@
|
||||
>
|
||||
<el-option
|
||||
v-for="item in temOptions"
|
||||
:label="item.label"
|
||||
:key="item.value"
|
||||
:label="item.label"
|
||||
:value="item.value"
|
||||
>
|
||||
</el-option>
|
||||
/>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
</div>
|
||||
</el-card>
|
||||
<!-- table -->
|
||||
<el-card shadow="always" style="margin-top: 10px">
|
||||
<el-card
|
||||
shadow="always"
|
||||
style="margin-top: 10px"
|
||||
>
|
||||
<div>
|
||||
<el-form :model="formData" ref="formRef" label-width="80px" :inline="false" size="normal">
|
||||
<el-table border :data="formData.fillTableData" style="width: 100%">
|
||||
<el-table-column width="100px" label="" fixed="left">
|
||||
<el-form
|
||||
ref="formRef"
|
||||
:model="formData"
|
||||
label-width="80px"
|
||||
:inline="false"
|
||||
size="normal"
|
||||
>
|
||||
<el-table
|
||||
border
|
||||
:data="formData.fillTableData"
|
||||
style="width: 100%"
|
||||
>
|
||||
<el-table-column
|
||||
width="100px"
|
||||
label=""
|
||||
fixed="left"
|
||||
>
|
||||
<template #default="scoped">
|
||||
<span>{{ timePointTime(scoped.row.timePoint) }}</span>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column width="250px" label="体温">
|
||||
<el-table-column
|
||||
width="250px"
|
||||
label="体温"
|
||||
>
|
||||
<template #default="scoped">
|
||||
<el-form-item
|
||||
class="el-form-item"
|
||||
@@ -53,8 +84,8 @@
|
||||
>
|
||||
<div style="display: flex; margin-left: -80px">
|
||||
<el-input
|
||||
class="el-input"
|
||||
v-model="scoped.row.temperature"
|
||||
class="el-input"
|
||||
placeholder="请输入体温(℃)"
|
||||
@input="handleInput(scoped.row, scoped.row.temperature, 1)"
|
||||
/>
|
||||
@@ -69,7 +100,7 @@
|
||||
:key="item.value"
|
||||
:label="item.label"
|
||||
:value="item.value"
|
||||
></el-option>
|
||||
/>
|
||||
</el-select>
|
||||
</div>
|
||||
</el-form-item>
|
||||
@@ -77,7 +108,10 @@
|
||||
</el-table-column>
|
||||
<el-table-column label="脉搏">
|
||||
<template #default="scoped">
|
||||
<el-form-item size="normal" :prop="`fillTableData.${scoped.$index}.pulse`">
|
||||
<el-form-item
|
||||
size="normal"
|
||||
:prop="`fillTableData.${scoped.$index}.pulse`"
|
||||
>
|
||||
<div style="margin-left: -80px">
|
||||
<el-input
|
||||
v-model="scoped.row.pulse"
|
||||
@@ -90,7 +124,10 @@
|
||||
</el-table-column>
|
||||
<el-table-column label="呼吸(次/分)">
|
||||
<template #default="scoped">
|
||||
<el-form-item size="normal" :prop="`fillTableData.${scoped.$index}.breathe`">
|
||||
<el-form-item
|
||||
size="normal"
|
||||
:prop="`fillTableData.${scoped.$index}.breathe`"
|
||||
>
|
||||
<div style="display: flex; margin-left: -80px">
|
||||
<el-input
|
||||
v-model="scoped.row.breathe"
|
||||
@@ -108,7 +145,7 @@
|
||||
:key="item.value"
|
||||
:label="item.label"
|
||||
:value="item.value"
|
||||
></el-option>
|
||||
/>
|
||||
</el-select>
|
||||
</div>
|
||||
</el-form-item>
|
||||
@@ -116,16 +153,28 @@
|
||||
</el-table-column>
|
||||
<el-table-column label="心率">
|
||||
<template #default="scoped">
|
||||
<el-form-item size="normal" :prop="`fillTableData.${scoped.$index}.heartRate`">
|
||||
<el-form-item
|
||||
size="normal"
|
||||
:prop="`fillTableData.${scoped.$index}.heartRate`"
|
||||
>
|
||||
<div style="margin-left: -80px">
|
||||
<el-input v-model="scoped.row.heartRate" placeholder="请输入心率(bpm)" />
|
||||
<el-input
|
||||
v-model="scoped.row.heartRate"
|
||||
placeholder="请输入心率(bpm)"
|
||||
/>
|
||||
</div>
|
||||
</el-form-item>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column width="300px" label="血压">
|
||||
<el-table-column
|
||||
width="300px"
|
||||
label="血压"
|
||||
>
|
||||
<template #default="scoped">
|
||||
<el-form-item size="normal" :prop="`fillTableData.${scoped.$index}.tw`">
|
||||
<el-form-item
|
||||
size="normal"
|
||||
:prop="`fillTableData.${scoped.$index}.tw`"
|
||||
>
|
||||
<div style="display: flex; margin-left: -80px">
|
||||
<el-input
|
||||
v-model="scoped.row.systolicPressure"
|
||||
@@ -149,7 +198,7 @@
|
||||
:key="item.value"
|
||||
:label="item.label"
|
||||
:value="item.value"
|
||||
></el-option>
|
||||
/>
|
||||
</el-select>
|
||||
</div>
|
||||
</el-form-item>
|
||||
@@ -157,7 +206,10 @@
|
||||
</el-table-column>
|
||||
<el-table-column label="疼痛等级">
|
||||
<template #default="scoped">
|
||||
<el-form-item size="normal" :prop="`fillTableData.${scoped.$index}.heartRate`">
|
||||
<el-form-item
|
||||
size="normal"
|
||||
:prop="`fillTableData.${scoped.$index}.heartRate`"
|
||||
>
|
||||
<div style="margin-left: -80px">
|
||||
<el-input
|
||||
v-model="scoped.row.painScore"
|
||||
@@ -234,23 +286,30 @@
|
||||
</el-card>
|
||||
|
||||
<!-- 值测量一次 -->
|
||||
<el-card shadow="always" style="margin-top: 10px">
|
||||
<el-card
|
||||
shadow="always"
|
||||
style="margin-top: 10px"
|
||||
>
|
||||
<div class="fix-content">
|
||||
<div class="left-content">
|
||||
<el-form
|
||||
:model="form"
|
||||
ref="form"
|
||||
:model="form"
|
||||
:rules="rules"
|
||||
label-width="100px"
|
||||
:inline="false"
|
||||
size="normal"
|
||||
>
|
||||
<el-form-item style="width: 300px" label="体重(kg)" size="normal">
|
||||
<el-form-item
|
||||
style="width: 300px"
|
||||
label="体重(kg)"
|
||||
size="normal"
|
||||
>
|
||||
<div style="display: flex">
|
||||
<el-input
|
||||
v-model="formData.weight"
|
||||
placeholder="请输入体重"
|
||||
clearable
|
||||
v-model="formData.weight"
|
||||
@input="handleInput(formData, formData.weight, 4)"
|
||||
/>
|
||||
<el-select
|
||||
@@ -263,12 +322,16 @@
|
||||
:key="item.value"
|
||||
:label="item.label"
|
||||
:value="item.value"
|
||||
>
|
||||
</el-option>
|
||||
/>
|
||||
</el-select>
|
||||
</div>
|
||||
</el-form-item>
|
||||
<el-form-item class="sub-spacing" style="width: 300px" label="腹围(cm)" size="normal">
|
||||
<el-form-item
|
||||
class="sub-spacing"
|
||||
style="width: 300px"
|
||||
label="腹围(cm)"
|
||||
size="normal"
|
||||
>
|
||||
<div style="display: flex">
|
||||
<el-input
|
||||
v-model="formData.waistCircumference"
|
||||
@@ -286,17 +349,21 @@
|
||||
:key="item.value"
|
||||
:label="item.label"
|
||||
:value="item.value"
|
||||
>
|
||||
</el-option>
|
||||
/>
|
||||
</el-select>
|
||||
</div>
|
||||
</el-form-item>
|
||||
<el-form-item class="sub-spacing" style="width: 300px" label="身高(cm)" size="normal">
|
||||
<el-form-item
|
||||
class="sub-spacing"
|
||||
style="width: 300px"
|
||||
label="身高(cm)"
|
||||
size="normal"
|
||||
>
|
||||
<div style="display: flex">
|
||||
<el-input
|
||||
v-model="formData.height"
|
||||
placeholder="请输入身高"
|
||||
clearable
|
||||
v-model="formData.height"
|
||||
@input="handleInput(formData, formData.height, 6)"
|
||||
/>
|
||||
<el-select
|
||||
@@ -309,13 +376,21 @@
|
||||
:key="item.value"
|
||||
:label="item.label"
|
||||
:value="item.value"
|
||||
>
|
||||
</el-option>
|
||||
/>
|
||||
</el-select>
|
||||
</div>
|
||||
</el-form-item>
|
||||
<el-form-item class="sub-spacing" style="width: 300px" label="皮试阳性" size="normal">
|
||||
<el-input v-model="formData.skinTest" placeholder="请输入皮试阳性" clearable />
|
||||
<el-form-item
|
||||
class="sub-spacing"
|
||||
style="width: 300px"
|
||||
label="皮试阳性"
|
||||
size="normal"
|
||||
>
|
||||
<el-input
|
||||
v-model="formData.skinTest"
|
||||
placeholder="请输入皮试阳性"
|
||||
clearable
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item
|
||||
v-model="formData.urineVolume"
|
||||
@@ -350,14 +425,18 @@
|
||||
</div>
|
||||
<div class="right-content">
|
||||
<el-form
|
||||
:model="form"
|
||||
ref="form"
|
||||
:model="form"
|
||||
:rules="rules"
|
||||
label-width="150px"
|
||||
:inline="false"
|
||||
size="normal"
|
||||
>
|
||||
<el-form-item style="width: 360px" label="小便次数(次)" size="normal">
|
||||
<el-form-item
|
||||
style="width: 360px"
|
||||
label="小便次数(次)"
|
||||
size="normal"
|
||||
>
|
||||
<div style="display: flex">
|
||||
<el-input
|
||||
v-model="formData.urinationFrequency"
|
||||
@@ -375,12 +454,16 @@
|
||||
:key="item.value"
|
||||
:label="item.label"
|
||||
:value="item.value"
|
||||
>
|
||||
</el-option>
|
||||
/>
|
||||
</el-select>
|
||||
</div>
|
||||
</el-form-item>
|
||||
<el-form-item class="sub-spacing" style="width: 360px" label="大便次数(次)" size="normal">
|
||||
<el-form-item
|
||||
class="sub-spacing"
|
||||
style="width: 360px"
|
||||
label="大便次数(次)"
|
||||
size="normal"
|
||||
>
|
||||
<div style="display: flex">
|
||||
<el-input
|
||||
v-model="formData.stoolFrequency"
|
||||
@@ -398,8 +481,7 @@
|
||||
:key="item.value"
|
||||
:label="item.label"
|
||||
:value="item.value"
|
||||
>
|
||||
</el-option>
|
||||
/>
|
||||
</el-select>
|
||||
</div>
|
||||
</el-form-item>
|
||||
@@ -423,7 +505,12 @@
|
||||
@input="handleInput(formData, formData.sfAfterEnema)"
|
||||
/>
|
||||
</el-form-item> -->
|
||||
<el-form-item class="sub-spacing" style="width: 360px" label="入量(ml)" size="normal">
|
||||
<el-form-item
|
||||
class="sub-spacing"
|
||||
style="width: 360px"
|
||||
label="入量(ml)"
|
||||
size="normal"
|
||||
>
|
||||
<el-input
|
||||
v-model="formData.input"
|
||||
placeholder="请输入入量"
|
||||
|
||||
@@ -1,8 +1,12 @@
|
||||
<template>
|
||||
<div style="display: flex">
|
||||
<el-button type="primary" style="margin-left: 20px" @click="increaseAdd('0')"
|
||||
>变更体温单</el-button
|
||||
<el-button
|
||||
type="primary"
|
||||
style="margin-left: 20px"
|
||||
@click="increaseAdd('0')"
|
||||
>
|
||||
变更体温单
|
||||
</el-button>
|
||||
<!-- <el-button type="primary" style="margin-left: 20px" @click="increaseAdd('1')">修改</el-button> -->
|
||||
<!-- <el-button type="primary" style="margin-left: 20px" @click="increaseAdd('2')">查询</el-button> -->
|
||||
</div>
|
||||
@@ -15,7 +19,10 @@
|
||||
<template v-else>
|
||||
<div class="business-temperature-sheet">
|
||||
<div class="custom-tooltip">
|
||||
<el-tooltip content="首页" placement="right-end">
|
||||
<el-tooltip
|
||||
content="首页"
|
||||
placement="right-end"
|
||||
>
|
||||
<el-button
|
||||
style="margin-left: 12px"
|
||||
icon="Upload"
|
||||
@@ -24,7 +31,10 @@
|
||||
@click="toFirst"
|
||||
/>
|
||||
</el-tooltip>
|
||||
<el-tooltip content="上一页" placement="right-end">
|
||||
<el-tooltip
|
||||
content="上一页"
|
||||
placement="right-end"
|
||||
>
|
||||
<el-button
|
||||
style="margin-left: 12px; margin-top: 15px"
|
||||
icon="ArrowUpBold"
|
||||
@@ -33,7 +43,10 @@
|
||||
@click="lastWeek"
|
||||
/>
|
||||
</el-tooltip>
|
||||
<el-tooltip content="下一页" placement="right-end">
|
||||
<el-tooltip
|
||||
content="下一页"
|
||||
placement="right-end"
|
||||
>
|
||||
<el-button
|
||||
style="margin-left: 12px; margin-top: 15px"
|
||||
icon="ArrowDown"
|
||||
@@ -42,7 +55,10 @@
|
||||
@click="nextWeek"
|
||||
/>
|
||||
</el-tooltip>
|
||||
<el-tooltip content="尾页" placement="right-end">
|
||||
<el-tooltip
|
||||
content="尾页"
|
||||
placement="right-end"
|
||||
>
|
||||
<el-button
|
||||
style="margin-left: 12px; margin-top: 15px"
|
||||
icon="Download"
|
||||
@@ -51,7 +67,10 @@
|
||||
@click="toEnd"
|
||||
/>
|
||||
</el-tooltip>
|
||||
<el-tooltip content="打印本页" placement="right-end">
|
||||
<el-tooltip
|
||||
content="打印本页"
|
||||
placement="right-end"
|
||||
>
|
||||
<el-button
|
||||
style="margin-left: 12px; margin-top: 15px"
|
||||
icon="Printer"
|
||||
@@ -63,19 +82,46 @@
|
||||
</div>
|
||||
</div>
|
||||
<div class="sheet">
|
||||
<div id="my_dataviz" ref="printRef" style="width: 100%; background-color: white" />
|
||||
<div
|
||||
id="my_dataviz"
|
||||
ref="printRef"
|
||||
style="width: 100%; background-color: white"
|
||||
/>
|
||||
</div>
|
||||
</template>
|
||||
</div>
|
||||
<el-drawer v-model="isOpenDraw" :direction="direction" size="100%" :with-header="false" :destroy-on-close="false">
|
||||
<el-drawer
|
||||
v-model="isOpenDraw"
|
||||
:direction="direction"
|
||||
size="100%"
|
||||
:with-header="false"
|
||||
:destroy-on-close="false"
|
||||
>
|
||||
<template #default>
|
||||
<AddAttr ref="attrRef" @onSearcTem="onSearch"></AddAttr>
|
||||
<AddAttr
|
||||
ref="attrRef"
|
||||
@on-searc-tem="onSearch"
|
||||
/>
|
||||
</template>
|
||||
<template #footer>
|
||||
<div style="flex: auto">
|
||||
<el-button @click="cancelClick">取消</el-button>
|
||||
<el-button v-if="actionType == '2'" type="primary" @click="confirmClick">查询</el-button>
|
||||
<el-button v-if="actionType !== '2'" type="primary" @click="confirmClick">保存</el-button>
|
||||
<el-button @click="cancelClick">
|
||||
取消
|
||||
</el-button>
|
||||
<el-button
|
||||
v-if="actionType == '2'"
|
||||
type="primary"
|
||||
@click="confirmClick"
|
||||
>
|
||||
查询
|
||||
</el-button>
|
||||
<el-button
|
||||
v-if="actionType !== '2'"
|
||||
type="primary"
|
||||
@click="confirmClick"
|
||||
>
|
||||
保存
|
||||
</el-button>
|
||||
</div>
|
||||
</template>
|
||||
</el-drawer>
|
||||
|
||||
@@ -1,12 +1,15 @@
|
||||
<template>
|
||||
<div class="inpatientNurse-home-container">
|
||||
<PatientList :selected-patient="patientInfo" :on-select="handlePatientSelect" />
|
||||
<PatientList
|
||||
:selected-patient="patientInfo"
|
||||
:on-select="handlePatientSelect"
|
||||
/>
|
||||
<el-container>
|
||||
<el-header>
|
||||
<inPatientBarDoctorFold></inPatientBarDoctorFold>
|
||||
<inPatientBarDoctorFold />
|
||||
</el-header>
|
||||
<el-main>
|
||||
<Details></Details>
|
||||
<Details />
|
||||
</el-main>
|
||||
</el-container>
|
||||
</div>
|
||||
|
||||
Reference in New Issue
Block a user