Commit 2cfa16776d6644b0d891f0892fde9327d85fa489
1 parent
9c4d113e59
Exists in
master
and in
6 other branches
bbbbbb
Showing 1 changed file with 8 additions and 6 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/ReportServiceImpl.java
View file @
2cfa167
| ... | ... | @@ -649,9 +649,12 @@ |
| 649 | 649 | String fetalPresentation = ""; // 先露 |
| 650 | 650 | if(CollectionUtils.isNotEmpty(tireData)) { |
| 651 | 651 | for (Map tireDatum : tireData) { |
| 652 | - fetalPosition = !tireDatum.containsKey("fetalPosition") ? "--" : fetalPosition.length() > 0 ? fetalPosition + "/" + FetalPositionEnums.getTitle2((String) tireDatum.get("fetalPosition")) : FetalPositionEnums.getTitle2((String) tireDatum.get("fetalPosition")); | |
| 652 | + /*fetalPosition = !tireDatum.containsKey("fetalPosition") ? "--" : fetalPosition.length() > 0 ? fetalPosition + "/" + FetalPositionEnums.getTitle2((String) tireDatum.get("fetalPosition")) : FetalPositionEnums.getTitle2((String) tireDatum.get("fetalPosition")); | |
| 653 | 653 | heartRate = !tireDatum.containsKey("heartRate") ? "--" : heartRate.length() > 0 ? heartRate + "/" + tireDatum.get("heartRate").toString().replaceAll("\\.0", "") : tireDatum.get("heartRate").toString().replaceAll("\\.0", ""); |
| 654 | - fetalPresentation = !tireDatum.containsKey("fetalPresentation") ? "--" : fetalPresentation.length() > 0 ? fetalPresentation + "/" + FetalEnums.getTitle2((String) tireDatum.get("fetalPresentation")) : FetalEnums.getTitle2((String) tireDatum.get("fetalPresentation")); | |
| 654 | + fetalPresentation = !tireDatum.containsKey("fetalPresentation") ? "--" : fetalPresentation.length() > 0 ? fetalPresentation + "/" + FetalEnums.getTitle2((String) tireDatum.get("fetalPresentation")) : FetalEnums.getTitle2((String) tireDatum.get("fetalPresentation"));*/ | |
| 655 | + fetalPosition += fetalPosition.length() > 0 ? "/" : "" + (tireDatum.containsKey("fetalPosition") ? FetalPositionEnums.getTitle2((String) tireDatum.get("fetalPosition")) : "--"); | |
| 656 | + heartRate += heartRate.length() > 0 ? "/" : "" + (tireDatum.containsKey("heartRate") ? tireDatum.get("heartRate").toString().replaceAll("\\.0", "") : "--"); | |
| 657 | + fetalPresentation += fetalPresentation.length() > 0 ? "/" : "" + (tireDatum.containsKey("heartRate") ? FetalEnums.getTitle2((String) tireDatum.get("fetalPresentation")) : "--"); | |
| 655 | 658 | } |
| 656 | 659 | } else { |
| 657 | 660 | fetalPosition = "--"; |
| ... | ... | @@ -692,10 +695,9 @@ |
| 692 | 695 | if(CollectionUtils.isNotEmpty(tireData)) { |
| 693 | 696 | try { // 有些数据前端传的有问题 存的class |
| 694 | 697 | for (Map tireDatum : tireData) { |
| 695 | - fetalPosition = !tireDatum.containsKey("fetalPosition") ? "--" : fetalPosition.length() > 0 ? fetalPosition + "/" + FetalPositionEnums.getTitle2((String) tireDatum.get("fetalPosition")) : FetalPositionEnums.getTitle2((String) tireDatum.get("fetalPosition")); | |
| 696 | - heartRate = !tireDatum.containsKey("heartRate") ? "--" : heartRate.length() > 0 ? heartRate + "/" + tireDatum.get("heartRate").toString().replaceAll("\\.0", "") : tireDatum.get("heartRate").toString().replaceAll("\\.0", ""); | |
| 697 | - fetalPresentation = !tireDatum.containsKey("fetalPresentation") ? fetalPresentation.length() < 0 ? "--" : fetalPresentation + "/--": fetalPresentation.length() > 0 ? | |
| 698 | - fetalPresentation + "/" + FetalEnums.getTitle2((String) tireDatum.get("fetalPresentation")) : FetalEnums.getTitle2((String) tireDatum.get("fetalPresentation")); | |
| 698 | + fetalPosition += fetalPosition.length() > 0 ? "/" : "" + (tireDatum.containsKey("fetalPosition") ? FetalPositionEnums.getTitle2((String) tireDatum.get("fetalPosition")) : "--"); | |
| 699 | + heartRate += heartRate.length() > 0 ? "/" : "" + (tireDatum.containsKey("heartRate") ? tireDatum.get("heartRate").toString().replaceAll("\\.0", "") : "--"); | |
| 700 | + fetalPresentation += fetalPresentation.length() > 0 ? "/" : "" + (tireDatum.containsKey("heartRate") ? FetalEnums.getTitle2((String) tireDatum.get("fetalPresentation")) : "--"); | |
| 699 | 701 | } |
| 700 | 702 | } catch (Exception e) { |
| 701 | 703 | fetalPosition = "--"; |