diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/CancerScreeningController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/CancerScreeningController.java index fa1d50a..65418e4 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/CancerScreeningController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/CancerScreeningController.java @@ -127,9 +127,8 @@ public class CancerScreeningController extends BaseController { */ @ResponseBody @RequestMapping(value = "/{id}", method = RequestMethod.GET) - @TokenRequired public BaseResponse getAppInfo(@PathVariable String id,HttpServletRequest request) { - return cancerScreenService.getCancerScreenInfo(id,getUserId(request)); + return cancerScreenService.getCancerScreenInfo(id); } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/CancerScreeningFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/CancerScreeningFacade.java index 5a1f5bd..da20a37 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/CancerScreeningFacade.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/CancerScreeningFacade.java @@ -199,19 +199,10 @@ public class CancerScreeningFacade { map.put("id", model.getId()); map.put("created", DateUtil.getyyyy_MM_dd(model.getCreated())); map.put("sex", "女"); - //秦皇岛两癌脱敏 - if ("2".equals(organization.getCityId())) - { - map.put("name", com.lyms.platform.common.utils.StringUtils.encryName(model.getUsername())); - map.put("cardNum", com.lyms.platform.common.utils.StringUtils.encryCardNo(model.getCertificateNum())); - map.put("phone", com.lyms.platform.common.utils.StringUtils.encryPhone(model.getPhone())); - } - else - { - map.put("name", model.getUsername()); - map.put("cardNum", model.getCertificateNum()); - map.put("phone", model.getPhone()); - } + + map.put("name", model.getUsername()); + map.put("cardNum", model.getCertificateNum()); + map.put("phone", model.getPhone()); map.put("age", DateUtil.getAge(model.getBirthday())); map.put("liveAddress", CommonsHelper.getResidence(model.getProvinceId(), model.getCityId(), model.getAreaId(), model.getStreetId(), model.getAddress(), basicConfigService)); @@ -455,10 +446,7 @@ public class CancerScreeningFacade { * @param id * @return */ - public BaseResponse getCancerScreenInfo(String id,Integer userId) { - String hospitalId = autoMatchFacade.getHospitalId(userId); - Organization organization = organizationService.getOrganization(Integer.parseInt(hospitalId)); - + public BaseResponse getCancerScreenInfo(String id) { BaseResponse baseResponse = new BaseResponse(); CancerScreeningModel cancerScreeningModel = cancerScreenService.findOneById(id); CancerScreeningResult result = new CancerScreeningResult(); @@ -488,16 +476,6 @@ public class CancerScreeningFacade { String addressStr = CommonsHelper.getResidence(cancerScreeningModel.getProvinceId(), cancerScreeningModel.getCityId(), cancerScreeningModel.getAreaId(), cancerScreeningModel.getStreetId(), cancerScreeningModel.getAddress(), basicConfigService); result.setAddressStr(addressStr); - - - //秦皇岛两癌脱敏 - if ("2".equals(organization.getCityId())) - { - result.setUsername(com.lyms.platform.common.utils.StringUtils.encryName(result.getUsername())); - result.setCertificateNum(com.lyms.platform.common.utils.StringUtils.encryCardNo(result.getCertificateNum())); - result.setPhone(com.lyms.platform.common.utils.StringUtils.encryPhone(result.getPhone())); - } - baseResponse.setObject(result); return baseResponse; } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/CervicalCancerServiceImpl.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/CervicalCancerServiceImpl.java index 48cf9c1..6f4ce82 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/CervicalCancerServiceImpl.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/CervicalCancerServiceImpl.java @@ -776,10 +776,6 @@ public class CervicalCancerServiceImpl implements CervicalCancerService { */ @Override public BaseResponse getPatientInfoByIdCard(CommonParamRequest param,Integer userId) { - - String hospitalId = autoMatchFacade.getHospitalId(userId); - Organization organization = organizationService.getOrganization(Integer.parseInt(hospitalId)); - String cardNo = param.getCardNo(); String vcCardNo = param.getVcCardNo(); if (StringUtils.isEmpty(cardNo) && StringUtils.isEmpty(vcCardNo)) { @@ -849,11 +845,11 @@ public class CervicalCancerServiceImpl implements CervicalCancerService { baseResponse.setObject(result); return baseResponse; } - baseResponse.setObject(getCervcalList(modelByIdCardNos,organization)); + baseResponse.setObject(getCervcalList(modelByIdCardNos)); return baseResponse; } - private List getCervcalList(List modelByIdCardNos,Organization organization) + private List getCervcalList(List modelByIdCardNos) { List list = new ArrayList<>(); for (CervicalCancerModel model : modelByIdCardNos) @@ -878,15 +874,6 @@ public class CervicalCancerServiceImpl implements CervicalCancerService { result.setNationStr(CommonsHelper.getName1(residentsArchiveModels.get(0).getNationId(), basicConfigService)); result.setLevelTypeStr(CommonsHelper.getName1(residentsArchiveModels.get(0).getLevelTypeId(), basicConfigService)); } - - //秦皇岛两癌脱敏 - if ("2".equals(organization.getCityId())) - { - result.setName(com.lyms.platform.common.utils.StringUtils.encryName(result.getName())); - result.setIdCardNo(com.lyms.platform.common.utils.StringUtils.encryCardNo(result.getIdCardNo())); - result.setPhone(com.lyms.platform.common.utils.StringUtils.encryPhone(result.getPhone())); - } - result.setCheckPackage(model.getCheckPackage()); list.add(result); }