jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 2ed03333e7691199416a2542efa2288cd057d4df

Authored by qiaoyuewang
1 parent 43e708df34
Exists in dev

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

Showing 4 changed files with 42 additions and 10 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AntExRecordFacade.java View file @ 2ed0333
... ... @@ -497,10 +497,18 @@
497 497 });
498 498 }
499 499  
500   - for(AntExManagerResult result : data){
501   - //手机号加密 cfl
502   - result.setPhone(StringUtils.encryPhone(result.getPhone()));
  500 + if("2100002419".equals(hospitalId)){
  501 + for(AntExManagerResult result : data){
  502 + //手机号加密 cfl
  503 + result.setPhone(result.getPhone());
  504 + }
  505 + }else{
  506 + for(AntExManagerResult result : data){
  507 + //手机号加密 cfl
  508 + result.setPhone(StringUtils.encryPhone(result.getPhone()));
  509 + }
503 510 }
  511 +
504 512  
505 513 return new BaseListResponse().setData(data).setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功").setPageInfo(antExRecordQuery.getPageInfo());
506 514 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PatientFacade.java View file @ 2ed0333
... ... @@ -2572,7 +2572,7 @@
2572 2572 Map <String, String> cnames = new LinkedHashMap <>();
2573 2573 if (patientsQueryRequest.getQueryType() != null) {
2574 2574 // 0 高危孕妇 1 全部孕妇 2全部产妇 3产后孕妇统计导出
2575   - if (patientsQueryRequest.getQueryType() == 0) {
  2575 + if (patientsQueryRequest.getQueryType() == 0 || patientsQueryRequest.getQueryType() == 4) {
2576 2576 String hospital = autoMatchFacade.getHospitalId(userId);
2577 2577 listResponse = (BaseListResponse) queryHighRisk(patientsQueryRequest, Boolean.TRUE, 1, userId, null, Boolean.FALSE);
2578 2578 List list = listResponse.getData();
... ... @@ -2595,7 +2595,12 @@
2595 2595 data.put("dueDate", rp.getDueDate());
2596 2596 data.put("checkDoctor", rp.getCheckDoctor());
2597 2597 data.put("lName", rp.getlName());
2598   - data.put("phone", patientsQueryRequest.getIsEncry() == 0 ? rp.getRealPhone() : StringUtils.encryPhone(rp.getRealPhone()));
  2598 + if("2100002419".equals(hospital)){
  2599 + data.put("phone", rp.getRealPhone());
  2600 + }else{
  2601 + data.put("phone", patientsQueryRequest.getIsEncry() == 0 ? rp.getRealPhone() : StringUtils.encryPhone(rp.getRealPhone()));
  2602 + }
  2603 +
2599 2604 data.put("serviceType", rp.getServiceType());
2600 2605 data.put("serviceStatus", rp.getServiceStatus());
2601 2606 datas.add(data);
... ... @@ -2642,7 +2647,11 @@
2642 2647 data.put("dueDate", rp.getDueDate());
2643 2648 data.put("checkDoctor", rp.getCheckDoctor());
2644 2649 data.put("lName", rp.getlName());
2645   - data.put("phone", patientsQueryRequest.getIsEncry() == 0 ? rp.getRealPhone() : StringUtils.encryPhone(rp.getRealPhone()));
  2650 + if("2100002419".equals(hospital)){
  2651 + data.put("phone", rp.getRealPhone());
  2652 + }else{
  2653 + data.put("phone", patientsQueryRequest.getIsEncry() == 0 ? rp.getRealPhone() : StringUtils.encryPhone(rp.getRealPhone()));
  2654 + }
2646 2655 data.put("serviceType", rp.getServiceType());
2647 2656 data.put("serviceStatus", rp.getServiceStatus());
2648 2657 datas.add(data);
... ... @@ -2693,7 +2702,11 @@
2693 2702 data.put("cHTimes", rp.getcHTimes());
2694 2703 data.put("checkDoctor", rp.getCheckDoctor());
2695 2704 data.put("lName", rp.getlName());
2696   - data.put("phone", patientsQueryRequest.getIsEncry() == 0 ? rp.getRealPhone() : StringUtils.encryPhone(rp.getRealPhone()));
  2705 + if("2100002419".equals(hospital)){
  2706 + data.put("phone", rp.getRealPhone());
  2707 + }else{
  2708 + data.put("phone", patientsQueryRequest.getIsEncry() == 0 ? rp.getRealPhone() : StringUtils.encryPhone(rp.getRealPhone()));
  2709 + }
2697 2710 data.put("addr", rp.getAddr());
2698 2711 data.put("serviceType", "服务类型");
2699 2712 data.put("serviceStatus", "服务类型");
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SmsConfigFacade.java View file @ 2ed0333
... ... @@ -1282,7 +1282,9 @@
1282 1282 map.put("hospitalName","");
1283 1283 }
1284 1284 map.put("smsType",SmsServiceEnums.getSmsServiceById(obj.getSubTypeId()));
1285   - map.put("phone",StringUtils.encryPhone(obj.getPhone()));
  1285 + if(!"2100002419".equals(obj.getHospitalId())){
  1286 + map.put("phone",StringUtils.encryPhone(obj.getPhone()));
  1287 + }
1286 1288 map.put("objType",ServiceObjEnums.getServiceObjById(obj.getObjtype()));
1287 1289 map.put("planTime", obj.getPlanTime());
1288 1290 map.put("actualTime", obj.getActualTime() == null ? "" : obj.getActualTime());
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/TrackDownServiceImpl.java View file @ 2ed0333
... ... @@ -340,7 +340,11 @@
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   - temp.put("phone", encryption == 0 ? StringUtils.encryPhone(archiveModel.getPhone()) : archiveModel.getPhone());
  343 + if(!"2100002419".equals(archiveModel.getHospitalId())){
  344 + temp.put("phone", encryption == 0 ? StringUtils.encryPhone(archiveModel.getPhone()) : archiveModel.getPhone());
  345 + }else{
  346 + temp.put("phone", archiveModel.getPhone());
  347 + }
344 348 temp.put("age", DateUtil.getAge(archiveModel.getBirthday()));
345 349 temp.put("residentDate", DateUtil.getyyyy_MM_dd(archiveModel.getBuildDay())); // 妇女建档日期
346 350  
... ... @@ -480,7 +484,12 @@
480 484 temp.put("id", patient.getId());
481 485 temp.put("cardNo", encryption == 0 ? StringUtils.encryCardNo(patient.getCardNo()) : patient.getCardNo());
482 486 temp.put("username", patient.getUsername());
483   - temp.put("phone", encryption == 0 ? StringUtils.encryPhone(patient.getPhone()) : patient.getPhone());
  487 + if("2100002419".equals(patient.getHospitalId())){
  488 + temp.put("phone", patient.getPhone());
  489 + }else{
  490 + temp.put("phone", encryption == 0 ? StringUtils.encryPhone(patient.getPhone()) : patient.getPhone());
  491 + }
  492 +
484 493 temp.put("age", DateUtil.getAge(patient.getBirth()));
485 494 //建档时间
486 495 temp.put("bookbuildDate", DateUtil.getyyyy_MM_dd(patient.getBookbuildingDate()));