Compare commits
1 Commits
develop
...
赵云-bug508-
| Author | SHA1 | Date | |
|---|---|---|---|
|
5f7288e5f8 |
@@ -178,7 +178,7 @@ public class AdviceProcessAppServiceImpl implements IAdviceProcessAppService {
|
||||
inpatientAdviceParam.setEncounterIds(null);
|
||||
Integer exeStatus = inpatientAdviceParam.getExeStatus();
|
||||
inpatientAdviceParam.setExeStatus(null);
|
||||
Integer requestStatus = inpatientAdviceParam.getRequestStatus();
|
||||
// requestStatus由前端tab控制，后端SQL已通过CASE条件处理校对状态过滤，无需再作为SQL条件
|
||||
inpatientAdviceParam.setRequestStatus(null);
|
||||
// 构建查询条件
|
||||
QueryWrapper<InpatientAdviceParam> queryWrapper
|
||||
@@ -198,7 +198,7 @@ public class AdviceProcessAppServiceImpl implements IAdviceProcessAppService {
|
||||
ParticipantType.ADMITTING_DOCTOR.getCode(), AccountType.PERSONAL_CASH_ACCOUNT.getCode(),
|
||||
ChargeItemStatus.BILLABLE.getValue(), ChargeItemStatus.BILLED.getValue(),
|
||||
ChargeItemStatus.REFUNDED.getValue(), EncounterClass.IMP.getValue(),
|
||||
GenerateSource.DOCTOR_PRESCRIPTION.getValue(), requestStatus);
|
||||
GenerateSource.DOCTOR_PRESCRIPTION.getValue());
|
||||
inpatientAdvicePage.getRecords().forEach(e -> {
|
||||
// 是否皮试
|
||||
e.setSkinTestFlag_enumText(EnumUtils.getInfoByValue(Whether.class, e.getSkinTestFlag()));
|
||||
|
||||
@@ -69,6 +69,5 @@ public interface AdviceProcessAppMapper {
|
||||
@Param("active") Integer active, @Param("bed") Integer bed, @Param("admittingDoctor") String admittingDoctor,
|
||||
@Param("personalCashAccount") String personalCashAccount, @Param("billable") Integer billable,
|
||||
@Param("billed") Integer billed, @Param("refunded") Integer refunded, @Param("imp") Integer imp,
|
||||
@Param("doctorPrescription") Integer doctorPrescription,
|
||||
@Param("requestStatus") Integer requestStatus);
|
||||
@Param("doctorPrescription") Integer doctorPrescription);
|
||||
}
|
||||
|
||||
@@ -290,7 +290,6 @@
|
||||
WHERE T1.delete_flag = '0'
|
||||
AND T1.refund_medicine_id IS NULL
|
||||
AND T1.generate_source_enum = #{doctorPrescription}
|
||||
AND T1.status_enum = #{requestStatus}
|
||||
AND CASE WHEN T1.status_enum = #{draft}
|
||||
THEN T1.performer_check_id IS NOT NULL
|
||||
ELSE 1=1 END
|
||||
@@ -423,7 +422,6 @@
|
||||
AND af.delete_flag = '0'
|
||||
WHERE T1.delete_flag = '0'
|
||||
AND T1.generate_source_enum = #{doctorPrescription}
|
||||
AND T1.status_enum = #{requestStatus}
|
||||
AND CASE WHEN T1.status_enum = #{draft}
|
||||
THEN T1.performer_check_id IS NOT NULL
|
||||
ELSE 1=1 END
|
||||
|
||||
@@ -61,14 +61,15 @@
|
||||
GROUP BY drf.id, drf.encounter_id, drf.prescription_no, drf.name, drf.desc_json,
|
||||
drf.requester_id, drf.create_time, ap.name
|
||||
<if test="status != null and status != ''">
|
||||
HAVING CASE
|
||||
WHEN MIN(wsr.status_enum) = 1 THEN 0
|
||||
WHEN MIN(wsr.status_enum) = 2 THEN 1
|
||||
WHEN MIN(wsr.status_enum) = 3 AND MAX(CASE WHEN wsr.performer_check_id IS NOT NULL THEN 1 ELSE 0 END) = 1 THEN 2
|
||||
WHEN MIN(wsr.status_enum) = 3 THEN 4
|
||||
WHEN MIN(wsr.status_enum) = 4 THEN 3
|
||||
WHEN MIN(wsr.status_enum) = 5 OR MIN(wsr.status_enum) = 6 OR MIN(wsr.status_enum) = 7 THEN 7
|
||||
WHEN MIN(wsr.status_enum) = 8 THEN 6
|
||||
HAVING CASE MIN(wsr.status_enum)
|
||||
WHEN 1 THEN 0
|
||||
WHEN 2 THEN 1
|
||||
WHEN 3 THEN 4
|
||||
WHEN 4 THEN 4
|
||||
WHEN 5 THEN 5
|
||||
WHEN 6 THEN 5
|
||||
WHEN 7 THEN 5
|
||||
WHEN 8 THEN 6
|
||||
ELSE NULL
|
||||
END = #{status}::integer
|
||||
</if>
|
||||
|
||||
@@ -1141,9 +1141,7 @@ function submitForm() {
|
||||
// 保存麻醉方式
|
||||
sessionStorage.setItem('anesthesiaType', form.value.anesthesiaTypeEnum)
|
||||
open.value = false
|
||||
// 子组件自身主动刷新列表（立即），确保数据展示不依赖父组件事件
|
||||
getList()
|
||||
// 通知父组件刷新医嘱列表（父组件也会带延迟再次刷新手术列表作为兜底）
|
||||
// 由父组件 @saved 事件负责刷新列表（带延迟确保后端事务已提交）
|
||||
emit('saved')
|
||||
} else {
|
||||
proxy.$modal.msgError(res.msg || '新增手术失败，请检查表单信息')
|
||||
@@ -1160,8 +1158,6 @@ function submitForm() {
|
||||
// 保存麻醉方式
|
||||
sessionStorage.setItem('anesthesiaType', form.value.anesthesiaTypeEnum)
|
||||
open.value = false
|
||||
// 子组件自身主动刷新列表（立即）
|
||||
getList()
|
||||
// 由父组件 @saved 事件负责刷新列表
|
||||
emit('saved')
|
||||
} else {
|
||||
|
||||
@@ -93,6 +93,7 @@
|
||||
</el-table-column>
|
||||
<el-table-column prop="createTime" label="创建时间" width="160" />
|
||||
<el-table-column prop="prescriptionNo" label="申请单号" width="140" />
|
||||
<el-table-column prop="requesterId_dictText" label="申请者" width="120" />
|
||||
<el-table-column label="申请单状态" width="120" align="center">
|
||||
<template #default="scope">
|
||||
<el-tag :type="getStatusTagType(scope.row.status)" effect="plain" round>
|
||||
@@ -100,7 +101,6 @@
|
||||
</el-tag>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column prop="requesterId_dictText" label="申请者" width="120" />
|
||||
<el-table-column label="操作" width="280" align="center" fixed="right">
|
||||
<template #default="scope">
|
||||
<!-- 详情 - 所有状态都显示 -->
|
||||
|
||||
@@ -863,22 +863,13 @@ function clickRowDb(row, column, event) {
|
||||
}
|
||||
row.showPopover = false;
|
||||
// 仅”待签发(statusEnum==1)”允许编辑；”已签发(statusEnum==2)”及之后状态不允许编辑
|
||||
// 使用 Number() 做类型转换，确保后端返回的数值能正确比较
|
||||
if (Number(row.statusEnum) === 1) {
|
||||
if (row.statusEnum == 1) {
|
||||
// 确保治疗类型为字符串，方便与单选框 label 对齐，默认为长期医嘱('1')
|
||||
row.therapyEnum = String(row.therapyEnum ?? '1');
|
||||
row.isEdit = true;
|
||||
const index = prescriptionList.value.findIndex((item) => item.uniqueKey === row.uniqueKey);
|
||||
if (index !== -1) {
|
||||
prescriptionList.value.splice(index, 1, row);
|
||||
// 使用 nextTick 确保数据更新后再设置展开状态，保证 el-table 能正确识别 row-key
|
||||
nextTick(() => {
|
||||
expandOrder.value = [row.uniqueKey];
|
||||
});
|
||||
} else {
|
||||
console.warn('⚠️ clickRowDb 未找到匹配行: uniqueKey=', row.uniqueKey, ', row=', row);
|
||||
proxy.$modal.msgWarning('无法进入编辑模式，请刷新列表后重试');
|
||||
}
|
||||
prescriptionList.value[index] = row;
|
||||
expandOrder.value = [row.uniqueKey];
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -521,28 +521,31 @@ watch(
|
||||
}
|
||||
);
|
||||
|
||||
// 加载科室选项（递归扁平化树形结构）
|
||||
// 加载科室选项（支持树形/扁平两种数据结构）
|
||||
function loadDepartmentOptions() {
|
||||
getOrgList()
|
||||
.then((res) => {
|
||||
if (!res?.data?.records?.length) {
|
||||
departmentOptions.value = [];
|
||||
return;
|
||||
}
|
||||
// 递归扁平化树形结构，提取所有科室节点
|
||||
const flattenTree = (nodes) => {
|
||||
const result = [];
|
||||
for (const node of nodes) {
|
||||
if (node?.id && node?.name) {
|
||||
result.push(node);
|
||||
if (res.data) {
|
||||
// 尝试从树形结构中取：records[0].children
|
||||
if (res.data.records && res.data.records.length > 0) {
|
||||
if (res.data.records[0].children && res.data.records[0].children.length > 0) {
|
||||
departmentOptions.value = res.data.records[0].children;
|
||||
return;
|
||||
}
|
||||
if (node?.children?.length) {
|
||||
result.push(...flattenTree(node.children));
|
||||
// 如果 records[0] 有 id 和 name（非树根节点），直接用所有 records
|
||||
if (res.data.records[0].id) {
|
||||
departmentOptions.value = res.data.records;
|
||||
return;
|
||||
}
|
||||
}
|
||||
return result;
|
||||
};
|
||||
departmentOptions.value = flattenTree(res.data.records);
|
||||
// 兜底：如果 records 不存在或为空，尝试直接使用 data 本身
|
||||
if (Array.isArray(res.data)) {
|
||||
departmentOptions.value = res.data;
|
||||
return;
|
||||
}
|
||||
}
|
||||
// 所有方式都失败，置空
|
||||
departmentOptions.value = [];
|
||||
})
|
||||
.catch(() => {
|
||||
console.warn('科室列表加载失败（可能无权限）');
|
||||
@@ -608,13 +611,13 @@ function getUnitCodeOptions(row) {
|
||||
const unitCodes = [];
|
||||
// 大单位：优先用 code，code 缺失时用字典文本兜底
|
||||
if (row.unitCode != null && String(row.unitCode) !== '') {
|
||||
unitCodes.push({ code: String(row.unitCode), codeText: row.unitCode_dictText || String(row.unitCode) });
|
||||
unitCodes.push({ code: String(row.unitCode), codeText: row.unitCode_dictText });
|
||||
} else if (row.unitCode_dictText) {
|
||||
unitCodes.push({ code: row.unitCode_dictText, codeText: row.unitCode_dictText });
|
||||
}
|
||||
// 小单位：同上
|
||||
if (row.minUnitCode != null && String(row.minUnitCode) !== '') {
|
||||
unitCodes.push({ code: String(row.minUnitCode), codeText: row.minUnitCode_dictText || String(row.minUnitCode) });
|
||||
unitCodes.push({ code: String(row.minUnitCode), codeText: row.minUnitCode_dictText });
|
||||
} else if (row.minUnitCode_dictText) {
|
||||
unitCodes.push({ code: row.minUnitCode_dictText, codeText: row.minUnitCode_dictText });
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user