From 7b97f50c46b196e1cddfb3ef163e9c3a77d6f05c Mon Sep 17 00:00:00 2001
From: jiangjiazhi <jiangjiazhi@lymsh.com>
Date: Fri, 29 Apr 2016 22:04:07 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=9D=83=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../lyms/platform/operate/web/facade/VisitFacade.java  |  7 ++++---
 .../lyms/platform/operate/web/result/VisitResult.java  | 18 ++++++++++++++----
 2 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/VisitFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/VisitFacade.java
index 9617e0d..6da144d 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/VisitFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/VisitFacade.java
@@ -152,7 +152,7 @@ public class VisitFacade {
     public BaseResponse addOneVisit(VisitAddRequest visitRequest) {
         // 获取患者id
         String parentId = visitRequest.getParentId();
-        if (StringUtils.isNotEmpty(parentId)) {
+        if (StringUtils.isNotBlank(parentId)) {
             Patients model;
             PatientsQuery patientsQuery = new PatientsQuery();
             patientsQuery.setId(parentId);
@@ -174,13 +174,14 @@ public class VisitFacade {
             Patients patients = visitRequest.getPatients();
             patients.setType(3);
             patients.setYn(1);
+            patients.setId(null);
             parentId = patientsService.addPatient(patients).getId();
         }
 
         // 如果为空表示新增
-        if (StringUtils.isEmpty(visitRequest.getRequestVisit().getId())) {
+        if (StringUtils.isBlank(visitRequest.getRequestVisit().getId())) {
             VisitModel visitModel = visitRequest.getRequestVisit();
-            if (StringUtils.isNotEmpty(parentId)) {
+            if (StringUtils.isNotBlank(parentId)) {
                 visitModel.setParentId(parentId);
             }
             visitService.addVisit(visitModel);
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/VisitResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/VisitResult.java
index c44726a..f38d99b 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/VisitResult.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/VisitResult.java
@@ -13,7 +13,7 @@ import com.lyms.platform.pojo.PuerperaModel;
 public class VisitResult {
     private String name;
 
-    private int age;
+    private String age;
 
     private String cardNo;
 
@@ -27,6 +27,8 @@ public class VisitResult {
 
     private List<SimpleVisit> data;
 
+    private String phone;
+
     private String id;
 
     public String getId() {
@@ -45,11 +47,11 @@ public class VisitResult {
         this.name = name;
     }
 
-    public int getAge() {
+    public String getAge() {
         return age;
     }
 
-    public void setAge(int age) {
+    public void setAge(String age) {
         this.age = age;
     }
 
@@ -101,6 +103,13 @@ public class VisitResult {
         this.data = data;
     }
 
+    public String getPhone() {
+        return phone;
+    }
+
+    public void setPhone(String phone) {
+        this.phone = phone;
+    }
 
     public void convertToResult1(Patients model,Address address) {
         try {
@@ -108,9 +117,10 @@ public class VisitResult {
         } catch (Exception e) {
         }
         try {
-            setAge(model.getAge());
+            setAge(DateUtil.getyyyy_MM_dd(model.getBirth()));
         }catch (Exception e){
         }
+        setPhone(model.getPhone());
         setId(model.getId());
 //        setCardNo(null==model.getCardNo()?"":model.getCardNo());
         setCardNo(null==model.getPhone()?"":model.getPhone());
-- 
1.8.3.1