wangyizhe/his
1
3
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Fix Bug #519: [门诊医生站-诊断-报卡] 已完成传染病报卡的诊断在再次点保存时重复弹出报卡界面

Browse Source 
根因：handleInfectiousDiseaseReport() 仅根据诊断名称匹配传染病，未校验该诊断是否已有已提交的报卡记录。

修复方案：
1. 后端 DiagnosisQueryDto 新增 hasInfectiousReport 字段
2. getEncounterDiagnosis SQL 通过 EXISTS 子查询关联 infectious_card 表，
   判断是否存在 status >= 1（已提交/已审核/已上报）的报卡记录
3. 前端 handleInfectiousDiseaseReport() 过滤掉 hasInfectiousReport === 1 的诊断，不再弹出报卡

Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
This commit is contained in:
关羽
2026-05-14 16:15:51 +08:00
parent f563713743
commit 0daf71f07a
3 changed files with 16 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/dto/DiagnosisQueryDto.java
View File

@@ -96,4 +96,9 @@ public class DiagnosisQueryDto {
*/ */
private String diagnosisDoctor; private String diagnosisDoctor;
/**
* 是否已有传染病报卡（0-无，1-有）
*/
private Integer hasInfectiousReport;
} }

6
openhis-server-new/openhis-application/src/main/resources/mapper/doctorstation/DoctorStationDiagnosisAppMapper.xml
View File

@@ -134,7 +134,11 @@
T2.yb_no, T2.yb_no,
T1.onset_date AS onsetDate, T1.onset_date AS onsetDate,
T1.diagnosis_time AS diagnosisTime, T1.diagnosis_time AS diagnosisTime,
T1.doctor AS diagnosisDoctor T1.doctor AS diagnosisDoctor,
CASE WHEN EXISTS (
SELECT 1 FROM infectious_card T4
WHERE T4.diag_id = T2.id AND T4.delete_flag = '0' AND T4.status >= 1
) THEN 1 ELSE 0 END AS hasInfectiousReport
FROM adm_encounter_diagnosis AS T1 FROM adm_encounter_diagnosis AS T1
LEFT JOIN cli_condition AS T2 ON T2.ID = T1.condition_id LEFT JOIN cli_condition AS T2 ON T2.ID = T1.condition_id
AND T2.delete_flag = '0' AND T2.tcm_flag = 0 AND T2.delete_flag = '0' AND T2.tcm_flag = 0

10
openhis-ui-vue3/src/views/doctorstation/components/diagnosis/diagnosis.vue
View File

@@ -692,6 +692,7 @@ async function handleFoodDiseasesCheck() {
/** /**
* 传染病报告卡处理 * 传染病报告卡处理
* 通过诊断名称自动识别并勾选传染病报告卡中的疾病 * 通过诊断名称自动识别并勾选传染病报告卡中的疾病
* 修复 Bug #519：跳过已有已提交报卡的诊断
*/ */
function handleInfectiousDiseaseReport() { function handleInfectiousDiseaseReport() {
// 疾病名称到报卡编码的映射（根据传染病报告卡弹窗中的疾病列表） // 疾病名称到报卡编码的映射（根据传染病报告卡弹窗中的疾病列表）
@@ -743,8 +744,9 @@ function handleInfectiousDiseaseReport() {
'手足口病': '0311', '手足口病': '0311',
}; };
// 获取所有诊断名称对应的报卡编码 // 获取所有诊断名称对应的报卡编码，但跳过已有已提交报卡的诊断
const allSelectedDiseases = form.value.diagnosisList const allSelectedDiseases = form.value.diagnosisList
.filter(d => d.name && d.hasInfectiousReport !== 1)
.map(d => diseaseNameToCode[d.name] || null) .map(d => diseaseNameToCode[d.name] || null)
.filter(code => code); .filter(code => code);
@@ -752,9 +754,9 @@ function handleInfectiousDiseaseReport() {
return; return;
} }
// 优先使用主诊断 // 优先使用主诊断（同样跳过已有报卡的）
const mainDiagnosis = form.value.diagnosisList.find(d => d.maindiseFlag === 1); const mainDiagnosis = form.value.diagnosisList.find(d => d.maindiseFlag === 1 && d.hasInfectiousReport !== 1);
const firstDiagnosis = form.value.diagnosisList[0]; const firstDiagnosis = form.value.diagnosisList.find(d => d.hasInfectiousReport !== 1) || form.value.diagnosisList[0];
const diagnosisToShow = { const diagnosisToShow = {
...(mainDiagnosis || firstDiagnosis), ...(mainDiagnosis || firstDiagnosis),