From 5f93b192946320b4669387a66a7094ceb02bed70 Mon Sep 17 00:00:00 2001 From: jiangjiazhi Date: Sun, 14 Aug 2016 16:31:09 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=AE=BE=E7=BD=AEparentid?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/lyms/platform/pojo/MaternalDeliverModel.java | 5 ++++- .../com/lyms/platform/operate/web/facade/MatDeliverFacade.java | 10 +++++----- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/MaternalDeliverModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/MaternalDeliverModel.java index 3510fd9..5e1102d 100644 --- a/platform-dal/src/main/java/com/lyms/platform/pojo/MaternalDeliverModel.java +++ b/platform-dal/src/main/java/com/lyms/platform/pojo/MaternalDeliverModel.java @@ -1,5 +1,6 @@ package com.lyms.platform.pojo; +import org.apache.commons.lang.math.NumberUtils; import org.springframework.data.mongodb.core.mapping.Document; import java.util.Date; @@ -180,7 +181,9 @@ public class MaternalDeliverModel { } setApgarScore(babyModel.getApgarScore()); setBabyHealthy(babyModel.getBabyHealthy()); - setBabyWeight((Integer.valueOf(babyModel.getBabyWeight())*1000)+""); + if(NumberUtils.isNumber(babyModel.getBabyWeight())){ + setBabyWeight((Integer.valueOf(babyModel.getBabyWeight())*1000)+""); + } setBabyHeight(babyModel.getBabyHeight()); setDeformity(babyModel.getMalformation()); setPregnancyOut(babyModel.getPregnancyOut()); 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 e964268..05d1b7a 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 @@ -50,11 +50,11 @@ public class MatDeliverFacade { private static Map ONE_ENUMS= new HashMap<>(); static { - ONE_ENUMS.put(3,"三"); - ONE_ENUMS.put(4,"四"); - ONE_ENUMS.put(5,"五"); - ONE_ENUMS.put(6,"六"); - ONE_ENUMS.put(7,"七"); + ONE_ENUMS.put(2,"三"); + ONE_ENUMS.put(3,"四"); + ONE_ENUMS.put(4,"五"); + ONE_ENUMS.put(5,"六"); + ONE_ENUMS.put(6,"七"); } /** -- 1.8.3.1