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 b555a31..fa1d50a 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,8 +127,9 @@ public class CancerScreeningController extends BaseController { */ @ResponseBody @RequestMapping(value = "/{id}", method = RequestMethod.GET) - public BaseResponse getAppInfo(@PathVariable String id) { - return cancerScreenService.getCancerScreenInfo(id); + @TokenRequired + public BaseResponse getAppInfo(@PathVariable String id,HttpServletRequest request) { + return cancerScreenService.getCancerScreenInfo(id,getUserId(request)); } 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 d508fe3..5a1f5bd 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 @@ -198,10 +198,21 @@ public class CancerScreeningFacade { Map map = new HashMap <>(); map.put("id", model.getId()); map.put("created", DateUtil.getyyyy_MM_dd(model.getCreated())); - map.put("name", model.getUsername()); map.put("sex", "女"); - map.put("cardNum", model.getCertificateNum()); - map.put("phone", model.getPhone()); + //秦皇岛两癌脱敏 + 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("age", DateUtil.getAge(model.getBirthday())); map.put("liveAddress", CommonsHelper.getResidence(model.getProvinceId(), model.getCityId(), model.getAreaId(), model.getStreetId(), model.getAddress(), basicConfigService)); map.put("sfZhzd", model.getSfZhzd()); @@ -444,7 +455,10 @@ public class CancerScreeningFacade { * @param id * @return */ - public BaseResponse getCancerScreenInfo(String id) { + public BaseResponse getCancerScreenInfo(String id,Integer userId) { + String hospitalId = autoMatchFacade.getHospitalId(userId); + Organization organization = organizationService.getOrganization(Integer.parseInt(hospitalId)); + BaseResponse baseResponse = new BaseResponse(); CancerScreeningModel cancerScreeningModel = cancerScreenService.findOneById(id); CancerScreeningResult result = new CancerScreeningResult(); @@ -475,6 +489,15 @@ public class CancerScreeningFacade { 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 ff765f5..48cf9c1 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 @@ -328,6 +328,15 @@ public class CervicalCancerServiceImpl implements CervicalCancerService { for (CervicalCancerModel model : cervicalCancerModels) { CervicalCancerModelResult result = new CervicalCancerModelResult(); getOtherStr(result, model); + + //秦皇岛两癌脱敏 + 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())); + } + results.add(result); } @@ -767,6 +776,10 @@ 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)) { @@ -836,11 +849,11 @@ public class CervicalCancerServiceImpl implements CervicalCancerService { baseResponse.setObject(result); return baseResponse; } - baseResponse.setObject(getCervcalList(modelByIdCardNos)); + baseResponse.setObject(getCervcalList(modelByIdCardNos,organization)); return baseResponse; } - private List getCervcalList(List modelByIdCardNos) + private List getCervcalList(List modelByIdCardNos,Organization organization) { List list = new ArrayList<>(); for (CervicalCancerModel model : modelByIdCardNos) @@ -865,6 +878,15 @@ 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); }