From f8749ddcf7d57f72aae3bfb7710ce8542b2f65f6 Mon Sep 17 00:00:00 2001
From: jiangjiazhi <jiangjiazhi@lymsh.com>
Date: Mon, 4 Jul 2016 14:45:32 +0800
Subject: [PATCH] 1

---
 .../lyms/platform/pojo/ReferralApplyOrderModel.java    | 10 ++++++++++
 .../lyms/platform/query/ReferralApplyOrderQuery.java   | 12 ++++++++++++
 .../platform/operate/web/facade/ApplyOrderFacade.java  |  4 +++-
 .../operate/web/request/ApplyOrderQueryRequest.java    | 18 +++++++++++++++---
 4 files changed, 40 insertions(+), 4 deletions(-)

diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/ReferralApplyOrderModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/ReferralApplyOrderModel.java
index b544b8a..0876cc2 100644
--- a/platform-dal/src/main/java/com/lyms/platform/pojo/ReferralApplyOrderModel.java
+++ b/platform-dal/src/main/java/com/lyms/platform/pojo/ReferralApplyOrderModel.java
@@ -55,6 +55,16 @@ public class ReferralApplyOrderModel {
     private Date created;
     //申请单状态  0 已接收 1 已转出 2 建议转诊
     private Integer status;
+    //转诊类型   1 儿童 2 孕妇
+    private Integer type;
+
+    public Integer getType() {
+        return type;
+    }
+
+    public void setType(Integer type) {
+        this.type = type;
+    }
 
     public String getOutHospitalId() {
         return outHospitalId;
diff --git a/platform-dal/src/main/java/com/lyms/platform/query/ReferralApplyOrderQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/ReferralApplyOrderQuery.java
index 72819dc..f3ad209 100644
--- a/platform-dal/src/main/java/com/lyms/platform/query/ReferralApplyOrderQuery.java
+++ b/platform-dal/src/main/java/com/lyms/platform/query/ReferralApplyOrderQuery.java
@@ -38,6 +38,15 @@ public class ReferralApplyOrderQuery extends BaseQuery implements IConvertToNati
     private String transferredHospital;
     private String outHospitalId;
     private String phone;
+    private Integer type;
+
+    public Integer getType() {
+        return type;
+    }
+
+    public void setType(Integer type) {
+        this.type = type;
+    }
 
     public String getPhone() {
         return phone;
@@ -102,6 +111,9 @@ public class ReferralApplyOrderQuery extends BaseQuery implements IConvertToNati
         if(null!=cardNo){
             condition=condition.and("cardNo",cardNo, MongoOper.IS);
         }
+        if(null!=type){
+            condition=condition.and("type",type, MongoOper.IS);
+        }
         return condition.toMongoQuery();
     }
 
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java
index db22c9c..12fc6f4 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java
@@ -62,7 +62,8 @@ public class ApplyOrderFacade {
             referralApplyOrderModel.setDueDate(patients.getDueDate());
             referralApplyOrderModel.setName(patients.getUsername());
         }
-
+        //孕妇
+        referralApplyOrderModel.setType(2);
         List<Integer> areaId = autoMatchFacade.matchOrgId(userId);
         referralApplyOrderModel.setOutHospitalId(areaId.get(0) + "");
         applyOrderService.addOneReferralApplyOrder(referralApplyOrderModel);
@@ -127,6 +128,7 @@ public class ApplyOrderFacade {
         referralApplyOrderQuery.setPhone(applyOrderQueryRequest.getPhone());
         referralApplyOrderQuery.setTransferredHospital(applyOrderQueryRequest.getTransferredHospital());
         referralApplyOrderQuery.setLimit(applyOrderQueryRequest.getLimit());
+        referralApplyOrderQuery.setType(applyOrderQueryRequest.getType());
         //1 转入  0转出
         if ("1".equals(applyOrderQueryRequest.getType())) {
             List data = autoMatchFacade.matchOrgId(userId);
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/ApplyOrderQueryRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/ApplyOrderQueryRequest.java
index 119b32c..96e2984 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/ApplyOrderQueryRequest.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/ApplyOrderQueryRequest.java
@@ -39,7 +39,11 @@ public class ApplyOrderQueryRequest extends BasePageQueryRequest {
     /**
      * 1 转入 0 转出
      */
-    private String type;
+    private String action;
+    /**
+     *  1 儿童 2 孕妇
+     */
+    private Integer type;
 
     public String getPhone() {
         return phone;
@@ -57,11 +61,19 @@ public class ApplyOrderQueryRequest extends BasePageQueryRequest {
         this.transferredHospital = transferredHospital;
     }
 
-    public String getType() {
+    public String getAction() {
+        return action;
+    }
+
+    public void setAction(String action) {
+        this.action = action;
+    }
+
+    public Integer getType() {
         return type;
     }
 
-    public void setType(String type) {
+    public void setType(Integer type) {
         this.type = type;
     }
 
-- 
1.8.3.1