From 0c7931cc0f9e369632dad57eadee005b685b187c Mon Sep 17 00:00:00 2001
From: jiangjiazhi <jiangjiazhi@lymsh.com>
Date: Fri, 16 Dec 2016 11:04:10 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=A7=E6=A3=80=E5=88=A0?=
 =?UTF-8?q?=E9=99=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../lyms/platform/operate/web/result/QuanChanResult.java | 16 +++++++++++++++-
 .../platform/operate/web/result/QuanPatientsResult.java  | 14 ++++++++++++++
 .../platform/operate/web/result/RiskPatientsResult.java  | 13 +++++++++++++
 3 files changed, 42 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 28f899f..6f73be0 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
@@ -63,6 +63,20 @@ public class QuanChanResult implements IBasicResultConvert<QuanChanResult, Patie
     //胎数
     private String tireNumber;
 
+    //建档号
+    private String fileCode;
+
+    public String getFileCode() {
+        if(null==fileCode){
+            return SPIT;
+        }
+        return fileCode;
+    }
+
+    public void setFileCode(String fileCode) {
+        this.fileCode = fileCode;
+    }
+
     public String getTireNumber() {
         if(StringUtils.isEmpty(tireNumber)){
             return SPIT;
@@ -285,7 +299,7 @@ public class QuanChanResult implements IBasicResultConvert<QuanChanResult, Patie
         setName(destModel.getUsername());
         setRealPhone(destModel.getPhone());
         setPhone(StringUtils.encryPhone(destModel.getPhone()));
-
+        setFileCode(destModel.getFileCode());
         if (null != destModel.getFmDate()) {
             Integer dueStatus = destModel.getDueStatus();
             if(null==dueStatus){
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 92d4c81..23bba51 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
@@ -70,6 +70,19 @@ public class QuanPatientsResult  implements IBasicResultConvert<QuanPatientsResu
     private String currentCh;
     //建档时间
     private String bTime;
+    //建档号
+    private String fileCode;
+
+    public String getFileCode() {
+        if(null==fileCode){
+            return SPIT;
+        }
+        return fileCode;
+    }
+
+    public void setFileCode(String fileCode) {
+        this.fileCode = fileCode;
+    }
 
     public String getbTime() {
         if(StringUtils.isEmpty(bTime)){
@@ -305,6 +318,7 @@ public class QuanPatientsResult  implements IBasicResultConvert<QuanPatientsResu
         if(null!=destModel.getDueDate()){
             setDueDate(DateUtil.getyyyy_MM_dd(destModel.getDueDate()));
         }
+        setFileCode(destModel.getFileCode());
         setPid(destModel.getPid());
         setPhone(StringUtils.encryPhone(destModel.getPhone()));
         setCheckDoctor(destModel.getLastReportDoctorName());
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/RiskPatientsResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/RiskPatientsResult.java
index 83a836e..f00969a 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/RiskPatientsResult.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/RiskPatientsResult.java
@@ -81,7 +81,19 @@ public class RiskPatientsResult implements IBasicResultConvert<RiskPatientsResul
     private String currentCh;
     //建档时间
     private String bTime;
+    //建档号
+    private String fileCode;
 
+    public String getFileCode() {
+        if(null==fileCode){
+            return SPIT;
+        }
+        return fileCode;
+    }
+
+    public void setFileCode(String fileCode) {
+        this.fileCode = fileCode;
+    }
     public String getbTime() {
         if(StringUtils.isEmpty(bTime)){
             return SPIT;
@@ -316,6 +328,7 @@ public class RiskPatientsResult implements IBasicResultConvert<RiskPatientsResul
         if(null!=age){
             setAge(age+"");
         }
+        setFileCode(destModel.getFileCode());
         setRealPhone(destModel.getPhone());
 //        setrFactor(destModel.getRiskFactorId() == null ? "" : JsonUtil.array2JsonString(destModel.getRiskFactorId()));
         sethScore(destModel.getRiskScore());
-- 
1.8.3.1