Commit f831b2c4c5ce0690ebd8b36ad70e987c1e464482
1 parent
db7c77a013
Exists in
master
and in
6 other branches
bbbbbb
Showing 1 changed file with 6 additions and 6 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/ReportServiceImpl.java
View file @
f831b2c
| ... | ... | @@ -652,9 +652,9 @@ |
| 652 | 652 | String fetalPresentation = ""; // 先露 |
| 653 | 653 | if(CollectionUtils.isNotEmpty(tireData)) { |
| 654 | 654 | for (Map tireDatum : tireData) { |
| 655 | - fetalPosition = fetalPosition.length() > 0 ? fetalPosition + "/" + tireDatum.get("fetalPosition") : tireDatum.get("fetalPosition") + ""; | |
| 656 | - heartRate = heartRate.length() > 0 ? heartRate + "/" + tireDatum.get("heartRate") : tireDatum.get("heartRate") + ""; | |
| 657 | - fetalPresentation = fetalPresentation.length() > 0 ? fetalPresentation + "/" + FetalEnums.getTitle2((String) tireDatum.get("fetalPosition")) : FetalEnums.getTitle2((String) tireDatum.get("fetalPosition")); | |
| 655 | + fetalPosition = !tireDatum.containsKey("fetalPosition") ? "--" : fetalPosition.length() > 0 ? fetalPosition + "/" + tireDatum.get("fetalPosition") : tireDatum.get("fetalPosition") + ""; | |
| 656 | + heartRate = !tireDatum.containsKey("heartRate") ? "--" : heartRate.length() > 0 ? heartRate + "/" + tireDatum.get("heartRate") : tireDatum.get("heartRate") + ""; | |
| 657 | + fetalPresentation = !tireDatum.containsKey("fetalPosition") ? "--" : fetalPresentation.length() > 0 ? fetalPresentation + "/" + FetalEnums.getTitle2((String) tireDatum.get("fetalPosition")) : FetalEnums.getTitle2((String) tireDatum.get("fetalPosition")); | |
| 658 | 658 | } |
| 659 | 659 | } else { |
| 660 | 660 | fetalPosition = "--"; |
| ... | ... | @@ -694,9 +694,9 @@ |
| 694 | 694 | String fetalPresentation = ""; |
| 695 | 695 | if(CollectionUtils.isNotEmpty(tireData)) { |
| 696 | 696 | for (Map tireDatum : tireData) { |
| 697 | - fetalPosition = fetalPosition.length() > 0 ? fetalPosition + "/" + tireDatum.get("fetalPosition") : tireDatum.get("fetalPosition") + ""; | |
| 698 | - heartRate = heartRate.length() > 0 ? heartRate + "/" + tireDatum.get("heartRate") : tireDatum.get("heartRate") + ""; | |
| 699 | - fetalPresentation = fetalPresentation.length() > 0 ? fetalPresentation + "/" + FetalEnums.getTitle2((String) tireDatum.get("fetalPosition")) : FetalEnums.getTitle2((String) tireDatum.get("fetalPosition")); | |
| 697 | + fetalPosition = !tireDatum.containsKey("fetalPosition") ? "--" : fetalPosition.length() > 0 ? fetalPosition + "/" + tireDatum.get("fetalPosition") : tireDatum.get("fetalPosition") + ""; | |
| 698 | + heartRate = !tireDatum.containsKey("heartRate") ? "--" : heartRate.length() > 0 ? heartRate + "/" + tireDatum.get("heartRate") : tireDatum.get("heartRate") + ""; | |
| 699 | + fetalPresentation = !tireDatum.containsKey("fetalPosition") ? "--" : fetalPresentation.length() > 0 ? fetalPresentation + "/" + FetalEnums.getTitle2((String) tireDatum.get("fetalPosition")) : FetalEnums.getTitle2((String) tireDatum.get("fetalPosition")); | |
| 700 | 700 | } |
| 701 | 701 | } else { |
| 702 | 702 | fetalPosition = "--"; |