From 93388d0c9984617e3ee4854072e593d8e172caea Mon Sep 17 00:00:00 2001
From: landong2015 <hanshaofeng@lymsh.com>
Date: Fri, 25 Nov 2016 09:15:53 +0800
Subject: [PATCH] =?UTF-8?q?commit=20=E9=A2=84=E7=BA=A6=E5=BB=BA=E6=A1=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/lyms/platform/pojo/ArchiveData.java   | 18 ++++++++++++++++
 .../com/lyms/platform/query/ArchiveDataQuery.java  | 24 ++++++++++++++++++++++
 .../operate/web/controller/RemoteController.java   | 14 +++++++++++--
 3 files changed, 54 insertions(+), 2 deletions(-)

diff --git a/platform-dal/src/main/java/com/lyms/platform/pojo/ArchiveData.java b/platform-dal/src/main/java/com/lyms/platform/pojo/ArchiveData.java
index a5af11a..e98972c 100644
--- a/platform-dal/src/main/java/com/lyms/platform/pojo/ArchiveData.java
+++ b/platform-dal/src/main/java/com/lyms/platform/pojo/ArchiveData.java
@@ -11,9 +11,27 @@ public class ArchiveData implements java.io.Serializable {
     private String id;
     private String name;
     private String idCard;
+    private String cardNum;
+    private String phone;
     private String hospitalId;
     private String jsonData;
 
+    public String getCardNum() {
+        return cardNum;
+    }
+
+    public void setCardNum(String cardNum) {
+        this.cardNum = cardNum;
+    }
+
+    public String getPhone() {
+        return phone;
+    }
+
+    public void setPhone(String phone) {
+        this.phone = phone;
+    }
+
     public String getId() {
         return id;
     }
diff --git a/platform-dal/src/main/java/com/lyms/platform/query/ArchiveDataQuery.java b/platform-dal/src/main/java/com/lyms/platform/query/ArchiveDataQuery.java
index 65e30ef..d3f07e5 100644
--- a/platform-dal/src/main/java/com/lyms/platform/query/ArchiveDataQuery.java
+++ b/platform-dal/src/main/java/com/lyms/platform/query/ArchiveDataQuery.java
@@ -14,6 +14,8 @@ public class ArchiveDataQuery extends BaseQuery implements IConvertToNativeQuery
     private String id;
     private String idCard;
     private String hospitalId;
+    private String cardNum;
+    private String phone;
 
     public String getId() {
         return id;
@@ -39,6 +41,22 @@ public class ArchiveDataQuery extends BaseQuery implements IConvertToNativeQuery
         this.hospitalId = hospitalId;
     }
 
+    public String getCardNum() {
+        return cardNum;
+    }
+
+    public void setCardNum(String cardNum) {
+        this.cardNum = cardNum;
+    }
+
+    public String getPhone() {
+        return phone;
+    }
+
+    public void setPhone(String phone) {
+        this.phone = phone;
+    }
+
     @Override
     public MongoQuery convertToQuery() {
         MongoCondition condition=MongoCondition.newInstance();
@@ -51,6 +69,12 @@ public class ArchiveDataQuery extends BaseQuery implements IConvertToNativeQuery
         if(null!=id){
             condition= condition.and("id",id, MongoOper.IS);
         }
+        if(null!=cardNum){
+            condition= condition.and("cardNum",cardNum, MongoOper.IS);
+        }
+        if(null!=phone){
+            condition= condition.and("phone",phone, MongoOper.IS);
+        }
         return condition.toMongoQuery();
     }
 }
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/RemoteController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/RemoteController.java
index 7c8ff2a..00e1e8c 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/RemoteController.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/RemoteController.java
@@ -34,9 +34,11 @@ public class RemoteController extends BaseController {
     public static final String  center_statistics_url= PropertiesUtils.getPropertyValue("center_statistics_url");
 
     @RequestMapping(value = "/bookArchive",method = RequestMethod.GET)
-    public void queryBookArchive(HttpServletResponse response, String idCard, String hospitalId) {
+    public void queryBookArchive(HttpServletResponse response, String idCard, String hospitalId,String cardNum,String phone) {
         ArchiveDataQuery query = new ArchiveDataQuery();
         query.setIdCard(idCard);
+        query.setCardNum(cardNum);
+        query.setPhone(phone);
 //        query.setHospitalId(hospitalId);
         List<ArchiveData> list = archiveDataServicer.query(query.convertToQuery());
         if (list!=null && list.size() > 0) {
@@ -47,12 +49,20 @@ public class RemoteController extends BaseController {
     }
 
     @RequestMapping(value = "/bookArchive",method = RequestMethod.POST)
-    public void addBookArchive(HttpServletResponse response, String idCard, String hospitalId, String jsonData, String name) {
+    public void addBookArchive(HttpServletResponse response,
+                               String idCard,
+                               String hospitalId,
+                               String jsonData,
+                               String name,
+                               String cardNum,
+                               String phone) {
         ArchiveData data = new ArchiveData();
         data.setId(hospitalId+":"+idCard);
         data.setHospitalId(hospitalId);
         data.setIdCard(idCard);
         data.setName(name);
+        data.setCardNum(cardNum);
+        data.setPhone(phone);
         data.setJsonData(jsonData);
         archiveDataServicer.saveArchiveData(data);
         writeString(response,"success");
-- 
1.8.3.1