From ccd3a7cc4d28018d63e769be7f2260ec28528b68 Mon Sep 17 00:00:00 2001
From: landong2015 <hanshaofeng@lymsh.com>
Date: Tue, 13 Dec 2016 14:40:15 +0800
Subject: [PATCH] update

---
 .../platform/operate/web/facade/ResidentsArchiveFacade.java  | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ResidentsArchiveFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ResidentsArchiveFacade.java
index 3da0dbf..a6a0b04 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ResidentsArchiveFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ResidentsArchiveFacade.java
@@ -192,7 +192,7 @@ public class ResidentsArchiveFacade{
         if (StringUtils.isNotEmpty(addRequest.getCertificateNum())){
             //判断该证件号码是否在该医院建档
             query.setCertificateNum(addRequest.getCertificateNum());
-//            query.setCertificateTypeId(addRequest.getCertificateTypeId());
+            query.setCertificateTypeId(addRequest.getCertificateTypeId());
             List<ResidentsArchiveModel> modelList = residentsArchiveService.queryResident(query);
             if (CollectionUtils.isNotEmpty(modelList)){
                 ResidentsArchiveModel archiveModel = modelList.get(0);
@@ -265,6 +265,7 @@ public class ResidentsArchiveFacade{
         if (StringUtils.isNotEmpty(addRequest.getCertificateNum())) {
             //判断该证件号码是否在该医院建档
             query.setCertificateNum(addRequest.getCertificateNum());
+            query.setCertificateTypeId(addRequest.getCertificateTypeId());
             List<ResidentsArchiveModel> modelList = residentsArchiveService.queryResident(query);
             if (CollectionUtils.isNotEmpty(modelList)){
                 br.setErrorcode(ErrorCodeConstants.DATA_EXIST);
@@ -285,6 +286,7 @@ public class ResidentsArchiveFacade{
 
         if (StringUtils.isNotEmpty(addRequest.getVcCardNo())){
             query.setCertificateNum(null);
+            query.setPhone(null);
             //判断该就诊卡号是否在该医院建档
             query.setVcCardNo(addRequest.getVcCardNo());
             List<ResidentsArchiveModel> modelList = residentsArchiveService.queryResident(query);
@@ -456,6 +458,8 @@ public class ResidentsArchiveFacade{
 
         List<Map> data = new ArrayList<>();
 
+        String hospitalId = autoMatchFacade.getHospitalId(userId);
+
         //查询条件
         ResidentsArchiveQuery query = new ResidentsArchiveQuery();
         query.setLimit(queryRequest.getLimit());
@@ -463,6 +467,10 @@ public class ResidentsArchiveFacade{
         query.setNeed(need);
         query.setYn(YnEnums.YES.getId());
 
+        if (hospitalId!=null){
+            query.setHospitalId(hospitalId);
+        }
+
         //只查询女性
         query.setSex(SystemConfig.WOMAN_ID);
 
@@ -471,7 +479,7 @@ public class ResidentsArchiveFacade{
         query.setAreaId(queryRequest.getAreaId());
         query.setVcCardNo(queryRequest.getVcCardNo());
         query.setCertificateNum(queryRequest.getCardNo());
-//        query.setCertificateTypeId(queryRequest.getCertificateTypeId());
+        query.setCertificateTypeId(queryRequest.getCertificateTypeId());
         query.setUsername(queryRequest.getUsername());
         query.setPhone(queryRequest.getPhone());
 
-- 
1.8.3.1