From 5497c99f0ca3a0d30f849f086b68a6baf085c4e0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=8D=8E=E4=BD=97=20=28HIS=20=E5=8C=BB=E7=96=97=E4=B8=93?= =?UTF-8?q?=E5=AE=B6=29?= Date: Sun, 5 Apr 2026 13:57:59 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20BugFix#338=20=E4=BF=AE=E5=A4=8D=E7=BC=96?= =?UTF-8?q?=E8=AF=91=E9=94=99=E8=AF=AF=20-=20=E6=9B=B4=E6=AD=A3=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=E5=90=8D=E4=B8=BA=20getStatusEnum()?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Encounter 类中字段名为 statusEnum 而非 encounterStatusEnum - 修复 5 处编译错误 - 重新提交 --- .../impl/DoctorStationAdviceAppServiceImpl.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/impl/DoctorStationAdviceAppServiceImpl.java b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/impl/DoctorStationAdviceAppServiceImpl.java index 6e79773f..a781cc05 100644 --- a/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/impl/DoctorStationAdviceAppServiceImpl.java +++ b/openhis-server-new/openhis-application/src/main/java/com/openhis/web/doctorstation/appservice/impl/DoctorStationAdviceAppServiceImpl.java @@ -574,12 +574,12 @@ public class DoctorStationAdviceAppServiceImpl implements IDoctorStationAdviceAp Encounter encounterCheck = iEncounterService.getById(adviceSaveDto.getEncounterId()); if (encounterCheck != null) { // 就诊状态：1001=挂号，1002=已接诊，1003=已收费，1004=已完成 - if (encounterCheck.getEncounterStatusEnum() != null && - encounterCheck.getEncounterStatusEnum() != 1002 && - encounterCheck.getEncounterStatusEnum() != 1003 && - encounterCheck.getEncounterStatusEnum() != 1004) { + if (encounterCheck.getStatusEnum() != null && + encounterCheck.getStatusEnum() != 1002 && + encounterCheck.getStatusEnum() != 1003 && + encounterCheck.getStatusEnum() != 1004) { log.error("BugFix#338: 患者未接诊，禁止划价/保存医嘱：encounterId={}, status={}", - adviceSaveDto.getEncounterId(), encounterCheck.getEncounterStatusEnum()); + adviceSaveDto.getEncounterId(), encounterCheck.getStatusEnum()); return R.fail(null, "患者尚未接诊，无法保存医嘱。请先完成接诊操作！"); } }