From 08725dd0b9bd192a5cc1b28afd1ffea2eef1b67e Mon Sep 17 00:00:00 2001
From: yangfei <yangfei@lymsh.com>
Date: Wed, 18 Oct 2017 10:59:19 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BC=80=E9=80=9A=E5=A2=9E=E5=80=BC=E6=9C=8D?=
 =?UTF-8?q?=E5=8A=A1=E5=90=8C=E6=AD=A5=E6=95=B0=E6=8D=AE=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E9=AA=8C=E8=AF=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../web/facade/PatientMarkHospServiceFacade.java     | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

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());
-- 
1.8.3.1