diff --git a/platform-common/src/main/java/com/lyms/platform/common/utils/DateUtil.java b/platform-common/src/main/java/com/lyms/platform/common/utils/DateUtil.java index 430b439..8145cb7 100644 --- a/platform-common/src/main/java/com/lyms/platform/common/utils/DateUtil.java +++ b/platform-common/src/main/java/com/lyms/platform/common/utils/DateUtil.java @@ -16,6 +16,8 @@ public class DateUtil { public static SimpleDateFormat md = new SimpleDateFormat("MM-dd"); public static SimpleDateFormat m_d = new SimpleDateFormat("MM/dd"); public static SimpleDateFormat y_m_d_h_m_s = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + public static SimpleDateFormat y_m_d_h_m1 = new SimpleDateFormat("yyyy-MM-dd HH:mm"); + public static SimpleDateFormat y_m_d_h_m = new SimpleDateFormat("yyyyMMddHHmm"); public static SimpleDateFormat yyyyMMddHHmmssSSS = new SimpleDateFormat("yyyyMMddHHmmssSSS"); public static final int DAY_SECONDS = 86399; @@ -294,6 +296,18 @@ public class DateUtil { } } + public static Date parseYMDHM(String s) { + if (s == null) { + return null; + } + try { + return y_m_d_h_m1.parse(s); + } catch (Exception e) { + return null; + } + } + + public static String getyyyy_MM_dd_hms(Date d) { if (d == null) { return null; diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java index d595ce0..235b020 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/MatDeliverFacade.java @@ -441,7 +441,7 @@ public class MatDeliverFacade { BabyModel babyModel = fillBaby(patients, deliverAddRequest); babyModel.setDeliverOrg(hospital); baby.setId(baby1.getId()); - babyModel.setBirth(DateUtil.parseYMD(baby.getDueTime())); + babyModel.setBirth(DateUtil.parseYMDHM(baby.getDueTime())); babyModel.setYn(YnEnums.YES.getId()); babyModel.setDueType(fmfs); babyModel.setVisitstatus(VisitStatusEnums.UNVISIT.getId());