From c7beefda497e96f526677c11ae20c86e4f2d5571 Mon Sep 17 00:00:00 2001
From: yangfei <yangfei@lymsh.com>
Date: Tue, 18 Jul 2017 22:10:12 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A6=87=E7=A7=91=E6=A3=80=E6=9F=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../platform/operate/web/facade/ViewFacade.java    | 46 +++++++++++++++++-----
 1 file changed, 36 insertions(+), 10 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 67e3c74..f177543 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
@@ -1312,18 +1312,44 @@ public class ViewFacade {
 
         map.put("heart", data.getHeart());
         map.put("lungs", data.getLungs());
-        map.put("vulva", data.getVulva());
-        map.put("vulvaSele", data.getVulvaSele());
-        map.put("vagina", data.getVagina());
-        map.put("vaginaSele", data.getVaginaSele());
-        map.put("cervical", data.getCervical());
-        map.put("cervicalSele", data.getCervicalSele());
-        map.put("uterus", data.getUterus());
-        map.put("uterusSele", data.getUterusSele());
-        map.put("fujian", data.getFujian());
-        map.put("fujianSele", data.getFujianSele());
 
 
+        if(StringUtils.isNotEmpty(data.getVulvaSele())){
+            if("1".equals(data.getVulvaSele())){
+                map.put("vulvaSele", "未见异常");
+            }
+        }else{//空
+            map.put("vulva", data.getVulva());
+        }
+        if(StringUtils.isNotEmpty(data.getVaginaSele())){
+            if("1".equals(data.getVaginaSele())){
+                map.put("vaginaSele", "未见异常");
+            }
+        }else{//空
+            map.put("vagina", data.getVagina());
+        }
+        if(StringUtils.isNotEmpty(data.getCervicalSele())){
+            if("1".equals(data.getCervicalSele())){
+                map.put("cervicalSele", "未见异常");
+            }
+        }else{//空
+            map.put("cervical", data.getCervical());
+        }
+        if(StringUtils.isNotEmpty(data.getUterusSele())){
+            if("1".equals(data.getUterusSele())){
+                map.put("uterusSele", "未见异常");
+            }
+        }else{//空
+            map.put("uterus", data.getUterus());
+        }
+        if(StringUtils.isNotEmpty(data.getFujianSele())){
+            if("1".equals(data.getFujianSele())){
+                map.put("fujianSele", "未见异常");
+            }
+        }else{//空
+            map.put("fujian", data.getFujian());
+        }
+
         map.put("gonggao", UnitUtils.unitSplice(data.getGonggao(), UnitConstants.CM));
 
         if (StringUtils.isNotEmpty(data.getGonggaoSelect())) {
-- 
1.8.3.1