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()