From 05f9d5e30a426bdf98a60b0fadbd1ad7ef0fca3b Mon Sep 17 00:00:00 2001
From: jiangjiazhi <jiangjiazhi@lymsh.com>
Date: Wed, 10 Aug 2016 11:45:56 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AD=95=E5=A6=87=E5=88=86=E5=A8=A9=E5=90=8E?=
 =?UTF-8?q?=20=E5=8F=98=E6=88=90=E4=BA=A7=E5=A6=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../operate/web/result/QuanChanResult.java         | 22 +++++++++++++++-
 .../operate/web/result/QuanPatientsResult.java     | 29 ++++++++++++++++++++-
 .../operate/web/result/RiskPatientsResult.java     | 30 ++++++++++++++++++++++
 .../operate/web/result/SieveListResult.java        |  2 +-
 4 files changed, 80 insertions(+), 3 deletions(-)

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 5b33e67..e896511 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
@@ -11,6 +11,7 @@ import java.util.Date;
  * Created by Administrator on 2016/6/23 0023.
  */
 public class QuanChanResult implements IBasicResultConvert<QuanChanResult, Patients> {
+    public static final String SPIT="-";
     private String id;
     //名称
     private String name;
@@ -42,6 +43,10 @@ public class QuanChanResult implements IBasicResultConvert<QuanChanResult, Patie
     }
 
     public String getNextCheckTime() {
+
+        if(null==nextCheckTime){
+            return SPIT;
+        }
         return nextCheckTime;
     }
 
@@ -58,6 +63,9 @@ public class QuanChanResult implements IBasicResultConvert<QuanChanResult, Patie
     }
 
     public String getCheckDoctor() {
+        if(null==checkDoctor){
+            return SPIT;
+        }
         return checkDoctor;
     }
 
@@ -66,6 +74,9 @@ public class QuanChanResult implements IBasicResultConvert<QuanChanResult, Patie
     }
 
     public String getcTime() {
+        if(null==cTime){
+            return SPIT;
+        }
         return cTime;
     }
 
@@ -83,6 +94,9 @@ public class QuanChanResult implements IBasicResultConvert<QuanChanResult, Patie
 
 
     public String getDueWeek() {
+        if(null==dueWeek){
+            return SPIT;
+        }
         return dueWeek;
     }
 
@@ -99,7 +113,10 @@ public class QuanChanResult implements IBasicResultConvert<QuanChanResult, Patie
     }
 
     public String getlName() {
-        return lName;
+
+        if(null==lName){
+            return SPIT;
+        }return lName;
     }
 
     public void setlName(String lName) {
@@ -107,6 +124,9 @@ public class QuanChanResult implements IBasicResultConvert<QuanChanResult, Patie
     }
 
     public String getName() {
+        if(null==name){
+            return SPIT;
+        }
         return name;
     }
 
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 945e33c..fe2e1dc 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
@@ -15,6 +15,7 @@ import java.util.Date;
  * Created by Administrator on 2016/6/23 0023.
  */
 public class QuanPatientsResult  implements IBasicResultConvert<QuanPatientsResult, Patients> {
+    public static final String SPIT="-";
     private String id;
     //名称
     private String name;
@@ -59,6 +60,9 @@ public class QuanPatientsResult  implements IBasicResultConvert<QuanPatientsResu
     }
 
     public String getCheckDoctor() {
+            if(null==checkDoctor){
+                return SPIT;
+            }
         return checkDoctor;
     }
 
@@ -67,6 +71,10 @@ public class QuanPatientsResult  implements IBasicResultConvert<QuanPatientsResu
     }
 
     public String getcTime() {
+
+        if(null==cTime){
+            return SPIT;
+        }
         return cTime;
     }
 
@@ -83,7 +91,10 @@ public class QuanPatientsResult  implements IBasicResultConvert<QuanPatientsResu
     }
 
     public String getDueDate() {
-        return dueDate;
+
+        if(null==dueDate){
+            return SPIT;
+        }return dueDate;
     }
 
     public void setDueDate(String dueDate) {
@@ -91,6 +102,9 @@ public class QuanPatientsResult  implements IBasicResultConvert<QuanPatientsResu
     }
 
     public String getDueWeek() {
+        if(null==dueWeek){
+            return SPIT;
+        }
         return dueWeek;
     }
 
