From 2cfa16776d6644b0d891f0892fde9327d85fa489 Mon Sep 17 00:00:00 2001 From: "litao@lymsh.com" Date: Fri, 29 Dec 2017 12:31:45 +0800 Subject: [PATCH] bbbbbb --- .../operate/web/service/impl/ReportServiceImpl.java | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/ReportServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/ReportServiceImpl.java index e7fabd4..98e21e4 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/ReportServiceImpl.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/ReportServiceImpl.java @@ -649,9 +649,12 @@ public class ReportServiceImpl extends BaseServiceImpl implements IReportService String fetalPresentation = ""; // 先露 if(CollectionUtils.isNotEmpty(tireData)) { for (Map tireDatum : tireData) { - fetalPosition = !tireDatum.containsKey("fetalPosition") ? "--" : fetalPosition.length() > 0 ? fetalPosition + "/" + FetalPositionEnums.getTitle2((String) tireDatum.get("fetalPosition")) : FetalPositionEnums.getTitle2((String) tireDatum.get("fetalPosition")); + /*fetalPosition = !tireDatum.containsKey("fetalPosition") ? "--" : fetalPosition.length() > 0 ? fetalPosition + "/" + FetalPositionEnums.getTitle2((String) tireDatum.get("fetalPosition")) : FetalPositionEnums.getTitle2((String) tireDatum.get("fetalPosition")); heartRate = !tireDatum.containsKey("heartRate") ? "--" : heartRate.length() > 0 ? heartRate + "/" + tireDatum.get("heartRate").toString().replaceAll("\\.0", "") : tireDatum.get("heartRate").toString().replaceAll("\\.0", ""); - fetalPresentation = !tireDatum.containsKey("fetalPresentation") ? "--" : fetalPresentation.length() > 0 ? fetalPresentation + "/" + FetalEnums.getTitle2((String) tireDatum.get("fetalPresentation")) : FetalEnums.getTitle2((String) tireDatum.get("fetalPresentation")); + fetalPresentation = !tireDatum.containsKey("fetalPresentation") ? "--" : fetalPresentation.length() > 0 ? fetalPresentation + "/" + FetalEnums.getTitle2((String) tireDatum.get("fetalPresentation")) : FetalEnums.getTitle2((String) tireDatum.get("fetalPresentation"));*/ + fetalPosition += fetalPosition.length() > 0 ? "/" : "" + (tireDatum.containsKey("fetalPosition") ? FetalPositionEnums.getTitle2((String) tireDatum.get("fetalPosition")) : "--"); + heartRate += heartRate.length() > 0 ? "/" : "" + (tireDatum.containsKey("heartRate") ? tireDatum.get("heartRate").toString().replaceAll("\\.0", "") : "--"); + fetalPresentation += fetalPresentation.length() > 0 ? "/" : "" + (tireDatum.containsKey("heartRate") ? FetalEnums.getTitle2((String) tireDatum.get("fetalPresentation")) : "--"); } } else { fetalPosition = "--"; @@ -692,10 +695,9 @@ public class ReportServiceImpl extends BaseServiceImpl implements IReportService if(CollectionUtils.isNotEmpty(tireData)) { try { // 有些数据前端传的有问题 存的class for (Map tireDatum : tireData) { - fetalPosition = !tireDatum.containsKey("fetalPosition") ? "--" : fetalPosition.length() > 0 ? fetalPosition + "/" + FetalPositionEnums.getTitle2((String) tireDatum.get("fetalPosition")) : FetalPositionEnums.getTitle2((String) tireDatum.get("fetalPosition")); - heartRate = !tireDatum.containsKey("heartRate") ? "--" : heartRate.length() > 0 ? heartRate + "/" + tireDatum.get("heartRate").toString().replaceAll("\\.0", "") : tireDatum.get("heartRate").toString().replaceAll("\\.0", ""); - fetalPresentation = !tireDatum.containsKey("fetalPresentation") ? fetalPresentation.length() < 0 ? "--" : fetalPresentation + "/--": fetalPresentation.length() > 0 ? - fetalPresentation + "/" + FetalEnums.getTitle2((String) tireDatum.get("fetalPresentation")) : FetalEnums.getTitle2((String) tireDatum.get("fetalPresentation")); + fetalPosition += fetalPosition.length() > 0 ? "/" : "" + (tireDatum.containsKey("fetalPosition") ? FetalPositionEnums.getTitle2((String) tireDatum.get("fetalPosition")) : "--"); + heartRate += heartRate.length() > 0 ? "/" : "" + (tireDatum.containsKey("heartRate") ? tireDatum.get("heartRate").toString().replaceAll("\\.0", "") : "--"); + fetalPresentation += fetalPresentation.length() > 0 ? "/" : "" + (tireDatum.containsKey("heartRate") ? FetalEnums.getTitle2((String) tireDatum.get("fetalPresentation")) : "--"); } } catch (Exception e) { fetalPosition = "--"; -- 1.8.3.1