jiangjiazhi / regional-platform

Download as
Browse Code »

Commit f4ba39f88029969445ca8c5c22d7d1e25335de64

Authored by liquanyu
1 parent 0ad1ba4c47
Exists in master and in 6 other branches autism, dev, fengning, fengning2023-06-06, longhua, luanping

update

Showing 3 changed files with 54 additions and 8 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/CancerScreeningController.java View file @ f4ba39f
... ... @@ -127,8 +127,9 @@
127 127 */
128 128 @ResponseBody
129 129 @RequestMapping(value = "/{id}", method = RequestMethod.GET)
130   - public BaseResponse getAppInfo(@PathVariable String id) {
131   - return cancerScreenService.getCancerScreenInfo(id);
  130 + @TokenRequired
  131 + public BaseResponse getAppInfo(@PathVariable String id,HttpServletRequest request) {
  132 + return cancerScreenService.getCancerScreenInfo(id,getUserId(request));
132 133 }
133 134  
134 135  
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/CancerScreeningFacade.java View file @ f4ba39f
... ... @@ -198,10 +198,21 @@
198 198 Map <String, Object> map = new HashMap <>();
199 199 map.put("id", model.getId());
200 200 map.put("created", DateUtil.getyyyy_MM_dd(model.getCreated()));
201   - map.put("name", model.getUsername());
202 201 map.put("sex", "女");
203   - map.put("cardNum", model.getCertificateNum());
204   - map.put("phone", model.getPhone());
  202 + //秦皇岛两癌脱敏
  203 + if ("2".equals(organization.getCityId()))
  204 + {
  205 + map.put("name", com.lyms.platform.common.utils.StringUtils.encryName(model.getUsername()));
  206 + map.put("cardNum", com.lyms.platform.common.utils.StringUtils.encryCardNo(model.getCertificateNum()));
  207 + map.put("phone", com.lyms.platform.common.utils.StringUtils.encryPhone(model.getPhone()));
  208 + }
  209 + else
  210 + {
  211 + map.put("name", model.getUsername());
  212 + map.put("cardNum", model.getCertificateNum());
  213 + map.put("phone", model.getPhone());
  214 + }
  215 +
205 216 map.put("age", DateUtil.getAge(model.getBirthday()));
206 217 map.put("liveAddress", CommonsHelper.getResidence(model.getProvinceId(), model.getCityId(), model.getAreaId(), model.getStreetId(), model.getAddress(), basicConfigService));
207 218 map.put("sfZhzd", model.getSfZhzd());
... ... @@ -444,7 +455,10 @@
444 455 * @param id
445 456 * @return
446 457 */
447   - public BaseResponse getCancerScreenInfo(String id) {
  458 + public BaseResponse getCancerScreenInfo(String id,Integer userId) {
  459 + String hospitalId = autoMatchFacade.getHospitalId(userId);
  460 + Organization organization = organizationService.getOrganization(Integer.parseInt(hospitalId));
  461 +
448 462 BaseResponse baseResponse = new BaseResponse();
449 463 CancerScreeningModel cancerScreeningModel = cancerScreenService.findOneById(id);
450 464 CancerScreeningResult result = new CancerScreeningResult();
... ... @@ -474,6 +488,15 @@
474 488 String addressStr = CommonsHelper.getResidence(cancerScreeningModel.getProvinceId(), cancerScreeningModel.getCityId(),
475 489 cancerScreeningModel.getAreaId(), cancerScreeningModel.getStreetId(), cancerScreeningModel.getAddress(), basicConfigService);
476 490 result.setAddressStr(addressStr);
  491 +
  492 +
  493 + //秦皇岛两癌脱敏
  494 + if ("2".equals(organization.getCityId()))
  495 + {
  496 + result.setUsername(com.lyms.platform.common.utils.StringUtils.encryName(result.getUsername()));
  497 + result.setCertificateNum(com.lyms.platform.common.utils.StringUtils.encryCardNo(result.getCertificateNum()));
  498 + result.setPhone(com.lyms.platform.common.utils.StringUtils.encryPhone(result.getPhone()));
  499 + }
477 500  
478 501 baseResponse.setObject(result);
479 502 return baseResponse;
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/CervicalCancerServiceImpl.java View file @ f4ba39f
... ... @@ -328,6 +328,15 @@
328 328 for (CervicalCancerModel model : cervicalCancerModels) {
329 329 CervicalCancerModelResult result = new CervicalCancerModelResult();
330 330 getOtherStr(result, model);
  331 +
  332 + //秦皇岛两癌脱敏
  333 + if ("2".equals(organization.getCityId()))
  334 + {
  335 + result.setName(com.lyms.platform.common.utils.StringUtils.encryName(result.getName()));
  336 + result.setIdCardNo(com.lyms.platform.common.utils.StringUtils.encryCardNo(result.getIdCardNo()));
  337 + result.setPhone(com.lyms.platform.common.utils.StringUtils.encryPhone(result.getPhone()));
  338 + }
  339 +
331 340 results.add(result);
332 341 }
333 342  
... ... @@ -767,6 +776,10 @@
767 776 */
768 777 @Override
769 778 public BaseResponse getPatientInfoByIdCard(CommonParamRequest param,Integer userId) {
  779 +
  780 + String hospitalId = autoMatchFacade.getHospitalId(userId);
  781 + Organization organization = organizationService.getOrganization(Integer.parseInt(hospitalId));
  782 +
770 783 String cardNo = param.getCardNo();
771 784 String vcCardNo = param.getVcCardNo();
772 785 if (StringUtils.isEmpty(cardNo) && StringUtils.isEmpty(vcCardNo)) {
773 786  
... ... @@ -836,11 +849,11 @@
836 849 baseResponse.setObject(result);
837 850 return baseResponse;
838 851 }
839   - baseResponse.setObject(getCervcalList(modelByIdCardNos));
  852 + baseResponse.setObject(getCervcalList(modelByIdCardNos,organization));
840 853 return baseResponse;
841 854 }
842 855  
843   - private List<CervicalCancerModelResult> getCervcalList(List<CervicalCancerModel> modelByIdCardNos)
  856 + private List<CervicalCancerModelResult> getCervcalList(List<CervicalCancerModel> modelByIdCardNos,Organization organization)
844 857 {
845 858 List<CervicalCancerModelResult> list = new ArrayList<>();
846 859 for (CervicalCancerModel model : modelByIdCardNos)
... ... @@ -865,6 +878,15 @@
865 878 result.setNationStr(CommonsHelper.getName1(residentsArchiveModels.get(0).getNationId(), basicConfigService));
866 879 result.setLevelTypeStr(CommonsHelper.getName1(residentsArchiveModels.get(0).getLevelTypeId(), basicConfigService));
867 880 }
  881 +
  882 + //秦皇岛两癌脱敏
  883 + if ("2".equals(organization.getCityId()))
  884 + {
  885 + result.setName(com.lyms.platform.common.utils.StringUtils.encryName(result.getName()));
  886 + result.setIdCardNo(com.lyms.platform.common.utils.StringUtils.encryCardNo(result.getIdCardNo()));
  887 + result.setPhone(com.lyms.platform.common.utils.StringUtils.encryPhone(result.getPhone()));
  888 + }
  889 +
868 890 result.setCheckPackage(model.getCheckPackage());
869 891 list.add(result);
870 892 }