@@ -107,6 +121,10 @@ public class QuanPatientsResult  implements IBasicResultConvert<QuanPatientsResu
     }
 
     public String getlName() {
+
+        if(null==lName){
+            return SPIT;
+        }
         return lName;
     }
 
@@ -115,6 +133,9 @@ public class QuanPatientsResult  implements IBasicResultConvert<QuanPatientsResu
     }
 
     public String getName() {
+        if(null==name){
+            return SPIT;
+        }
         return name;
     }
 
@@ -131,6 +152,9 @@ public class QuanPatientsResult  implements IBasicResultConvert<QuanPatientsResu
     }
 
     public String getrLevel() {
+        if(null==rLevel){
+            return SPIT;
+        }
         return rLevel;
     }
 
@@ -139,6 +163,9 @@ public class QuanPatientsResult  implements IBasicResultConvert<QuanPatientsResu
     }
 
     public String getServiceType() {
+        if(null==serviceType){
+            return SPIT;
+        }
         return serviceType;
     }
 
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 beb7fc6..95278f6 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
@@ -18,6 +18,8 @@ import java.util.Date;
  * Created by Administrator on 2016/6/22 0022.
  */
 public class RiskPatientsResult implements IBasicResultConvert<RiskPatientsResult, Patients> {
+    public static final String SPIT="-";
+
     //孕妇
     private String id;
     //孕妇名字
@@ -74,6 +76,10 @@ public class RiskPatientsResult implements IBasicResultConvert<RiskPatientsResul
 
 
     public String getcTime() {
+        if(null==cTime){
+            return SPIT;
+        }
+
         return cTime;
     }
 
@@ -82,6 +88,9 @@ public class RiskPatientsResult implements IBasicResultConvert<RiskPatientsResul
     }
 
     public String getDueWeek() {
+        if(null==dueWeek){
+            return SPIT;
+        }
         return dueWeek;
     }
 
@@ -109,6 +118,10 @@ public class RiskPatientsResult implements IBasicResultConvert<RiskPatientsResul
     }
 
     public String getPhone() {
+
+        if(null==phone){
+            return SPIT;
+        }
         return phone;
     }
 
@@ -117,6 +130,9 @@ public class RiskPatientsResult implements IBasicResultConvert<RiskPatientsResul
     }
 
     public String getrFactor() {
+        if(null==rFactor){
+            return SPIT;
+        }
         return rFactor;
     }
 
@@ -125,6 +141,9 @@ public class RiskPatientsResult implements IBasicResultConvert<RiskPatientsResul
     }
 
     public String getrLevel() {
+        if(null==rLevel){
+            return SPIT;
+        }
         return rLevel;
     }
 
@@ -133,6 +152,10 @@ public class RiskPatientsResult implements IBasicResultConvert<RiskPatientsResul
     }
 
     public String getCheckDoctor() {
+
+        if(null==checkDoctor){
+            return SPIT;
+        }
         return checkDoctor;
     }
 
@@ -149,6 +172,10 @@ public class RiskPatientsResult implements IBasicResultConvert<RiskPatientsResul
     }
 
     public String getDueDate() {
+
+        if(null==dueDate){
+            return SPIT;
+        }
         return dueDate;
     }
 
@@ -157,6 +184,9 @@ public class RiskPatientsResult implements IBasicResultConvert<RiskPatientsResul
     }
 
     public String getlName() {
+        if(null==lName){
+            return SPIT;
+        }
         return lName;
     }
 
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/SieveListResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/SieveListResult.java
index aca2297..bb016fb 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/SieveListResult.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/SieveListResult.java
@@ -15,7 +15,7 @@ import java.util.Date;
  * Created by Administrator on 2016/7/5 0005.
  */
 public class SieveListResult implements IBasicResultConvert<SieveListResult, SieveModel> {
-    private static final String SPIT="-";
+    public static final String SPIT="-";
 
     private String id;
     //患者id
-- 
1.8.3.1