From e10e8170f70b7d7fe2b886720dee86b213798e82 Mon Sep 17 00:00:00 2001
From: jiangjiazhi <jiangjiazhi@lymsh.com>
Date: Thu, 8 Jun 2017 10:59:43 +0800
Subject: [PATCH] commit

---
 .../operate/web/controller/RemoteController.java   | 37 +++++++++++++++++++++-
 1 file changed, 36 insertions(+), 1 deletion(-)

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 2677516..7584a85 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
@@ -4,6 +4,8 @@ import com.lyms.platform.biz.service.ArchiveDataServicer;
 import com.lyms.platform.common.annotation.TokenRequired;
 import com.lyms.platform.common.base.BaseController;
 import com.lyms.platform.common.base.LoginContext;
+import com.lyms.platform.common.result.BaseResponse;
+import com.lyms.platform.common.utils.JsonUtil;
 import com.lyms.platform.common.utils.MessageUtil;
 import com.lyms.platform.common.utils.PropertiesUtils;
 import com.lyms.platform.pojo.ArchiveData;
@@ -20,7 +22,9 @@ import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.io.UnsupportedEncodingException;
 import java.net.URLEncoder;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * Created by riecard on 2016/10/18.
@@ -49,6 +53,37 @@ public class RemoteController extends BaseController {
     }
 
 
+
+    /**
+     * 获取预约建档的病史信息
+     *
+     * @param idCard 证件号
+     * @return
+     */
+    @RequestMapping(value = "/bookArchive/history",method = RequestMethod.GET)
+    public void getBookArchive(HttpServletResponse response, String idCard,String cardNum,String phone){
+        ArchiveDataQuery query = new ArchiveDataQuery();
+        query.setIdCard(idCard);
+        query.setCardNum(cardNum);
+        query.setPhone(phone);
+        List<ArchiveData> list = archiveDataServicer.query(query.convertToQuery());
+        if (list!=null && list.size() > 0) {
+            Map map  = JsonUtil.str2Obj(list.get(0).getJsonData(), HashMap.class);
+            if(null!=map&&map.containsKey("history")){
+                Object h  =map.get("history");
+                if(null!=h){
+                    writeJson(response,JsonUtil.obj2JsonString(h));
+                }else{
+                    writeJson(response, "{\"errormsg\": \"没有查询到数据\",\"errorcode\": 4097}");
+                }
+            }else{
+                writeJson(response,"{\"errormsg\": \"没有查询到数据\",\"errorcode\": 4097}");
+            }
+        } else {
+            writeJson(response,"{\"errormsg\": \"没有查询到数据\",\"errorcode\": 4097}");
+        }
+    }
+
     @RequestMapping(value = "/bookArchive",method = RequestMethod.POST)
     public void addBookArchive(HttpServletResponse response,
                                String idCard,
@@ -58,7 +93,7 @@ public class RemoteController extends BaseController {
                                String cardNum,
                                String phone) {
         ArchiveData data = new ArchiveData();
-        data.setId(hospitalId+":"+idCard);
+        data.setId(hospitalId + ":" + idCard);
         data.setHospitalId(hospitalId);
         data.setIdCard(idCard);
         data.setName(name);
-- 
1.8.3.1