From 107ffd309caaf13b79a2d91e198eb855a4a7eafc Mon Sep 17 00:00:00 2001
From: liquanyu <liquanyu@lymsh.com>
Date: Sun, 18 Sep 2016 18:32:41 +0800
Subject: [PATCH] code update

---
 .../platform/operate/web/facade/PatientFacade.java | 27 ++++++++++++++++++----
 1 file changed, 22 insertions(+), 5 deletions(-)

diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java
index 8016264..33bebdd 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java
@@ -609,7 +609,7 @@ public class PatientFacade {
                         data.put("name", rp.getName());
                         data.put("age", rp.getAge());
                         data.put("dueWeek", rp.getDueWeek());
-                        data.put("rLevel", rp.getrLevel());
+                        data.put("rLevel", getLevel(rp.getrLevel()));
                         data.put("rFactor", rp.getrFactor());
                         data.put("hScore", rp.gethScore());
                         data.put("cTimes", rp.getcTime());
@@ -618,7 +618,7 @@ public class PatientFacade {
                         data.put("dueDate", rp.getDueDate());
                         data.put("checkDoctor", rp.getCheckDoctor());
                         data.put("lName", rp.getlName());
-                        data.put("phone", rp.getPhone());
+                        data.put("phone", rp.getRealPhone());
                         datas.add(data);
                     }
                     cnames.put("name", "姓名");
@@ -644,14 +644,15 @@ public class PatientFacade {
                         data.put("name", rp.getName());
                         data.put("age", rp.getAge());
                         data.put("dueWeek", rp.getDueWeek());
-                        data.put("rLevel", rp.getrLevel());
+
+                        data.put("rLevel", getLevel(rp.getrLevel()));
                         data.put("cTimes", rp.getcTime());
                         data.put("cHTimes", rp.getcHTimes());
                         data.put("cTime", rp.getcTime());
                         data.put("dueDate", rp.getDueDate());
                         data.put("checkDoctor", rp.getCheckDoctor());
                         data.put("lName", rp.getlName());
-                        data.put("phone", rp.getPhone());
+                        data.put("phone", rp.getRealPhone());
                         data.put("serviceType", rp.getServiceType());
                         datas.add(data);
                     }
@@ -682,7 +683,7 @@ public class PatientFacade {
                         data.put("cHTimes", rp.getcHTimes());
                         data.put("checkDoctor", rp.getCheckDoctor());
                         data.put("lName", rp.getlName());
-                        data.put("phone", rp.getPhone());
+                        data.put("phone", rp.getRealPhone());
                         datas.add(data);
                     }
                     cnames.put("name", "姓名");
@@ -705,4 +706,20 @@ public class PatientFacade {
             e.printStackTrace();
         }
     }
+
+
+    private String getLevel(List<Map> levels)
+    {
+
+        String str = "";
+        if (CollectionUtils.isNotEmpty(levels))
+        {
+            for (Map map : levels)
+            {
+                str+=map.get("name")+";";
+            }
+        }
+
+        return str;
+    }
 }
\ No newline at end of file
-- 
1.8.3.1