diff --git a/platform-dal/pom.xml b/platform-dal/pom.xml
index 20d8c88..fd02aec 100644
--- a/platform-dal/pom.xml
+++ b/platform-dal/pom.xml
@@ -16,12 +16,12 @@
platform-common
1.0.1
-
- com.fasterxml.jackson.core
- jackson-annotations
- 2.9.0
- compile
-
+
+
+
+
+
+
org.projectlombok
lombok
diff --git a/platform-operate-api/pom.xml b/platform-operate-api/pom.xml
index 5273e83..cc27198 100644
--- a/platform-operate-api/pom.xml
+++ b/platform-operate-api/pom.xml
@@ -102,23 +102,7 @@
jxl
2.6.12
-
- com.fasterxml.jackson.core
- jackson-annotations
- 2.8.8
-
-
- com.fasterxml.jackson.core
- jackson-databind
- 2.8.8
-
-
-
- org.codehaus.jackson
- jackson-mapper-asl
- 1.9.13
-
+
+
+
+
-
- com.fasterxml.jackson.core
- jackson-annotations
- 2.9.0
- compile
-
+
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 2f3bd7c..3db1074 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
@@ -2563,8 +2563,8 @@ public class MatDeliverFacade {
}
}
} else {
- newBabyManagerQueryModel.setBirthHM(new SimpleDateFormat("HH:mm").format(babyModel.getBirth()));
- newBabyManagerQueryModel.setBirthYMD(DateUtil.getyyyy_MM_dd(babyModel.getBirth()));
+ newBabyManagerQueryModel.setBirthHM(babyModel.getBirth() == null ? null : new SimpleDateFormat("HH:mm").format(babyModel.getBirth()));
+ newBabyManagerQueryModel.setBirthYMD(babyModel.getBirth() == null ? null : DateUtil.getyyyy_MM_dd(babyModel.getBirth()));
}
BeanUtils.copy(babyModel, newBabyManagerQueryModel);
String apgarScorePf1 = "";
diff --git a/pom.xml b/pom.xml
index 61c0fa8..7e496e2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -429,16 +429,37 @@
0.9.2-pre5
+
+
+
+
+
+
+
- org.codehaus.jackson
- jackson-core-asl
- 1.9.7
+ com.fasterxml.jackson.core
+ jackson-databind
+ 2.8.8
+
org.codehaus.jackson
jackson-mapper-asl
+ 1.9.13
+
+
+
+ com.fasterxml.jackson.core
+ jackson-annotations
+ 2.9.0
+ compile
+
+
+ org.codehaus.jackson
+ jackson-core-asl
1.9.7
+
net.sf.json-lib