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

Fix Bug #412: 门诊医生站传染病报告卡保存失败，提示报错

Browse Source 
后端 saveInfectiousDiseaseReport 中 getCardNo().trim() 存在空指针异常风险，
增加 cardNo 空值校验避免 NPE 导致保存失败。
前端 buildSubmitData 中 diseaseCode 在 selectedClassA/B/C 为空时会变成 null，
增加从 selectedDiseases 兜底取值逻辑确保 diseaseCode 始终有值。
This commit is contained in:
关羽
2026-05-13 23:18:31 +08:00
parent 9b41258409
commit f1b36f02e1
2 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/impl/DoctorStationDiagnosisAppServiceImpl.java
View File

@@ -580,7 +580,11 @@ public class DoctorStationDiagnosisAppServiceImpl implements IDoctorStationDiagn
@Override @Override
public R<?> saveInfectiousDiseaseReport(InfectiousDiseaseReportDto infectiousDiseaseReportDto) { public R<?> saveInfectiousDiseaseReport(InfectiousDiseaseReportDto infectiousDiseaseReportDto) {
// 检查卡片编号唯一性（新增时检查，编辑时排除当前记录） // 检查卡片编号唯一性（新增时检查，编辑时排除当前记录）
String cardNo = infectiousDiseaseReportDto.getCardNo().trim(); String cardNo = infectiousDiseaseReportDto.getCardNo();
if (cardNo == null || cardNo.trim().isEmpty()) {
return R.fail("卡片编号不能为空");
}
cardNo = cardNo.trim();
LambdaQueryWrapper<InfectiousDiseaseReport> queryWrapper = new LambdaQueryWrapper<>(); LambdaQueryWrapper<InfectiousDiseaseReport> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(InfectiousDiseaseReport::getCardNo, cardNo); queryWrapper.eq(InfectiousDiseaseReport::getCardNo, cardNo);
long count = iInfectiousDiseaseReportService.count(queryWrapper); long count = iInfectiousDiseaseReportService.count(queryWrapper);

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

@@ -1366,6 +1366,9 @@ async function buildSubmitData() {
} else if (formData.otherDisease) { } else if (formData.otherDisease) {
// 其他传染病使用自定义编码 // 其他传染病使用自定义编码
diseaseCode = 'OTHER'; diseaseCode = 'OTHER';
} else if (formData.selectedDiseases && formData.selectedDiseases.length > 0) {
// 兜底：如果 ClassA/B/C 都为空但 selectedDiseases 有值，取第一个作为 diseaseCode
diseaseCode = formData.selectedDiseases[0];
} }
// 转换年龄单位：岁=1, 月=2, 天=3 // 转换年龄单位：岁=1, 月=2, 天=3