fix(doctorstation): 解决医嘱开具和报告查询中的问题
- 修复医嘱开具时诊断验证警告显示逻辑,支持可选的警告提示 - 修复中医医嘱库存检查条件判断逻辑 - 修复中医医嘱表单验证后数据处理逻辑,添加剂量单位字典值设置 - 优化报告查询处理,独立处理检查和检验报告查询,避免相互影响 - 修复LIS和PACS报告地址配置缺失时的处理逻辑,改为警告而非异常抛出
This commit is contained in:
@@ -1106,7 +1106,7 @@ onMounted(() => {
|
||||
document.addEventListener('keydown', escKeyListener);
|
||||
// 初始化时自动创建第一个西药处方
|
||||
if (westernPrescriptions.value.length === 0) {
|
||||
handleAddPrescription();
|
||||
handleAddPrescription(null, false);
|
||||
}
|
||||
});
|
||||
|
||||
@@ -1531,7 +1531,7 @@ function getListInfo(addNewRow) {
|
||||
});
|
||||
getGroupMarkers(); // 更新标记
|
||||
if (props.activeTab == 'prescription' && addNewRow) {
|
||||
handleAddPrescription();
|
||||
handleAddPrescription(null, false);
|
||||
}
|
||||
|
||||
// 在所有异步操作完成后 resolve Promise
|
||||
@@ -1595,14 +1595,16 @@ function handleSelectionChange(selection, row) {
|
||||
}
|
||||
|
||||
// 新增医嘱
|
||||
function handleAddPrescription(prescriptionId) {
|
||||
function handleAddPrescription(prescriptionId, showWarning = true) {
|
||||
// 如果传入了处方ID,先切换到该处方
|
||||
if (prescriptionId && prescriptionId !== currentPrescriptionId.value) {
|
||||
switchToActivePrescription(prescriptionId);
|
||||
}
|
||||
|
||||
if (diagnosisList.value.length == 0) {
|
||||
proxy.$modal.msgWarning('请先保存诊断后再开立医嘱');
|
||||
if (showWarning) {
|
||||
proxy.$modal.msgWarning('请先保存诊断后再开立医嘱');
|
||||
}
|
||||
return;
|
||||
}
|
||||
if (isAdding.value) {
|
||||
@@ -2291,7 +2293,7 @@ function handleSaveSign(row, index, prescriptionId) {
|
||||
});
|
||||
} else {
|
||||
if (prescriptionList.value[0].adviceName) {
|
||||
handleAddPrescription();
|
||||
handleAddPrescription(null, false);
|
||||
}
|
||||
}
|
||||
adviceQueryParams.value.adviceType = undefined;
|
||||
|
||||
Reference in New Issue
Block a user