From 70b026af584b76c4ce9fd005a1db06869c434d39 Mon Sep 17 00:00:00 2001
From: yangfei <yangfei@lymsh.com>
Date: Mon, 16 Apr 2018 22:46:52 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A6=87=E5=A5=B3=E6=A1=A3=E6=A1=88=E9=9A=90?=
 =?UTF-8?q?=E8=97=8F=E5=A7=93=E5=90=8D=E3=80=81=E5=B1=85=E4=BD=8F=E5=9C=B0?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../operate/web/facade/ResidentsFacade.java        | 31 ++++++++++++++++------
 .../web/request/ResidentsArchiveQueryRequest.java  |  9 +++++++
 2 files changed, 32 insertions(+), 8 deletions(-)

diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ResidentsFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ResidentsFacade.java
index aba1de5..f39ab2f 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ResidentsFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ResidentsFacade.java
@@ -115,9 +115,9 @@ public class ResidentsFacade {
         //建档机构
 
         List<String> hospitalList = null;
+        String hospital = autoMatchFacade.getHospitalId(userId);
         if (userId!=null){
             hospitalList = new ArrayList<>();
-            String hospital = autoMatchFacade.getHospitalId(userId);
             if(null!=hospital){
                 //当前用户本院
                 hospitalList.add(hospital);
@@ -172,18 +172,33 @@ public class ResidentsFacade {
         }
 
         List<ResidentsArchiveModel> modelList = residentsArchiveService.queryResident(query);
+
+        Organization og = organizationService.getOrganization(Integer.valueOf(hospital));
+        boolean isShow = false;
+        if(og!=null&&"2".equals(og.getCityId())&&request.getShowDetail()==1){//需要隐藏姓名、地址
+            isShow = true;
+        }
         if (CollectionUtils.isNotEmpty(modelList)){
             for (ResidentsArchiveModel model : modelList){
                 Map<String,Object> map = new HashMap<>();
-                map.put("username",model.getUsername());
-                map.put("certificateNum", FunvCommonUtil.getId(model.getCertificateNum()));
+                if(isShow){
+                    map.put("username",com.lyms.platform.common.utils.StringUtils.encryName(model.getUsername()));
+                    map.put("householdRegister", com.lyms.platform.common.utils.StringUtils.encryAddr(CommonsHelper.getResidence(model.getProvinceRegisterId(), model.getCityRegisterId(),
+                            model.getAreaRegisterId(), model.getStreetRegisterId(), model.getAddressRegister(), basicConfigService)));
+                    map.put("Residence", com.lyms.platform.common.utils.StringUtils.encryAddr(CommonsHelper.getResidence(model.getProvinceId(), model.getCityId(), model.getAreaId(),
+                            model.getStreetId(), model.getAddress(), basicConfigService)));
+                    map.put("certificateNum", com.lyms.platform.common.utils.StringUtils.encryCardNo(FunvCommonUtil.getId(model.getCertificateNum())));
+                }else{
+                    map.put("username",model.getUsername());
+                    map.put("householdRegister", CommonsHelper.getResidence(model.getProvinceRegisterId(), model.getCityRegisterId(),
+                            model.getAreaRegisterId(), model.getStreetRegisterId(), model.getAddressRegister(), basicConfigService));
+                    map.put("Residence", CommonsHelper.getResidence(model.getProvinceId(), model.getCityId(), model.getAreaId(),
+                            model.getStreetId(), model.getAddress(), basicConfigService));
+                    map.put("certificateNum", FunvCommonUtil.getId(model.getCertificateNum()));
+                }
+
                 map.put("age",DateUtil.getAge(model.getBirthday()));
-                map.put("householdRegister", CommonsHelper.getResidence(model.getProvinceRegisterId(), model.getCityRegisterId(),
-                        model.getAreaRegisterId(), model.getStreetRegisterId(), model.getAddressRegister(), basicConfigService));
-                map.put("Residence", CommonsHelper.getResidence(model.getProvinceId(), model.getCityId(), model.getAreaId(),
-                        model.getStreetId(), model.getAddress(), basicConfigService));
                 map.put("mod",referMod(model.getHospitalId(),model.getCertificateNum()));
-
                 String name = null;
                 if (StringUtils.isNotEmpty(model.getHospitalId())){
                     Organization organization = organizationService.getOrganization(Integer.parseInt(model.getHospitalId()));
diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/ResidentsArchiveQueryRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/ResidentsArchiveQueryRequest.java
index 2bc8054..63ec96f 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/ResidentsArchiveQueryRequest.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/ResidentsArchiveQueryRequest.java
@@ -51,7 +51,16 @@ public class ResidentsArchiveQueryRequest extends BasePageQueryRequest{
     private String birthday;
     //查询号
     private String queryNo;
+    //1-需要隐藏姓名、电话、地址
+    private int showDetail;
 
+    public int getShowDetail() {
+        return showDetail;
+    }
+
+    public void setShowDetail(int showDetail) {
+        this.showDetail = showDetail;
+    }
     public String getQueryNo() {
         return queryNo;
     }
-- 
1.8.3.1