liquanyu / regional-platform

Authored by zhangrui over 9 years ago

Exists in master and in 3 other branches

Showing 2 changed files with 5 additions and 5 deletions

...	...	@@ -34,7 +34,7 @@
34	34	private Object area;
35	35	private Object street;
36	36	private String foreignId;
37		- private Integer orgType; //0 ¹«Ë¾ 1 Ò½Ôº
	37	+ private Integer orgType; //-1´íÎó 0 ¹«Ë¾ 1 Ò½Ôº
38	38
39	39	public Integer getOrgType() {
40	40	return orgType;

...	...	@@ -37,7 +37,7 @@
37	37	public Organization getOrganization(Integer id) {
38	38	Organization organization = organizationMapper.getOrganization(id);
39	39	if(null != organization) {
40		- //设置机构类型 1 医院 0 公司
	40	+ //璁剧疆鏈烘瀯绫诲瀷 1 鍖婚櫌 0 鍏徃
41	41	if( null != organization.getType()) {
42	42	if((organization.getType().equals(OrganizationTypeEnum.NY.getId()) \|\| organization.getType().equals(OrganizationTypeEnum.FB.getId()) \|\|
43	43	organization.getType().equals(OrganizationTypeEnum.TY.getId())\|\| organization.getType().equals(OrganizationTypeEnum.JMQY.getId()))) {
...	...	@@ -46,7 +46,7 @@
46	46	organization.setOrgType(0);
47	47	}
48	48	} else {
49		- organization.setOrgType(null);
	49	+ organization.setOrgType(-1);
50	50	}
51	51	}
52	52	return organization;
...	...	@@ -66,7 +66,7 @@
66	66	if(CollectionUtils.isNotEmpty(organizations)) {
67	67	for(Organization organization : organizations) {
68	68	if(null != organization) {
69		- //设置机构类型 1 医院 0 公司
	69	+ //璁剧疆鏈烘瀯绫诲瀷 1 鍖婚櫌 0 鍏徃
70	70	if( null != organization.getType() ) {
71	71	if((organization.getType().equals(OrganizationTypeEnum.NY.getId()) \|\| organization.getType().equals(OrganizationTypeEnum.FB.getId()) \|\|
72	72	organization.getType().equals(OrganizationTypeEnum.TY.getId())\|\| organization.getType().equals(OrganizationTypeEnum.JMQY.getId()))) {
...	...	@@ -75,7 +75,7 @@
75	75	organization.setOrgType(0);
76	76	}
77	77	} else {
78		- organization.setOrgType(null);
	78	+ organization.setOrgType(-1);
79	79	}
80	80
81	81	}