From ef544f89f6d1b615283d7534312abbec3b5004ee Mon Sep 17 00:00:00 2001
From: landong2015 <hanshaofeng@lymsh.com>
Date: Fri, 13 Jan 2017 16:36:52 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8F=B6=E9=85=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../operate/web/facade/FolicAcidFacade.java        |  2 +-
 .../platform/operate/web/utils/FunvCommonUtil.java | 42 ++++++++++++++++++++++
 2 files changed, 43 insertions(+), 1 deletion(-)

diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/FolicAcidFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/FolicAcidFacade.java
index 040658e..a4213f9 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/FolicAcidFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/FolicAcidFacade.java
@@ -417,7 +417,7 @@ public class FolicAcidFacade {
                 map.put("id",data.getId());
                 ResidentsArchiveModel model = residentsArchiveService.getResident(data.getParentId());
                 map.put("username",model.getUsername());
-                map.put("certificateNum", DefenceUtils.getId(model.getCertificateNum()));
+                map.put("certificateNum", FunvCommonUtil.getId(model.getCertificateNum()));
                 map.put("phone", FunvCommonUtil.getXingPhone(model.getPhone()));
                 map.put("drawTime", DateUtil.getyyyy_MM_dd(data.getDrawTime()));
                 map.put("drawCount", data.getDrawCount());
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/FunvCommonUtil.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/FunvCommonUtil.java
index d78ffd9..6fe33e1 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/FunvCommonUtil.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/utils/FunvCommonUtil.java
@@ -267,9 +267,51 @@ public class FunvCommonUtil {
     public static final String YIN = "yin";
     public static final String YANG = "yang";
     public static final String RUOYANG = "ruoyang";
+    public static final String SPLIT = "split";
+    public static final String FULL = "full";
+
     public static final String JIA = "+";
     public static final String JIAN = "-";
     public static final String JJ = "±";
+    public static final String WZ = "完整";
+    public static final String QK = "切开";
+
+    public static final String ONE = "Ⅰ度";
+    public static final String TWO = "Ⅱ度";
+    public static final String THREE = "Ⅲ度";
+
+    public static String checkSiLieLevel(Integer s) {
+        if (s==null){
+            return "";
+        }
+        if (s == 1){
+            return ONE;
+        }else if (s == 2){
+            return TWO;
+        }else if (s == 3){
+            return THREE;
+        }else {
+            return "";
+        }
+    }
+
+
+    /**
+     * 处理会阴字段
+     * @param s
+     * @return
+     */
+    public static String checkHuiYin(String s) {
+        if (StringUtils.isEmpty(s)){
+            return "";
+        }
+        if (s.equals(SPLIT)){
+            return QK;
+        }else {
+            return WZ;
+        }
+    }
+
 
     /**
      *
-- 
1.8.3.1