From 9a6315fce6d3ff236fde1d058b40723f4cccb42a Mon Sep 17 00:00:00 2001
From: gengxiaokai <gengxiaokai@lymsh.com>
Date: Tue, 30 Oct 2018 15:27:40 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A8=81=E6=B5=B7=E5=88=86=E5=A8=A9=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E5=AD=97=E6=AE=B5=EF=BC=88=E5=8F=8C=E5=87=BB=E6=9F=A5?=
 =?UTF-8?q?=E7=9C=8B=E8=AF=A6=E6=83=85=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/lyms/platform/operate/web/facade/ViewFacade.java  | 6 +++---
 .../com/lyms/platform/operate/web/request/MatDeliverAddRequest.java | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java
index da26ef9..d883326 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java
@@ -2548,9 +2548,9 @@ public class ViewFacade {
 
         /****************威海妇幼新增分娩详情******************/
         map.put("parity",data.getParity());
-        map.put("gsqsDate",DateUtil.getYyyyMmDd(data.getGsqsDate()));
-        map.put("openDate",DateUtil.getymdhm(data.getOpenDate()));
-        map.put("tmplDate",DateUtil.getYyyyMmDd(data.getTmplDate()));
+        map.put("gsqsDate",DateUtil.gety_m_dhm(data.getGsqsDate()));
+        map.put("openDate",DateUtil.gety_m_dhm(data.getOpenDate()));
+        map.put("tmplDate",DateUtil.gety_m_dhm(data.getTmplDate()));
         map.put("incision",data.getIncision());
         map.put("sutureMethod",data.getSutureMethod());
         map.put("anaesthesia",data.getAnaesthesia());
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/MatDeliverAddRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/MatDeliverAddRequest.java
index 58f4abd..1eae3d4 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/MatDeliverAddRequest.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/MatDeliverAddRequest.java
@@ -278,9 +278,9 @@ public class MatDeliverAddRequest implements IBasicRequestConvert<MaternalDelive
 
         //威海妇幼新增字段
         maternalDeliverModel.setParity(parity);
-        maternalDeliverModel.setGsqsDate(DateUtil.paseYMDH(gsqsDate));
-        maternalDeliverModel.setOpenDate(DateUtil.parseYMDHM(openDate));
-        maternalDeliverModel.setTmplDate(DateUtil.paseYMDH(tmplDate));
+        maternalDeliverModel.setGsqsDate(DateUtil.parseYMDHMS(gsqsDate));
+        maternalDeliverModel.setOpenDate(DateUtil.parseYMDHMS(openDate));
+        maternalDeliverModel.setTmplDate(DateUtil.parseYMDHMS(tmplDate));
         maternalDeliverModel.setIncision(incision);
         maternalDeliverModel.setSutureMethod(sutureMethod);
         maternalDeliverModel.setAnaesthesia(anaesthesia);
-- 
1.8.3.1