From b2db7434d66c66d4780b8954b8a27c2e410ae367 Mon Sep 17 00:00:00 2001
From: jiangjiazhi <jiangjiazhi@lymsh.com>
Date: Thu, 11 Aug 2016 17:18:47 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=AE=BE=E7=BD=AEparentid?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/lyms/platform/operate/web/facade/PatientFacade.java    |  2 +-
 .../lyms/platform/operate/web/request/PatientQueryRequest.java | 10 +++++++++-
 .../lyms/platform/operate/web/result/ApplyOrderOutResult.java  |  4 ++--
 3 files changed, 12 insertions(+), 4 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 80b18fb..2357662 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
@@ -236,7 +236,7 @@ public class PatientFacade {
 
     public BaseResponse findPatient(PatientQueryRequest patientQueryRequest) {
         PatientsQuery patientsQuery = new PatientsQuery();
-
+        patientsQuery.setPid(patientQueryRequest.getPid());
         patientsQuery.setId(patientQueryRequest.getId());
         patientsQuery.setPhone(patientQueryRequest.getPhone());
         patientsQuery.setCardNo(patientQueryRequest.getCardNo());
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/PatientQueryRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/PatientQueryRequest.java
index ad59129..099d652 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/PatientQueryRequest.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/PatientQueryRequest.java
@@ -7,7 +7,7 @@ public class PatientQueryRequest {
     private String id;
     private String phone;
     private String cardNo;
-
+    private String pid;
     public String getCardNo() {
         return cardNo;
     }
@@ -31,4 +31,12 @@ public class PatientQueryRequest {
     public void setPhone(String phone) {
         this.phone = phone;
     }
+
+    public String getPid() {
+        return pid;
+    }
+
+    public void setPid(String pid) {
+        this.pid = pid;
+    }
 }
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/ApplyOrderOutResult.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/ApplyOrderOutResult.java
index 8e1b65c..6a5e293 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/ApplyOrderOutResult.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/ApplyOrderOutResult.java
@@ -229,7 +229,7 @@ public class ApplyOrderOutResult {
     }
 
     public String getrLevel() {
-        if(null==rLevel){
+        if(StringUtils.isEmpty(rLevel)){
             return SPIT;
         }
         return rLevel;
@@ -240,7 +240,7 @@ public class ApplyOrderOutResult {
     }
 
     public String getrRisk() {
-        if(null==rRisk){
+        if(StringUtils.isEmpty(rRisk)){
             return SPIT;
         }
         return rRisk;
-- 
1.8.3.1