jiangjiazhi / regional-platform

Download as
Browse Code »

Commit 030e14ef582a2f62fcc2bd9b8ba845f755d6b140

Authored by jiangjiazhi
2 parents 64ab8eb353 d87999d05f
Exists in master and in 8 other branches 0116, autism, dev, fengning, fengning2023-06-06, longhua, luanping, nobuildprocess

Merge remote-tracking branch 'origin/master'

Showing 3 changed files

platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/OrganizationController.java View file @ 030e14e
... ... @@ -233,7 +233,7 @@
233 233 LoginContext loginState = (LoginContext) request.getAttribute("loginContext");
234 234 Users users = usersService.getUsers(loginState.getId());
235 235  
236   - List<Integer> areaId = autoMatchFacade.matchOrgId(loginState.getId());
  236 + List<Integer> areaId = autoMatchFacade.matchAreaOrgId(loginState.getId());
237 237 List<Object> data = new ArrayList<>();
238 238 List<Organization> organizations = new ArrayList<>();
239 239 PageInfo pageInfo = new PageInfo(0,0,0,1);
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/AutoMatchFacade.java View file @ 030e14e
... ... @@ -76,8 +76,37 @@
76 76 }
77 77 return null;
78 78 }
  79 +
  80 + public List<Integer> matchAreaOrgId(int userId){
  81 + UsersQuery usersQuery = new UsersQuery();
  82 + usersQuery.setId(userId);
  83 +
  84 + usersQuery.setYn(1);
  85 + List<Users> list = usersService.queryUsers(usersQuery);
  86 + List<Integer> data = new ArrayList<>();
  87 + if (CollectionUtils.isNotEmpty(list)) {
  88 +
  89 + /**/ //用户角色
  90 + if (UserTypeEnum.NORMAL_USER.getId().equals(list.get(0).getType())||UserTypeEnum.PLATFORM_ADMIN.getId().equals(list.get(0).getType())) {
  91 + List<Organization> list2 = accessPermissionFacade.getOrganization(accessPermissionFacade.findAccessPerminssionByUserId(list.get(0).getId()));
  92 + if(CollectionUtils.isNotEmpty(list2)){
  93 + for(Organization organization:list2){
  94 + data.add(organization.getId());
  95 + }
  96 + }
  97 + if (!data.contains(list.get(0).getOrgId())) {
  98 + data.add(list.get(0).getOrgId());
  99 + }
  100 + } else if(UserTypeEnum.SUPPER_ADMIN.getId().equals(list.get(0).getType())) {
  101 + return null;
  102 + }
  103 + return data;
  104 + }
  105 + return null;
  106 + }
  107 +
79 108 public String getHospitalId(Integer userId){
80   - List<Integer> list = matchOrgId(userId);
  109 + List<Integer> list = matchAreaOrgId(userId);
81 110 if(null==list||CollectionUtils.isEmpty(list)){
82 111 return null;
83 112 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ResidentsArchiveFacade.java View file @ 030e14e
... ... @@ -377,11 +377,11 @@
377 377 result.setStreetRegisterId(model.getStreetRegisterId());
378 378 result.setAddressRegister(model.getAddressRegister());
379 379  
380   - result.setPastHistory(JsonUtil.jkstr2Obj(model.getPastHistory(), Map.class));
381   - result.setFamilyHistory(JsonUtil.jkstr2Obj(model.getFamilyHistory(), Map.class));
382   - result.setPersonalHistory(JsonUtil.jkstr2Obj(model.getPresentHistory(), Map.class));
383   - result.setYwgmHistory(JsonUtil.jkstr2Obj(model.getYwgmHistory(), Map.class));
384   - result.setPresentHistory(JsonUtil.jkstr2Obj(model.getPresentHistory(),Map.class));
  380 + result.setPastHistory(model.getPastHistory()==null ? null :JsonUtil.jkstr2Obj(model.getPastHistory(), Map.class));
  381 + result.setFamilyHistory(model.getFamilyHistory() == null ? null : JsonUtil.jkstr2Obj(model.getFamilyHistory(), Map.class));
  382 + result.setPersonalHistory(model.getPresentHistory() == null ? null :JsonUtil.jkstr2Obj(model.getPresentHistory(), Map.class));
  383 + result.setYwgmHistory(model.getYwgmHistory() == null ? null :JsonUtil.jkstr2Obj(model.getYwgmHistory(), Map.class));
  384 + result.setPresentHistory(model.getPresentHistory() == null ? null : JsonUtil.jkstr2Obj(model.getPresentHistory(),Map.class));
385 385  
386 386 result.setVcCardNo(model.getVcCardNo());
387 387 result.setBuildDoctor(model.getBuildDoctor());