Commit 444acbf42681fe72689aaca44a274b20729086d4
1 parent
170b73be57
Exists in
master
and in
1 other branch
bug fix
机构类型 有公司 和医院两种
Showing 2 changed files with 18 additions and 0 deletions
platform-biz-service/src/main/java/com/lyms/platform/permission/model/Organization.java
View file @
444acbf
... | ... | @@ -34,6 +34,15 @@ |
34 | 34 | private Object area; |
35 | 35 | private Object street; |
36 | 36 | private String foreignId; |
37 | + private Integer orgType; //0 ¹«Ë¾ 1 Ò½Ôº | |
38 | + | |
39 | + public Integer getOrgType() { | |
40 | + return orgType; | |
41 | + } | |
42 | + | |
43 | + public void setOrgType(Integer orgType) { | |
44 | + this.orgType = orgType; | |
45 | + } | |
37 | 46 | |
38 | 47 | Map<String, Departments> departmentsMap = new HashMap<>(); |
39 | 48 |
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/OrganizationController.java
View file @
444acbf
... | ... | @@ -342,6 +342,15 @@ |
342 | 342 | organization.setStreet(CommonsHelper.convterToMap(basicConfigService.getOneBasicConfigById(organization.getStreetId()), true)); |
343 | 343 | } |
344 | 344 | |
345 | + //设置机构类型 0 公司 1 医院 | |
346 | + if(null != organization.getType() && | |
347 | + (organization.getType().equals(OrganizationTypeEnum.NY.getId()) || organization.getType().equals(OrganizationTypeEnum.FB.getId()) || | |
348 | + organization.getType().equals(OrganizationTypeEnum.TY.getId())|| organization.getType().equals(OrganizationTypeEnum.JMQY.getId()))) { | |
349 | + organization.setOrgType(1); | |
350 | + } else { | |
351 | + organization.setOrgType(0); | |
352 | + } | |
353 | + | |
345 | 354 | data.add(organization); |
346 | 355 | } |
347 | 356 | } |