jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 88ab23ece1e2de1a0e882e5293e8803e23f00aa6

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

update

Showing 3 changed files with 8 additions and 44 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/CancerScreeningController.java View file @ 88ab23e
... ... @@ -127,9 +127,8 @@
127 127 */
128 128 @ResponseBody
129 129 @RequestMapping(value = "/{id}", method = RequestMethod.GET)
130   - @TokenRequired
131 130 public BaseResponse getAppInfo(@PathVariable String id,HttpServletRequest request) {
132   - return cancerScreenService.getCancerScreenInfo(id,getUserId(request));
  131 + return cancerScreenService.getCancerScreenInfo(id);
133 132 }
134 133  
135 134  
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/CancerScreeningFacade.java View file @ 88ab23e
... ... @@ -199,20 +199,11 @@
199 199 map.put("id", model.getId());
200 200 map.put("created", DateUtil.getyyyy_MM_dd(model.getCreated()));
201 201 map.put("sex", "女");
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 202  
  203 + map.put("name", model.getUsername());
  204 + map.put("cardNum", model.getCertificateNum());
  205 + map.put("phone", model.getPhone());
  206 +
216 207 map.put("age", DateUtil.getAge(model.getBirthday()));
217 208 map.put("liveAddress", CommonsHelper.getResidence(model.getProvinceId(), model.getCityId(), model.getAreaId(), model.getStreetId(), model.getAddress(), basicConfigService));
218 209 map.put("sfZhzd", model.getSfZhzd());
... ... @@ -455,10 +446,7 @@
455 446 * @param id
456 447 * @return
457 448 */
458   - public BaseResponse getCancerScreenInfo(String id,Integer userId) {
459   - String hospitalId = autoMatchFacade.getHospitalId(userId);
460   - Organization organization = organizationService.getOrganization(Integer.parseInt(hospitalId));
461   -
  449 + public BaseResponse getCancerScreenInfo(String id) {
462 450 BaseResponse baseResponse = new BaseResponse();
463 451 CancerScreeningModel cancerScreeningModel = cancerScreenService.findOneById(id);
464 452 CancerScreeningResult result = new CancerScreeningResult();
... ... @@ -488,16 +476,6 @@
488 476 String addressStr = CommonsHelper.getResidence(cancerScreeningModel.getProvinceId(), cancerScreeningModel.getCityId(),
489 477 cancerScreeningModel.getAreaId(), cancerScreeningModel.getStreetId(), cancerScreeningModel.getAddress(), basicConfigService);
490 478 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   - }
500   -
501 479 baseResponse.setObject(result);
502 480 return baseResponse;
503 481 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/service/impl/CervicalCancerServiceImpl.java View file @ 88ab23e
... ... @@ -776,10 +776,6 @@
776 776 */
777 777 @Override
778 778 public BaseResponse getPatientInfoByIdCard(CommonParamRequest param,Integer userId) {
779   -
780   - String hospitalId = autoMatchFacade.getHospitalId(userId);
781   - Organization organization = organizationService.getOrganization(Integer.parseInt(hospitalId));
782   -
783 779 String cardNo = param.getCardNo();
784 780 String vcCardNo = param.getVcCardNo();
785 781 if (StringUtils.isEmpty(cardNo) && StringUtils.isEmpty(vcCardNo)) {
786 782  
... ... @@ -849,11 +845,11 @@
849 845 baseResponse.setObject(result);
850 846 return baseResponse;
851 847 }
852   - baseResponse.setObject(getCervcalList(modelByIdCardNos,organization));
  848 + baseResponse.setObject(getCervcalList(modelByIdCardNos));
853 849 return baseResponse;
854 850 }
855 851  
856   - private List<CervicalCancerModelResult> getCervcalList(List<CervicalCancerModel> modelByIdCardNos,Organization organization)
  852 + private List<CervicalCancerModelResult> getCervcalList(List<CervicalCancerModel> modelByIdCardNos)
857 853 {
858 854 List<CervicalCancerModelResult> list = new ArrayList<>();
859 855 for (CervicalCancerModel model : modelByIdCardNos)
... ... @@ -878,15 +874,6 @@
878 874 result.setNationStr(CommonsHelper.getName1(residentsArchiveModels.get(0).getNationId(), basicConfigService));
879 875 result.setLevelTypeStr(CommonsHelper.getName1(residentsArchiveModels.get(0).getLevelTypeId(), basicConfigService));
880 876 }
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   -
890 877 result.setCheckPackage(model.getCheckPackage());
891 878 list.add(result);
892 879 }