diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientMarkHospServiceFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientMarkHospServiceFacade.java index 4c2ee29..231bc6e 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientMarkHospServiceFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientMarkHospServiceFacade.java @@ -607,6 +607,11 @@ public class PatientMarkHospServiceFacade { result.setBackResult(ps.getBackResult()); if (ps.getBackResult() != null) { result.setBackResultStr(ps.getBackResult() == 1 ? "成功" : "失败"); + //提醒结果为失败 + if (ps.getBackResult() == 2&&ps.getBackFailure() != null) { + result.setBackFailure(ps.getBackFailure()); + result.setBackFailureStr(MakeHospitalEnums.getTitle(ps.getBackFailure())); + } } else { result.setBackResultStr("--"); } @@ -621,10 +626,7 @@ public class PatientMarkHospServiceFacade { result.setBackDate(DateUtil.gety_m_dhm(ps.getBackDate())); result.setBackMakeDate(DateUtil.getyyyy_MM_dd(ps.getBackMakeDate())); result.setBackRemark(ps.getBackRemark()); - if (ps.getBackFailure() != null) { - result.setBackFailure(ps.getBackFailure()); - result.setBackFailureStr(MakeHospitalEnums.getTitle(ps.getBackFailure())); - } + if (ps.getInHospitStatus() != null) { result.setInHospitStatus(ps.getInHospitStatus()); result.setInHospitStatusStr(ps.getInHospitStatus() == 1 ? "待提醒" : "已提醒"); @@ -632,6 +634,11 @@ public class PatientMarkHospServiceFacade { if (ps.getInHospitResult() != null) { result.setInHospitResult(ps.getInHospitResult()); result.setInHospitResultStr(ps.getInHospitResult() == 1 ? "成功" : "失败"); + // 住院提醒结果2-失败 + if (ps.getInHospitResult() == 2 && ps.getInHospitFailure() != null) { + result.setInHospitFailure(ps.getInHospitFailure()); + result.setInHospitFailureStr(MakeHospitalEnums.getTitle(ps.getInHospitFailure())); + } } else { result.setInHospitResultStr("--"); } @@ -647,10 +654,7 @@ public class PatientMarkHospServiceFacade { result.setInHospitDate(DateUtil.gety_m_dhm(ps.getInHospitDate())); result.setInHospitMakeDate(DateUtil.getyyyy_MM_dd(ps.getInHospitMakeDate())); result.setInHospitRemark(ps.getInHospitRemark()); - if (ps.getInHospitFailure() != null) { - result.setInHospitFailure(ps.getInHospitFailure()); - result.setInHospitFailureStr(MakeHospitalEnums.getTitle(ps.getInHospitFailure())); - } + if (ps.getHospitStatus() != null) { result.setHospitStatus(ps.getHospitStatus());