From 47304a89f00827ed33a317640dfb8bd5a760eba1 Mon Sep 17 00:00:00 2001
From: liquanyu <liquanyu@lymsh.com>
Date: Tue, 18 Jul 2017 10:35:14 +0800
Subject: [PATCH] update code

---
 .../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 7584a85..e4b5cf6 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
@@ -1,15 +1,23 @@
 package com.lyms.platform.operate.web.controller;
 
 import com.lyms.platform.biz.service.ArchiveDataServicer;
+import com.lyms.platform.biz.service.PatientsService;
 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.enums.YnEnums;
 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.common.utils.StringUtils;
+import com.lyms.platform.operate.web.facade.AutoMatchFacade;
+import com.lyms.platform.operate.web.facade.PatientFacade;
 import com.lyms.platform.pojo.ArchiveData;
+import com.lyms.platform.pojo.Patients;
 import com.lyms.platform.query.ArchiveDataQuery;
+import com.lyms.platform.query.PatientsQuery;
+import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.httpclient.HttpClient;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
@@ -32,9 +40,16 @@ import java.util.Map;
 @Controller
 public class RemoteController extends BaseController {
 
+
+    @Autowired
+    private PatientsService patientsService;
+
     @Autowired
     private ArchiveDataServicer archiveDataServicer;
 
+    @Autowired
+    private AutoMatchFacade autoMatchFacade;
+
     public static final String  center_statistics_url= PropertiesUtils.getPropertyValue("center_statistics_url");
 
     @RequestMapping(value = "/bookArchive",method = RequestMethod.GET)
@@ -61,12 +76,32 @@ public class RemoteController extends BaseController {
      * @return
      */
     @RequestMapping(value = "/bookArchive/history",method = RequestMethod.GET)
-    public void getBookArchive(HttpServletResponse response, String idCard,String cardNum,String phone){
+    @TokenRequired
+    public void getBookArchive(HttpServletResponse response, String idCard,String cardNum,String phone, HttpServletRequest request){
+        LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
         ArchiveDataQuery query = new ArchiveDataQuery();
         query.setIdCard(idCard);
         query.setCardNum(cardNum);
         query.setPhone(phone);
         List<ArchiveData> list = archiveDataServicer.query(query.convertToQuery());
+
+        if (CollectionUtils.isEmpty(list) && StringUtils.isNotEmpty(cardNum))
+        {
+            //根据用户id获取医院ID
+            String hospitalId = autoMatchFacade.getHospitalId(loginState.getId());
+            PatientsQuery patientsQuery = new PatientsQuery();
+            patientsQuery.setYn(YnEnums.YES.getId());
+            patientsQuery.setVcCardNo(cardNum);
+            patientsQuery.setHospitalId(hospitalId);
+            List<Patients> patientses = patientsService.queryPatient(patientsQuery);
+            if (CollectionUtils.isNotEmpty(patientses) && patientses.get(0) != null && StringUtils.isNotEmpty(patientses.get(0).getCardNo()))
+            {
+                query = new ArchiveDataQuery();
+                query.setIdCard(patientses.get(0).getCardNo());
+                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")){
-- 
1.8.3.1