fix(infusion): 修复输液记录功能中的参数传递和服务状态查询问题
- 修改前端API调用,将encounterId作为params对象传递而非直接参数 - 移除表格行样式设置功能并调整相关代码结构 - 更新服务状态默认值从10改为3(已完成状态) - 修复后端查询逻辑,当serviceStatus为null时不添加状态过滤条件 - 调整控制器参数注解,使serviceStatus和serviceReqId参数可选 - 在门诊输液应用服务实现中优化查询条件构建逻辑 - 更新Mapper XML文件,添加输液标志过滤条件 - 优化费用管理服务中的诊断ID列表处理,过滤空值并去重
This commit is contained in:
@@ -1,11 +1,11 @@
|
||||
import request from '@/utils/request'
|
||||
|
||||
// 待执行输液记录查询
|
||||
export function listInfusionRecord(encounterId) {
|
||||
export function listInfusionRecord(params) {
|
||||
return request({
|
||||
url: '/outpatient-manage/infusion/infusion-pending-record',
|
||||
method: 'get',
|
||||
params: encounterId
|
||||
params: params
|
||||
})
|
||||
}
|
||||
// 病人列表
|
||||
|
||||
@@ -85,7 +85,6 @@
|
||||
highlight-current-row
|
||||
border
|
||||
style="width: 100%; height: 300px"
|
||||
:row-style="rowStyle"
|
||||
@selection-change="handleSelectionChange"
|
||||
@row-click="handleRowClick"
|
||||
ref="tableRef"
|
||||
@@ -211,7 +210,7 @@ const data = reactive({
|
||||
pageNo: 1,
|
||||
pageSize: 10,
|
||||
searchKey: undefined,
|
||||
serviceStatus: 10,
|
||||
serviceStatus: 3, // 默认值为已完成 (对应 RequestStatus.COMPLETED)
|
||||
},
|
||||
});
|
||||
const { queryParams } = toRefs(data);
|
||||
@@ -460,15 +459,12 @@ function clearSelections() {
|
||||
historyRecordsList.value = response.data;
|
||||
});
|
||||
}
|
||||
// function rowStyle({ row }) {
|
||||
// const colorIndex = row.groupId % 2; // 奇偶性决定颜色索引
|
||||
// return { backgroundColor: groupColors[colorIndex] };
|
||||
// }
|
||||
|
||||
function handleCurrentChange(row) {
|
||||
currentRow.value = row; // 更新当前选中行的数据
|
||||
console.log(row, '123123');
|
||||
listInfusionRecord({ encounterId: row.encounterId, serviceStatus: row.serviceStatus }).then(
|
||||
// 加载院注医嘱(待执行记录)- 不传 serviceStatus 查询所有状态
|
||||
listInfusionRecord({ encounterId: row.encounterId, serviceStatus: null }).then(
|
||||
(response) => {
|
||||
encounterId.value = row.encounterId;
|
||||
console.log('Full response1:', response);
|
||||
@@ -484,12 +480,24 @@ function handleCurrentChange(row) {
|
||||
const groupCounts = countGroupRows(infusionList.value);
|
||||
// 设置每行的标记
|
||||
markers.value = getRowMarkers(groupCounts, infusionList.value);
|
||||
// 加载第一条记录的执行历史
|
||||
if (infusionList.value.length > 0) {
|
||||
listPatientInfusionPerformRecord({ serviceReqId: infusionList.value[0].serviceId }).then((res) => {
|
||||
historyRecordsList.value =
|
||||
res.data.records.length > 0
|
||||
? res.data.records.map((item) => {
|
||||
return {
|
||||
...item,
|
||||
isEdit: true,
|
||||
};
|
||||
})
|
||||
: [];
|
||||
});
|
||||
} else {
|
||||
historyRecordsList.value = [];
|
||||
}
|
||||
}
|
||||
);
|
||||
historyRecordsList.value = [];
|
||||
// listPatientInfusionPerformRecord(currentRow.value.patientId).then((response) => {
|
||||
// historyRecordsList.value = response.data;
|
||||
// });
|
||||
}
|
||||
|
||||
function handleOccurrenceTimeChange(value, row) {
|
||||
|
||||
Reference in New Issue
Block a user