From aab181ba3d8a306842b927ad3e742d6ab6083532 Mon Sep 17 00:00:00 2001
From: jiangjiazhi <jiangjiazhi@lymsh.com>
Date: Sun, 18 Sep 2016 18:25:00 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=96=B0=E7=94=B5=E5=AD=90?=
 =?UTF-8?q?=E7=97=85=E5=8E=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../lyms/platform/operate/web/result/QuanChanResult.java    | 12 ++++++++++++
 .../platform/operate/web/result/QuanPatientsResult.java     | 13 ++++++++++++-
 2 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/QuanChanResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/QuanChanResult.java
index eaa9dcd..d0a0a03 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/QuanChanResult.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/QuanChanResult.java
@@ -4,6 +4,7 @@ import com.lyms.platform.common.base.IBasicResultConvert;
 import com.lyms.platform.common.utils.DateUtil;
 import com.lyms.platform.common.utils.StringUtils;
 import com.lyms.platform.pojo.Patients;
+import org.codehaus.jackson.annotate.JsonIgnore;
 
 import java.util.Date;
 
@@ -34,9 +35,19 @@ public class QuanChanResult implements IBasicResultConvert<QuanChanResult, Patie
 
     //联系方式
     private String phone;
+    @JsonIgnore
+    private String realPhone;
     private String nextCheckTime;
     private String pid;
 
+    public String getRealPhone() {
+        return realPhone;
+    }
+
+    public void setRealPhone(String realPhone) {
+        this.realPhone = realPhone;
+    }
+
     public int getcHTimes() {
         return cHTimes;
     }
@@ -158,6 +169,7 @@ public class QuanChanResult implements IBasicResultConvert<QuanChanResult, Patie
         setId(destModel.getId());
         setAge(DateUtil.getAge(destModel.getBirth(),destModel.getFmDate()));
         setName(destModel.getUsername());
+        setRealPhone(destModel.getPhone());
         setPhone(StringUtils.encryPhone(destModel.getPhone()));
 
         if (null != destModel.getFmDate()) {
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/QuanPatientsResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/QuanPatientsResult.java
index c85be50..c238e6f 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/QuanPatientsResult.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/QuanPatientsResult.java
@@ -6,6 +6,7 @@ import com.lyms.platform.common.utils.DateUtil;
 import com.lyms.platform.common.utils.JsonUtil;
 import com.lyms.platform.common.utils.StringUtils;
 import com.lyms.platform.pojo.Patients;
+import org.codehaus.jackson.annotate.JsonIgnore;
 
 import java.util.Date;
 import java.util.List;
@@ -42,12 +43,22 @@ public class QuanPatientsResult  implements IBasicResultConvert<QuanPatientsResu
 
     //联系方式
     private String phone;
+    @JsonIgnore
+    private String realPhone;
     //预约产检时间
     private String cTime;
     //服务类型
     private String serviceType;
     private String pid;
 
+    public String getRealPhone() {
+        return realPhone;
+    }
+
+    public void setRealPhone(String realPhone) {
+        this.realPhone = realPhone;
+    }
+
     public int getcHTimes() {
         return cHTimes;
     }
@@ -192,7 +203,7 @@ public class QuanPatientsResult  implements IBasicResultConvert<QuanPatientsResu
             int days= DateUtil.daysBetween(destModel.getLastMenses(),new Date());
             this.dueWeek=StringUtils.dueWeek(days);
         }
-
+        setRealPhone(destModel.getPhone());
 //        setrLevel(destModel.getRiskLevelId());
         if(null!=destModel.getNextCheckTime()) {
             setcTime(DateUtil.getyyyy_MM_dd(destModel.getNextCheckTime()));
-- 
1.8.3.1