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, "患者尚未接诊,无法保存医嘱。请先完成接诊操作!"); } }