From 08eda14ecab35938a582abbad40315923a6bf575 Mon Sep 17 00:00:00 2001
From: jiangjiazhi <jiangjiazhi@lymsh.com>
Date: Mon, 8 Aug 2016 16:43:58 +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

---
 .../java/com/lyms/platform/biz/service/PatientsService.java    |  4 ++--
 .../src/main/java/com/lyms/platform/pojo/SieveModel.java       | 10 +++++-----
 .../src/main/java/com/lyms/platform/query/SieveQuery.java      |  5 ++++-
 .../com/lyms/platform/operate/web/facade/ApplyOrderFacade.java |  2 +-
 4 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/PatientsService.java b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/PatientsService.java
index 381d5ba..86e4155 100644
--- a/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/PatientsService.java
+++ b/platform-biz-patient-service/src/main/java/com/lyms/platform/biz/service/PatientsService.java
@@ -164,7 +164,7 @@ public class PatientsService {
                 List<SieveModel> list = sieveDao.queryList(sieveQuery.convertToQuery());
                 if (CollectionUtils.isEmpty(list)) {
                     SieveModel sieveModel = convertToModel(patients);
-                    sieveModel.setForm("1");
+                    sieveModel.setFrom("1");
                     sieveDao.addChanQianSieve(sieveModel);
                 }
             }
@@ -225,7 +225,7 @@ public class PatientsService {
                 List<SieveModel> list = sieveDao.queryList(sieveQuery.convertToQuery());
                 if (CollectionUtils.isEmpty(list)) {
                     SieveModel sieveModel = convertToModel(patient);
-                    sieveModel.setForm("0");
+                    sieveModel.setFrom("0");
                     sieveDao.addChanQianSieve(sieveModel);
                 }
             }
diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/SieveModel.java b/platform-dal/src/main/java/com/lyms/platform/pojo/SieveModel.java
index 7e61084..270a2c2 100644
--- a/platform-dal/src/main/java/com/lyms/platform/pojo/SieveModel.java
+++ b/platform-dal/src/main/java/com/lyms/platform/pojo/SieveModel.java
@@ -46,18 +46,18 @@ public class SieveModel extends BaseModel {
     //录入人员
     private String publishName;
     //数据来源 0 自动跑进来的  1 建档进来 2 产筛申请进来
-    private String form;
+    private String from;
 
     private Date created;
     private Date modified;
     private Integer yn;
 
-    public String getForm() {
-        return form;
+    public String getFrom() {
+        return from;
     }
 
-    public void setForm(String form) {
-        this.form = form;
+    public void setFrom(String from) {
+        this.from = from;
     }
 
     public String getHospitalId() {
diff --git a/platform-dal/src/main/java/com/lyms/platform/query/SieveQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/SieveQuery.java
index f296d46..08cab94 100644
--- a/platform-dal/src/main/java/com/lyms/platform/query/SieveQuery.java
+++ b/platform-dal/src/main/java/com/lyms/platform/query/SieveQuery.java
@@ -39,7 +39,7 @@ public class SieveQuery extends BaseQuery implements IConvertToNativeQuery {
     //状态
     private Integer status;
     private String cardNo;
-
+    private String from;
     private Integer yn;
 
     //孕周开始
@@ -104,6 +104,9 @@ public class SieveQuery extends BaseQuery implements IConvertToNativeQuery {
         if (null != id) {
             condition = condition.and("id", id, MongoOper.IS);
         }
+        if(null!=from){
+            condition=condition.and("from",from,MongoOper.IS);
+        }
         if (null != hospitalId) {
             condition = condition.and("hospitalId", hospitalId, MongoOper.IS);
         }
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 acd11af..2a4af57 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
@@ -133,7 +133,7 @@ public class ApplyOrderFacade {
                     Patients patients = patientsService.findOnePatientById(orderModel.getParentId());
                     if (null != patients) {
                         SieveModel sieveModel = patientsService.convertToModel(patients);
-                        sieveModel.setForm("2");
+                        sieveModel.setFrom("2");
                         sieveModel.setHospitalId(orderModel.getHospitalId());
                         sieveService.addChanQianSieve(sieveModel);
                     }
-- 
1.8.3.1