Commit 78adad25c5a6cf361b3f4cb4b38c2ab7662fbe82
1 parent
79f75f2fab
Exists in
master
and in
6 other branches
分娩作废产检劵
Showing 1 changed file with 13 additions and 0 deletions
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/UsersController.java
View file @
78adad2
| 1 | 1 | package com.lyms.platform.operate.web.controller; |
| 2 | 2 | |
| 3 | 3 | |
| 4 | +import com.lyms.platform.biz.service.BasicConfigService; | |
| 4 | 5 | import com.lyms.platform.biz.service.OrganizationGroupsService; |
| 5 | 6 | import com.lyms.platform.common.annotation.TokenRequired; |
| 6 | 7 | import com.lyms.platform.common.base.BaseController; |
| ... | ... | @@ -18,6 +19,7 @@ |
| 18 | 19 | import com.lyms.platform.operate.web.session.strategy.ISessionProvider; |
| 19 | 20 | import com.lyms.platform.permission.model.*; |
| 20 | 21 | import com.lyms.platform.permission.service.*; |
| 22 | +import com.lyms.platform.pojo.BasicConfig; | |
| 21 | 23 | import com.lyms.platform.pojo.DataPermissionsModel; |
| 22 | 24 | import com.lyms.platform.pojo.OrganizationGroups; |
| 23 | 25 | import org.apache.commons.collections.CollectionUtils; |
| ... | ... | @@ -74,6 +76,8 @@ |
| 74 | 76 | private SessionProvider iSessionProvider; |
| 75 | 77 | @Autowired |
| 76 | 78 | private AutoMatchFacade autoMatchFacade; |
| 79 | + @Autowired | |
| 80 | + private BasicConfigService basicConfigService; | |
| 77 | 81 | |
| 78 | 82 | private static final String LYMS = "龙源美生"; |
| 79 | 83 | |
| ... | ... | @@ -479,6 +483,15 @@ |
| 479 | 483 | organizations = organizationService.queryOrganization(organizationQuery); |
| 480 | 484 | } else { |
| 481 | 485 | Organization organization = organizationService.getOrganization(users.getOrgId()); |
| 486 | + if(null!=organization&&StringUtils.isNotEmpty(organization.getCityId())){ | |
| 487 | + BasicConfig bg= basicConfigService.getOneBasicConfigById(organization.getCityId()); | |
| 488 | + Map<String,String> map = new HashMap<>(); | |
| 489 | + map.put("id",organization.getCityId()); | |
| 490 | + if(null!=bg){ | |
| 491 | + map.put("name",bg.getName()); | |
| 492 | + } | |
| 493 | + organization.setCity(map); | |
| 494 | + } | |
| 482 | 495 | organizations.add(organization); |
| 483 | 496 | users.setOrganization(organization); |
| 484 | 497 | //是否是建档医院 |