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;
     }