From b12dceae3f23dd9ffcee723c0dab6d11bf5dceb0 Mon Sep 17 00:00:00 2001
From: "litao@lymsh.com" <Lt123456>
Date: Fri, 29 Dec 2017 13:27:10 +0800
Subject: [PATCH] bbbbbb

---
 .../web/service/impl/ReportServiceImpl.java        | 71 ++++++++++++----------
 1 file changed, 40 insertions(+), 31 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 98e21e4..01dd368 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
@@ -647,23 +647,26 @@ public class ReportServiceImpl extends BaseServiceImpl implements IReportService
             String fetalPosition = ""; // 胎位
             String heartRate = "";  // 胎心
             String fetalPresentation = ""; // 先露
+            StringBuffer fetalPosition2 = new StringBuffer(); // 胎位
+            StringBuffer heartRate2  = new StringBuffer();  // 胎心
+            StringBuffer fetalPresentation2  = new StringBuffer(); // 先露
             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"));
-                    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"));*/
-                    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")) : "--");
+                    if(fetalPosition2.length() > 0) fetalPosition2.append("/");
+                    if(heartRate2.length() > 0) heartRate2.append("/");
+                    if(fetalPresentation2.length() > 0) fetalPresentation2.append("/");
+                    fetalPosition2.append(tireDatum.containsKey("fetalPosition") ? FetalPositionEnums.getTitle2((String) tireDatum.get("fetalPosition")) : "--");
+                    heartRate2.append(tireDatum.containsKey("heartRate") ? tireDatum.get("heartRate").toString().replaceAll("\\.0", "") : "--");
+                    fetalPresentation2.append(tireDatum.containsKey("fetalPresentation") ? FetalEnums.getTitle2((String) tireDatum.get("fetalPresentation")) : "--");
                 }
             } else {
-                fetalPosition = "--";
-                heartRate = "--";
-                fetalPresentation = "--";
+                fetalPosition2.append("--");
+                heartRate2.append("--");
+                fetalPresentation2.append("--");
             }
-            temp.put("fetalPosition", fetalPosition); // 胎位
-            temp.put("heartRate", heartRate); // 胎心
-            temp.put("fetalPresentation", fetalPresentation); // 先露
+            temp.put("fetalPosition", fetalPosition2.toString()); // 胎位
+            temp.put("heartRate", heartRate2.toString()); // 胎心
+            temp.put("fetalPresentation", fetalPresentation2.toString()); // 先露
             temp.put("edema",FuZhongEnums.getName(antexModel.getEdema())); // 水肿
             temp.put("urineProtein", antexModel.getUrineProtein()); // 尿蛋白
             temp.put("hemoglobin", antexModel.getHemoglobin()); // 血红素
@@ -692,27 +695,33 @@ public class ReportServiceImpl extends BaseServiceImpl implements IReportService
             String fetalPosition = "";
             String heartRate = "";
             String fetalPresentation = "";
-            if(CollectionUtils.isNotEmpty(tireData)) {
-               try { // 有些数据前端传的有问题 存的class
-                   for (Map tireDatum : tireData) {
-                       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 = "--";
-                   heartRate = "--";
-                   fetalPresentation = "--";
-               }
-            } else {
-                fetalPosition = "--";
-                heartRate = "--";
-                fetalPresentation = "--";
+            StringBuffer fetalPosition2 = new StringBuffer(); // 胎位
+            StringBuffer heartRate2  = new StringBuffer();  // 胎心
+            StringBuffer fetalPresentation2  = new StringBuffer(); // 先露
+            try { // 有些数据前端传的有问题 存的class
+                if(CollectionUtils.isNotEmpty(tireData)) {
+                       for (Map tireDatum : tireData) {
+                               if(fetalPosition2.length() > 0) fetalPosition2.append("/");
+                               if(heartRate2.length() > 0) heartRate2.append("/");
+                               if(fetalPresentation2.length() > 0) fetalPresentation2.append("/");
+                               fetalPosition2.append(tireDatum.containsKey("fetalPosition") ? FetalPositionEnums.getTitle2((String) tireDatum.get("fetalPosition")) : "--");
+                               heartRate2.append(tireDatum.containsKey("heartRate") ? tireDatum.get("heartRate").toString().replaceAll("\\.0", "") : "--");
+                               fetalPresentation2.append(tireDatum.containsKey("fetalPresentation") ? FetalEnums.getTitle2((String) tireDatum.get("fetalPresentation")) : "--");
+                       }
+                } else {
+                    fetalPosition2.append("--");
+                    heartRate2.append("--");
+                    fetalPresentation2.append("--");
+                }
+            } catch (Exception e) {
+                fetalPosition2.append("--");
+                heartRate2.append("--");
+                fetalPresentation2.append("--");
             }
 
-            temp.put("fetalPosition", fetalPosition); // 胎位
-            temp.put("heartRate", heartRate); // 胎心
-            temp.put("fetalPresentation", fetalPresentation); // 先露
+            temp.put("fetalPosition", fetalPosition2.toString()); // 胎位
+            temp.put("heartRate", heartRate2.toString()); // 胎心
+            temp.put("fetalPresentation", fetalPresentation2.toString()); // 先露
             temp.put("edema",FuZhongEnums.getName(antExChuModel.getEdema())); // 水肿
             temp.put("urineProtein", antExChuModel.getNdb()); // 尿蛋白
             temp.put("hemoglobin", antExChuModel.getXhdb()); // 血红素
-- 
1.8.3.1