From 4802c25d8927074290135ca80735b4e797a4a37b Mon Sep 17 00:00:00 2001
From: yangfei <yangfei@lymsh.com>
Date: Thu, 12 Oct 2017 16:07:10 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=AC=E5=8A=9B=E8=AF=8A=E6=96=AD=E6=A8=A1?=
 =?UTF-8?q?=E5=9D=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../operate/web/facade/PatientMarkHospServiceFacade.java |  6 +++---
 .../operate/web/result/PatienMarkHospResult.java         | 16 ++++++++--------
 2 files changed, 11 insertions(+), 11 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 66e1566..403be1b 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
@@ -592,7 +592,7 @@ public class PatientMarkHospServiceFacade {
                 result.setBackDoctor("产检医生");
             }
         }
-        result.setBackDate(DateUtil.getyyyy_MM_dd(ps.getBackDate()));
+        result.setBackDate(DateUtil.gety_m_dhm(ps.getBackDate()));
         result.setBackMakeDate(DateUtil.getyyyy_MM_dd(ps.getBackMakeDate()));
         result.setBackRemark(ps.getBackRemark());
         if (ps.getBackFailure() != null) {
@@ -618,7 +618,7 @@ public class PatientMarkHospServiceFacade {
             }
         }
 
-        result.setInHospitDate(DateUtil.getyyyy_MM_dd(ps.getInHospitDate()));
+        result.setInHospitDate(DateUtil.gety_m_dhm(ps.getInHospitDate()));
         result.setInHospitMakeDate(DateUtil.getyyyy_MM_dd(ps.getInHospitMakeDate()));
         result.setInHospitRemark(ps.getInHospitRemark());
         if (ps.getInHospitFailure() != null) {
@@ -642,7 +642,7 @@ public class PatientMarkHospServiceFacade {
         }
         result.setHospitType(ps.getHospitType());
         result.setMakeInHospitDate(DateUtil.getyyyy_MM_dd(ps.getMakeInHospitDate()));
-        result.setMakeDate(DateUtil.getyyyy_MM_dd(ps.getMakeDate()));
+        result.setMakeDate(DateUtil.gety_m_dhm(ps.getMakeDate()));
         if (ps.getMakeDoctor() != null) {
             Users users = usersService.getUsers(Integer.parseInt(ps.getMakeDoctor()));
             if (users != null) {
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PatienMarkHospResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PatienMarkHospResult.java
index c026183..876dad8 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PatienMarkHospResult.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PatienMarkHospResult.java
@@ -73,38 +73,38 @@ public class PatienMarkHospResult {
      */
     private String backRemark;
     /**
-     * 回院失败原因（1-电话无人接听、2-他院已办理住院、3-暂时未确定、4-其他）
+     * 回院预约失败原因（1-电话无人接听、2-他院已办理住院、3-暂时未确定、4-其他）
      */
     private Integer backFailure;
     private String backFailureStr;
     /**
-     * 住院是否提醒（1-待提醒、2-已提醒）
+     * 住院预约是否提醒（1-待提醒、2-已提醒）
      */
     private Integer inHospitStatus;
     private String inHospitStatusStr;
     /**
-     * 住院提醒结果（1-成功、2-失败）
+     * 住院预约提醒结果（1-成功、2-失败）
      */
     private Integer inHospitResult;
     private String inHospitResultStr;
     /**
-     * 住院操作员id
+     * 住院预约操作员id
      */
     private String inHospitDoctor;
     /**
-     * 住院操作时间
+     * 住院预约操作时间
      */
     private String inHospitDate;
     /**
-     * 住院预约时间
+     * 住院预约预约时间
      */
     private String inHospitMakeDate;
     /**
-     * 住院备注信息
+     * 住院预约备注信息
      */
     private String inHospitRemark;
     /**
-     * 住院失败原因（1-电话无人接听、2-他院已办理住院、3-暂时未确定、4-其他）2
+     * 住院预约失败原因（1-电话无人接听、2-他院已办理住院、3-暂时未确定、4-其他）2
      */
     private Integer inHospitFailure;
     private String inHospitFailureStr;
-- 
1.8.3.1