Commit 5e23e33f95e3691e652930f77de49c17adbc77ab
1 parent
ad48795f37
Exists in
master
and in
6 other branches
分娩记录导出
Showing 1 changed file with 17 additions and 3 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/MatDeliverController.java
View file @
5e23e33
| ... | ... | @@ -357,11 +357,11 @@ |
| 357 | 357 | String reslult1 = ""; |
| 358 | 358 | String reslult2 = ""; |
| 359 | 359 | String deliveryMode = queryModel.getDeliveryMode(); |
| 360 | - if (deliveryMode != null && deliveryMode.equals("顺产")) | |
| 360 | + if (deliveryMode != null && deliveryMode.contains("顺产")) | |
| 361 | 361 | { |
| 362 | 362 | reslult1 = "√"; |
| 363 | 363 | } |
| 364 | - else if (deliveryMode != null && deliveryMode.equals("剖宫产")) | |
| 364 | + else if (deliveryMode != null && deliveryMode.contains("剖宫产")) | |
| 365 | 365 | { |
| 366 | 366 | reslult2 = "√"; |
| 367 | 367 | } |
| ... | ... | @@ -371,7 +371,21 @@ |
| 371 | 371 | map.put("deliveryMode4",""); |
| 372 | 372 | map.put("thloseBloodL",queryModel.getThloseBloodL() == null ? "" : queryModel.getThloseBloodL()); |
| 373 | 373 | map.put("sex",queryModel.getSex()); |
| 374 | - map.put("height",queryModel.getBabyHeight() == null ? "" : Double.parseDouble(queryModel.getBabyHeight()) * 1000); | |
| 374 | + map.put("height",queryModel.getBabyHeight()); | |
| 375 | + String weight = ""; | |
| 376 | + if (queryModel.getBabyWeight() != null && queryModel.getBabyWeight().contains(",")) | |
| 377 | + { | |
| 378 | + String arrs[] = queryModel.getBabyWeight().split(","); | |
| 379 | + for (int i = 0 ; i < arrs.length ; i++) | |
| 380 | + { | |
| 381 | + weight+=(Double.parseDouble(arrs[i]) * 1000)+""; | |
| 382 | + if (i != arrs.length -1) | |
| 383 | + { | |
| 384 | + weight += ","; | |
| 385 | + } | |
| 386 | + } | |
| 387 | + } | |
| 388 | + | |
| 375 | 389 | map.put("weight",queryModel.getBabyWeight() == null ? "" : Double.parseDouble(queryModel.getBabyWeight()) * 1000); |
| 376 | 390 | map.put("malformation",queryModel.getMalformation() == null ? "" : queryModel.getMalformation()); |
| 377 | 391 | //queryModel.getTireNumber()-queryModel.getLivingNumber() |