From 6c7ef1ffefcf93faf18ece377ab9638842547452 Mon Sep 17 00:00:00 2001
From: liquanyu <liquanyu@lymsh.com>
Date: Wed, 21 Jun 2017 10:26:39 +0800
Subject: [PATCH] update code

---
 .../platform/operate/web/facade/ViewFacade.java    | 34 +++++++++++++++-------
 1 file changed, 23 insertions(+), 11 deletions(-)

diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java
index 51c26d1..9096eb4 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ViewFacade.java
@@ -908,21 +908,33 @@ public class ViewFacade {
         map.put("gongwaiyun", UnitUtils.unitSplice(data.getGongwaiyun(), UnitConstants.CI));
         //流产
         StringBuffer abortion = new StringBuffer();
-        abortion.append(UnitUtils.unitSplice(data.getAbortion(), UnitConstants.CI) == null ? "" : UnitUtils.unitSplice(data.getAbortion(), UnitConstants.CI));
-        abortion.append("（");
+        if (data.getAbortion() == null)
+        {
+            boolean isAppend = false;
+            abortion.append(UnitUtils.unitSplice(data.getAbortion(), UnitConstants.CI) == null ? "" : UnitUtils.unitSplice(data.getAbortion(), UnitConstants.CI));
+            if (data.getAbortionZR() != null || data.getAbortionRG() != null || data.getYaowu() != null)
+            {
+                isAppend =  true;
+                abortion.append("（");
+            }
+            if (data.getAbortionZR() != null) {
+                abortion.append("自然:" + data.getAbortionZR() + UnitConstants.CI);
+            }
 
-        if (data.getAbortionZR() != null) {
-            abortion.append("自然:" + data.getAbortionZR() + UnitConstants.CI);
-        }
+            if (data.getAbortionRG() != null) {
+                abortion.append("  人工:" + data.getAbortionRG() + UnitConstants.CI + "");
+            }
 
-        if (data.getAbortionRG() != null) {
-            abortion.append("  人工:" + data.getAbortionRG() + UnitConstants.CI + "");
-        }
+            if (data.getYaowu() != null) {
+                abortion.append("  药物:" + data.getYaowu() + UnitConstants.CI + "");
+            }
+            if (isAppend)
+            {
+                abortion.append("）");
+            }
 
-        if (data.getYaowu() != null) {
-            abortion.append("  药物:" + data.getYaowu() + UnitConstants.CI + "");
         }
-        abortion.append("）");
+
 
         map.put("abortion", abortion);
         /*map.put("abortion", UnitUtils.unitSplice(data.getAbortion(),UnitConstants.CI) + "  (自然:" + data.getAbortionZR() + UnitConstants.CI + "  人工:" +
-- 
1.8.3.1