jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 70b026af584b76c4ce9fd005a1db06869c434d39

Authored by yangfei
1 parent 562a3ba1b9
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

妇女档案隐藏姓名、居住地信息

Showing 2 changed files with 32 additions and 8 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ResidentsFacade.java View file @ 70b026a
... ... @@ -115,9 +115,9 @@
115 115 //建档机构
116 116  
117 117 List<String> hospitalList = null;
  118 + String hospital = autoMatchFacade.getHospitalId(userId);
118 119 if (userId!=null){
119 120 hospitalList = new ArrayList<>();
120   - String hospital = autoMatchFacade.getHospitalId(userId);
121 121 if(null!=hospital){
122 122 //当前用户本院
123 123 hospitalList.add(hospital);
124 124  
125 125  
126 126  
... ... @@ -172,18 +172,33 @@
172 172 }
173 173  
174 174 List<ResidentsArchiveModel> modelList = residentsArchiveService.queryResident(query);
  175 +
  176 + Organization og = organizationService.getOrganization(Integer.valueOf(hospital));
  177 + boolean isShow = false;
  178 + if(og!=null&&"2".equals(og.getCityId())&&request.getShowDetail()==1){//需要隐藏姓名、地址
  179 + isShow = true;
  180 + }
175 181 if (CollectionUtils.isNotEmpty(modelList)){
176 182 for (ResidentsArchiveModel model : modelList){
177 183 Map<String,Object> map = new HashMap<>();
178   - map.put("username",model.getUsername());
179   - map.put("certificateNum", FunvCommonUtil.getId(model.getCertificateNum()));
  184 + if(isShow){
  185 + map.put("username",com.lyms.platform.common.utils.StringUtils.encryName(model.getUsername()));
  186 + map.put("householdRegister", com.lyms.platform.common.utils.StringUtils.encryAddr(CommonsHelper.getResidence(model.getProvinceRegisterId(), model.getCityRegisterId(),
  187 + model.getAreaRegisterId(), model.getStreetRegisterId(), model.getAddressRegister(), basicConfigService)));
  188 + map.put("Residence", com.lyms.platform.common.utils.StringUtils.encryAddr(CommonsHelper.getResidence(model.getProvinceId(), model.getCityId(), model.getAreaId(),
  189 + model.getStreetId(), model.getAddress(), basicConfigService)));
  190 + map.put("certificateNum", com.lyms.platform.common.utils.StringUtils.encryCardNo(FunvCommonUtil.getId(model.getCertificateNum())));
  191 + }else{
  192 + map.put("username",model.getUsername());
  193 + map.put("householdRegister", CommonsHelper.getResidence(model.getProvinceRegisterId(), model.getCityRegisterId(),
  194 + model.getAreaRegisterId(), model.getStreetRegisterId(), model.getAddressRegister(), basicConfigService));
  195 + map.put("Residence", CommonsHelper.getResidence(model.getProvinceId(), model.getCityId(), model.getAreaId(),
  196 + model.getStreetId(), model.getAddress(), basicConfigService));
  197 + map.put("certificateNum", FunvCommonUtil.getId(model.getCertificateNum()));
  198 + }
  199 +
180 200 map.put("age",DateUtil.getAge(model.getBirthday()));
181   - map.put("householdRegister", CommonsHelper.getResidence(model.getProvinceRegisterId(), model.getCityRegisterId(),
182   - model.getAreaRegisterId(), model.getStreetRegisterId(), model.getAddressRegister(), basicConfigService));
183   - map.put("Residence", CommonsHelper.getResidence(model.getProvinceId(), model.getCityId(), model.getAreaId(),
184   - model.getStreetId(), model.getAddress(), basicConfigService));
185 201 map.put("mod",referMod(model.getHospitalId(),model.getCertificateNum()));
186   -
187 202 String name = null;
188 203 if (StringUtils.isNotEmpty(model.getHospitalId())){
189 204 Organization organization = organizationService.getOrganization(Integer.parseInt(model.getHospitalId()));
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/ResidentsArchiveQueryRequest.java View file @ 70b026a
... ... @@ -51,7 +51,16 @@
51 51 private String birthday;
52 52 //查询号
53 53 private String queryNo;
  54 + //1-需要隐藏姓名、电话、地址
  55 + private int showDetail;
54 56  
  57 + public int getShowDetail() {
  58 + return showDetail;
  59 + }
  60 +
  61 + public void setShowDetail(int showDetail) {
  62 + this.showDetail = showDetail;
  63 + }
55 64 public String getQueryNo() {
56 65 return queryNo;
57 66 }