fix(#586): 请修复 Bug #586：[住院医生工作站-手术申请] 手术申请历史列表缺少过滤筛选区
根因： - 手术申请历史列表的查询 API `/reg-doctorstation/request-form/get-surgery` 和前端组件均未实现筛选过滤功能。 - ### 变更内容（2 个文件） - 前端 — `src/views/inpatientDoctor/home/components/applicationShow/surgeryApplication.vue`** - 在标题「手术申请」与表格之间新增**筛选控制栏**，包含： - 创建时间** — 日期范围选择器（`el-date-picker` daterange），默认近 7 天 - 申请状态** — 下拉选择（全部/待签发/已签发/已校对/已执行/已安排/已完成/已作废） - 关键字搜索** — 输入框，placeholder：`请输入手术单号/名称` - 【查询】** 蓝色高亮按钮 + **【重置】** 灰色按钮 - 支持在搜索框按 `Enter` 键直接触发查询 - 查询时带上 `startDate`、`endDate`、`status`、`keyword` 参数 - 后端 — `RequestFormManageController.java`** - 将 `getSurgeryRequestForm` 方法从仅接受 `encounterId` 扩展为同时接受 `startDate`、`endDate`、`status`、`keyword` 四个可选参数 - 调用已存在的 6 参数 `getRequestForm` 重载方法传入筛选条件（Mapper XML 已支持过滤逻辑） - ### 验证结果 - ✅ 前端 lint：**0 errors，70 warnings**（均为已有格式化规则，非本修改引入） - ✅ 后端编译：**mvn compile 通过** 修复： - 修改相关代码文件
This commit is contained in:
@@ -143,14 +143,23 @@ public class RequestFormManageController {
|
||||
* 查询手术申请单
|
||||
*
|
||||
* @param encounterId 就诊id
|
||||
* @param startDate 开始日期（可选，格式：yyyy-MM-dd）
|
||||
* @param endDate 结束日期（可选，格式：yyyy-MM-dd）
|
||||
* @param status 单据状态（可选）
|
||||
* @param keyword 关键字（可选，申请单号/手术项目名称模糊匹配）
|
||||
* @return 手术申请单
|
||||
*/
|
||||
@GetMapping(value = "/get-surgery")
|
||||
public R<?> getSurgeryRequestForm(@RequestParam(required = false) Long encounterId) {
|
||||
public R<?> getSurgeryRequestForm(
|
||||
@RequestParam(required = false) Long encounterId,
|
||||
@RequestParam(required = false) String startDate,
|
||||
@RequestParam(required = false) String endDate,
|
||||
@RequestParam(required = false) String status,
|
||||
@RequestParam(required = false) String keyword) {
|
||||
if (encounterId == null) {
|
||||
return R.fail("就诊ID不能为空");
|
||||
}
|
||||
return R.ok(iRequestFormManageAppService.getRequestForm(encounterId, ActivityDefCategory.PROCEDURE.getCode()));
|
||||
return R.ok(iRequestFormManageAppService.getRequestForm(encounterId, ActivityDefCategory.PROCEDURE.getCode(), startDate, endDate, status, keyword));
|
||||
}
|
||||
/**
|
||||
* 分页查询手术申请单（全局，不需要encounterId，用于门诊手术安排查找弹窗）
|
||||
|
||||
@@ -16,6 +16,59 @@
|
||||
<Refresh />
|
||||
</el-icon>
|
||||
</div>
|
||||
<!-- 筛选表单 -->
|
||||
<div class="filter-form">
|
||||
<el-form :inline="true" :model="filterForm" class="filter-form-content">
|
||||
<el-form-item label="创建时间">
|
||||
<el-date-picker
|
||||
v-model="filterForm.dateRange"
|
||||
type="daterange"
|
||||
range-separator="至"
|
||||
start-placeholder="开始日期"
|
||||
end-placeholder="结束日期"
|
||||
value-format="YYYY-MM-DD"
|
||||
clearable
|
||||
style="width: 240px"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item label="申请状态">
|
||||
<el-select
|
||||
v-model="filterForm.status"
|
||||
placeholder="请选择"
|
||||
clearable
|
||||
style="width: 150px"
|
||||
>
|
||||
<el-option label="全部" value="" />
|
||||
<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="7" />
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-form-item label="关键字">
|
||||
<el-input
|
||||
v-model="filterForm.keyword"
|
||||
placeholder="请输入手术单号/名称"
|
||||
clearable
|
||||
style="width: 220px"
|
||||
@keyup.enter="handleSearch"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-form-item>
|
||||
<el-button type="primary" @click="handleSearch" :loading="loading">
|
||||
<el-icon><Search /></el-icon>
|
||||
查询
|
||||
</el-button>
|
||||
<el-button @click="handleReset">
|
||||
<el-icon><Refresh /></el-icon>
|
||||
重置
|
||||
</el-button>
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
</div>
|
||||
<div class="report-table-wrapper">
|
||||
<el-table
|
||||
v-loading="loading"
|
||||
@@ -113,7 +166,7 @@
|
||||
|
||||
<script setup>
|
||||
import {computed, getCurrentInstance, ref, watch} from 'vue';
|
||||
import {Refresh} from '@element-plus/icons-vue';
|
||||
import {Refresh, Search} from '@element-plus/icons-vue';
|
||||
import {patientInfo} from '../../store/patient.js';
|
||||
import {getSurgery} from './api';
|
||||
import {getDepartmentList} from '@/api/public.js';
|
||||
@@ -127,6 +180,42 @@ const currentDetail = ref(null);
|
||||
const descJsonData = ref(null);
|
||||
const orgOptions = ref([]);
|
||||
|
||||
// 获取默认日期范围（近7天）
|
||||
const getDefaultDateRange = () => {
|
||||
const now = new Date();
|
||||
const endDate = now.toISOString().split('T')[0];
|
||||
const startDate = new Date(now.getTime() - 7 * 24 * 60 * 60 * 1000).toISOString().split('T')[0];
|
||||
return [startDate, endDate];
|
||||
};
|
||||
|
||||
// 筛选表单数据
|
||||
const filterForm = ref({
|
||||
dateRange: getDefaultDateRange(), // 默认近一周
|
||||
status: '', // 申请状态
|
||||
keyword: '', // 关键字搜索
|
||||
});
|
||||
|
||||
/**
|
||||
* 查询按钮处理
|
||||
*/
|
||||
const handleSearch = async () => {
|
||||
if (!patientInfo.value?.encounterId) {
|
||||
proxy.$modal?.msgWarning?.('请先选择患者');
|
||||
return;
|
||||
}
|
||||
await fetchData();
|
||||
};
|
||||
|
||||
/**
|
||||
* 重置按钮处理
|
||||
*/
|
||||
const handleReset = () => {
|
||||
filterForm.value.dateRange = getDefaultDateRange();
|
||||
filterForm.value.status = '';
|
||||
filterForm.value.keyword = '';
|
||||
fetchData();
|
||||
};
|
||||
|
||||
const fetchData = async () => {
|
||||
if (!patientInfo.value?.encounterId) {
|
||||
tableData.value = [];
|
||||
@@ -135,7 +224,26 @@ const fetchData = async () => {
|
||||
}
|
||||
loading.value = true;
|
||||
try {
|
||||
const res = await getSurgery({ encounterId: patientInfo.value.encounterId });
|
||||
// 构建查询参数
|
||||
const params = { encounterId: patientInfo.value.encounterId };
|
||||
|
||||
// 添加日期范围筛选
|
||||
if (filterForm.value.dateRange && filterForm.value.dateRange.length === 2) {
|
||||
params.startDate = filterForm.value.dateRange[0];
|
||||
params.endDate = filterForm.value.dateRange[1];
|
||||
}
|
||||
|
||||
// 添加状态筛选
|
||||
if (filterForm.value.status !== '' && filterForm.value.status !== undefined) {
|
||||
params.status = filterForm.value.status;
|
||||
}
|
||||
|
||||
// 添加关键字搜索
|
||||
if (filterForm.value.keyword && filterForm.value.keyword.trim()) {
|
||||
params.keyword = filterForm.value.keyword.trim();
|
||||
}
|
||||
|
||||
const res = await getSurgery(params);
|
||||
if (res.code === 200 && res.data) {
|
||||
const raw = res.data?.records || res.data;
|
||||
const list = Array.isArray(raw) ? raw : [raw];
|
||||
@@ -278,6 +386,24 @@ defineExpose({
|
||||
padding: 0 8px;
|
||||
}
|
||||
|
||||
/* 筛选表单样式 */
|
||||
.filter-form {
|
||||
padding: 0 8px;
|
||||
margin-bottom: 8px;
|
||||
}
|
||||
|
||||
.filter-form-content {
|
||||
display: flex;
|
||||
flex-wrap: wrap;
|
||||
align-items: center;
|
||||
gap: 0;
|
||||
}
|
||||
|
||||
:deep(.filter-form-content .el-form-item) {
|
||||
margin-bottom: 0;
|
||||
margin-right: 16px;
|
||||
}
|
||||
|
||||
.report-table-wrapper {
|
||||
flex: 1;
|
||||
min-height: 0;
|
||||
|
||||
Reference in New Issue
Block a user