jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 76af540f63e984c80d4f5a06c02283e7135af5c1

Authored by qiaoyuewang
1 parent bacbaaebf5
Exists in dev

5:导出数据时，手机号不加密

Showing 3 changed files with 38 additions and 11 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java View file @ 76af540
... ... @@ -2190,6 +2190,10 @@
2190 2190 }
2191 2191 }
2192 2192 if(CollectionUtils.isNotEmpty(data) && !hospital.equals("2100002419")){
  2193 + System.out.println("===========================================================");
  2194 + System.out.println("==========================大同数据不加密======================");
  2195 + System.out.println("===========================================================");
  2196 + System.out.println("===========================================================");
2193 2197 for(QuanChanResult result: data){
2194 2198 result.setRealPhone(StringUtils.encryPhone(result.getRealPhone()));
2195 2199 }
... ... @@ -2473,9 +2477,11 @@
2473 2477 }
2474 2478 }
2475 2479 //手机号已经加密，页面显示的是这个字段 南和区人民医院不加密,大同也不加密
2476   - if(CollectionUtils.isNotEmpty(data) && !("1000000115".equals(hospital) || ("2100002419".equals(hospital)))){
2477   - for(RiskPatientsResult result: data){
2478   - result.setRealPhone(StringUtils.encryPhone(result.getRealPhone()));
  2480 + if(CollectionUtils.isNotEmpty(data)){
  2481 + if(!"1000000115".equals(hospital) && !"2100002419".equals(hospital)){
  2482 + for(RiskPatientsResult result: data){
  2483 + result.setRealPhone(StringUtils.encryPhone(result.getRealPhone()));
  2484 + }
2479 2485 }
2480 2486 }
2481 2487 return data;
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/TrackDownFacade.java View file @ 76af540
... ... @@ -1013,7 +1013,11 @@
1013 1013 temp.put("cardNo", encryption == 0 ? StringUtils.encryCardNo(downRecord.getCardNo()) : downRecord.getCardNo());
1014 1014 temp.put("trackDownDateType", downRecord.getTrackType());
1015 1015 temp.put("residenceAddress", CommonsHelper.getFullAddress(downRecord.getProvinceRegisterId(), downRecord.getCityRegisterId(), downRecord.getAreaRegisterId(), downRecord.getAddressRegister(), basicConfigService)); /** 居住地 */
1016   - temp.put("phone", encryption == 0 ? StringUtils.encryPhone(downRecord.getPhone()) : downRecord.getPhone());
  1016 + if(downRecord.getHospitalId().equals("2100002419")){
  1017 + temp.put("phone", downRecord.getPhone());
  1018 + }else{
  1019 + temp.put("phone", encryption == 0 ? StringUtils.encryPhone(downRecord.getPhone()) : downRecord.getPhone());
  1020 + }
1017 1021 TrackDown trackDown = mongoTemplate.findOne(Query.query(Criteria.where("parentId").is(downRecord.getParentId()).and("yn").is(1).and("trackDownDateType").in(7, 10)).with(new Sort(Sort.Direction.DESC, "created")), TrackDown.class);
1018 1022 temp.put("age", DateUtil.getAge(downRecord.getBirth()));
1019 1023 // 追访结果
... ... @@ -1094,7 +1098,11 @@
1094 1098 temp.put("cardNo", encryption == 0 ? StringUtils.encryCardNo(downRecord.getCardNo()) : downRecord.getCardNo());
1095 1099 temp.put("trackDownDateType", downRecord.getTrackType());
1096 1100 temp.put("residenceAddress", CommonsHelper.getFullAddress(downRecord.getProvinceRegisterId(), downRecord.getCityRegisterId(), downRecord.getAreaRegisterId(), downRecord.getAddressRegister(), basicConfigService)); /** 居住地 */
1097   - temp.put("phone", encryption == 0 ? StringUtils.encryPhone(downRecord.getPhone()) : downRecord.getPhone());
  1101 + if("2100002419".equals(downRecord.getHospitalId())){
  1102 + temp.put("phone", downRecord.getPhone());
  1103 + }else{
  1104 + temp.put("phone", encryption == 0 ? StringUtils.encryPhone(downRecord.getPhone()) : downRecord.getPhone());
  1105 + }
1098 1106  
1099 1107 temp.put("fmDate", "--");
1100 1108 temp.put("result", "--");
... ... @@ -1138,7 +1146,12 @@
1138 1146 temp.put("username", downRecord.getUsername());
1139 1147 temp.put("cardNo", encryption == 0 ? StringUtils.encryCardNo(downRecord.getCardNo()) : downRecord.getCardNo());
1140 1148 temp.put("residenceAddress", CommonsHelper.getFullAddress(downRecord.getProvinceRegisterId(), downRecord.getCityRegisterId(), downRecord.getAreaRegisterId(), downRecord.getAddressRegister(), basicConfigService)); /** 居住地 */
1141   - temp.put("phone", encryption == 0 ? StringUtils.encryPhone(downRecord.getPhone()) : downRecord.getPhone());
  1149 + if("2100002419".equals(downRecord.getHospitalId())){
  1150 + temp.put("phone", downRecord.getPhone());
  1151 + }else{
  1152 + temp.put("phone", encryption == 0 ? StringUtils.encryPhone(downRecord.getPhone()) : downRecord.getPhone());
  1153 + }
  1154 +
1142 1155 TrackDown trackDown = mongoTemplate.findOne(Query.query(Criteria.where("parentId").is(downRecord.getParentId()).and("yn").is(1).and("trackDownDateType").is(downRecord.getTrackType())).with(new Sort(Sort.Direction.DESC, "created")), TrackDown.class);
1143 1156 temp.put("age", DateUtil.getAge(downRecord.getBirth()));
1144 1157 // 婚检追访结果
... ... @@ -1171,7 +1184,11 @@
1171 1184 temp.put("trackDownDateType", downRecord.getTrackType());
1172 1185  
1173 1186 temp.put("residenceAddress", CommonsHelper.getFullAddress(downRecord.getProvinceRegisterId(), downRecord.getCityRegisterId(), downRecord.getAreaRegisterId(), downRecord.getAddressRegister(), basicConfigService)); /** 居住地 */
1174   - temp.put("phone", encryption == 0 ? StringUtils.encryPhone(downRecord.getPhone()) : downRecord.getPhone());
  1187 + if("2100002419".equals(downRecord.getHospitalId())){
  1188 + temp.put("phone", downRecord.getPhone());
  1189 + }else{
  1190 + temp.put("phone", encryption == 0 ? StringUtils.encryPhone(downRecord.getPhone()) : downRecord.getPhone());
  1191 + }
1175 1192 List<TrackDown> trackDown = mongoTemplate.find(Query.query(Criteria.where("parentId").is(downRecord.getResidentsArchiveId()).and("yn").is(1).and("trackDownDateType").is(downRecord.getTrackType())).with(new Sort(Sort.Direction.DESC, "created")), TrackDown.class);
1176 1193 temp.put("age", DateUtil.getAge(downRecord.getBirth()));
1177 1194 // 婚检追访结果
... ... @@ -1220,7 +1237,11 @@
1220 1237 temp.put("cardNo", encryption == 0 ? StringUtils.encryCardNo(downRecord.getCardNo()) : downRecord.getCardNo());
1221 1238 temp.put("dueDate", DateUtil.getyyyy_MM_dd(patients.getDueDate())); /** 预产期 */
1222 1239 temp.put("residenceAddress", CommonsHelper.getFullAddress(downRecord.getProvinceRegisterId(), downRecord.getCityRegisterId(), downRecord.getAreaRegisterId(), downRecord.getAddressRegister(), basicConfigService)); /** 居住地 */
1223   - temp.put("phone", encryption == 0 ? StringUtils.encryPhone(downRecord.getPhone()) : downRecord.getPhone());
  1240 + if("2100002419".equals(patients.getHospitalId())){
  1241 + temp.put("phone", encryption == 0 ? StringUtils.encryPhone(patients.getPhone()) : patients.getPhone());
  1242 + }else{
  1243 + temp.put("phone", patients.getPhone());
  1244 + }
1224 1245 temp.put("id", downRecord.getId());
1225 1246 temp.put("parentId", downRecord.getParentId());
1226 1247 if (patients != null) {
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TrackDownServiceImpl.java View file @ 76af540
... ... @@ -340,10 +340,10 @@
340 340 temp.put("id", archiveModel.getId());
341 341 temp.put("cardNo", encryption == 0 ? StringUtils.encryCardNo(archiveModel.getCertificateNum()) : archiveModel.getCertificateNum());
342 342 temp.put("username", archiveModel.getUsername());
343   - if(!"2100002419".equals(archiveModel.getHospitalId())){
344   - temp.put("phone", encryption == 0 ? StringUtils.encryPhone(archiveModel.getPhone()) : archiveModel.getPhone());
345   - }else{
  343 + if("2100002419".equals(archiveModel.getHospitalId())){
346 344 temp.put("phone", archiveModel.getPhone());
  345 + }else{
  346 + temp.put("phone", encryption == 0 ? StringUtils.encryPhone(archiveModel.getPhone()) : archiveModel.getPhone());
347 347 }
348 348 temp.put("age", DateUtil.getAge(archiveModel.getBirthday()));
349 349 temp.put("residentDate", DateUtil.getyyyy_MM_dd(archiveModel.getBuildDay())); // 妇女建档日期