From 5e23e33f95e3691e652930f77de49c17adbc77ab Mon Sep 17 00:00:00 2001 From: liquanyu Date: Tue, 23 Oct 2018 17:08:51 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=86=E5=A8=A9=E8=AE=B0=E5=BD=95=E5=AF=BC?= =?UTF-8?q?=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../operate/web/controller/MatDeliverController.java | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/MatDeliverController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/MatDeliverController.java index bd1bf6a..c83a3c0 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/MatDeliverController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/MatDeliverController.java @@ -357,11 +357,11 @@ public class MatDeliverController extends BaseController{ String reslult1 = ""; String reslult2 = ""; String deliveryMode = queryModel.getDeliveryMode(); - if (deliveryMode != null && deliveryMode.equals("顺产")) + if (deliveryMode != null && deliveryMode.contains("顺产")) { reslult1 = "√"; } - else if (deliveryMode != null && deliveryMode.equals("剖宫产")) + else if (deliveryMode != null && deliveryMode.contains("剖宫产")) { reslult2 = "√"; } @@ -371,7 +371,21 @@ public class MatDeliverController extends BaseController{ map.put("deliveryMode4",""); map.put("thloseBloodL",queryModel.getThloseBloodL() == null ? "" : queryModel.getThloseBloodL()); map.put("sex",queryModel.getSex()); - map.put("height",queryModel.getBabyHeight() == null ? "" : Double.parseDouble(queryModel.getBabyHeight()) * 1000); + map.put("height",queryModel.getBabyHeight()); + String weight = ""; + if (queryModel.getBabyWeight() != null && queryModel.getBabyWeight().contains(",")) + { + String arrs[] = queryModel.getBabyWeight().split(","); + for (int i = 0 ; i < arrs.length ; i++) + { + weight+=(Double.parseDouble(arrs[i]) * 1000)+""; + if (i != arrs.length -1) + { + weight += ","; + } + } + } + map.put("weight",queryModel.getBabyWeight() == null ? "" : Double.parseDouble(queryModel.getBabyWeight()) * 1000); map.put("malformation",queryModel.getMalformation() == null ? "" : queryModel.getMalformation()); //queryModel.getTireNumber()-queryModel.getLivingNumber() -- 1.8.3.1