fangcheng / regional-platform

Commit b2e05bf557f4d200ee5dbbb77e2fe041aadb4246

Authored by jiangjiazhi over 9 years ago

增加权限

Showing 3 changed files with 48 additions and 53 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/VisitFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/Address.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AddressInner.java

...	...	@@ -11,11 +11,8 @@
11	11	import com.lyms.platform.operate.web.request.BabyVisitAddRequest;
12	12	import com.lyms.platform.operate.web.request.VisitAddRequest;
13	13	import com.lyms.platform.operate.web.request.VisitAddRequest.SimpleVisitPuerpera;
14		-import com.lyms.platform.operate.web.result.Address;
15		-import com.lyms.platform.operate.web.result.BabyVisitResult;
	14	+import com.lyms.platform.operate.web.result.*;
16	15	import com.lyms.platform.operate.web.result.BabyVisitResult.BabyVisit;
17		-import com.lyms.platform.operate.web.result.SimpleVisit;
18		-import com.lyms.platform.operate.web.result.VisitResult;
19	16	import com.lyms.platform.permission.model.Regions;
20	17	import com.lyms.platform.permission.service.RegionsService;
21	18	import com.lyms.platform.pojo.BabyModel;
22	19
23	20
24	21
...	...	@@ -111,22 +108,21 @@
111	108	*/
112	109	private Address fullAddress(Patients puerperaModel) {
113	110	Address address = new Address();
114		- address.setAreaId(puerperaModel.getAreaId());
115		- address.setCityId(puerperaModel.getCityId());
116		- address.setProvinceId(puerperaModel.getProvinceId());
117		-
118	111	address.setArea(getName(puerperaModel.getAreaId()));
119	112	address.setCity(getName(puerperaModel.getCityId()));
120	113	address.setProvince(getName(puerperaModel.getProvinceId()));
121	114	return address;
122	115	}
123	116
124		- private String getName(int id) {
	117	+ private AddressInner getName(int id) {
	118	+ AddressInner addressInner= new AddressInner();
	119	+ addressInner.setId(id);
125	120	Regions regions = regionsService.getRegions(id);
126	121	if (null == regions) {
127		- return "";
	122	+ return addressInner;
128	123	}
129		- return regions.getRegionName();
	124	+ addressInner.setName(regions.getRegionName());
	125	+ return addressInner;
130	126	}
131	127
132	128	/**

1	1	package com.lyms.platform.operate.web.result;
2	2
3	3	public class Address {
4		- private Integer provinceId;
5		- private Integer cityId;
6		- private Integer areaId;
7		- private String province;
8		- private String city;
9		- private String area;
	4	+
	5	+ private AddressInner province;
	6	+ private AddressInner city;
	7	+ private AddressInner area;
10	8	private String address;
11	9
12		- public String getArea() {
13		- return area;
	10	+ public String getAddress() {
	11	+ return address;
14	12	}
15	13
16		- public void setArea(String area) {
17		- this.area = area;
	14	+ public void setAddress(String address) {
	15	+ this.address = address;
18	16	}
19	17
20		- public Integer getAreaId() {
21		- return areaId;
	18	+ public AddressInner getArea() {
	19	+ return area;
22	20	}
23	21
24		- public void setAreaId(Integer areaId) {
25		- this.areaId = areaId;
	22	+ public void setArea(AddressInner area) {
	23	+ this.area = area;
26	24	}
27	25
28		- public String getCity() {
	26	+ public AddressInner getCity() {
29	27	return city;
30	28	}
31	29
32		- public void setCity(String city) {
	30	+ public void setCity(AddressInner city) {
33	31	this.city = city;
34	32	}
35	33
36		- public Integer getCityId() {
37		- return cityId;
38		- }
39		-
40		- public void setCityId(Integer cityId) {
41		- this.cityId = cityId;
42		- }
43		-
44		- public String getAddress() {
45		- return address;
46		- }
47		-
48		- public void setAddress(String address) {
49		- this.address = address;
50		- }
51		-
52		- public String getProvince() {
	34	+ public AddressInner getProvince() {
53	35	return province;
54	36	}
55	37
56		- public void setProvince(String province) {
	38	+ public void setProvince(AddressInner province) {
57	39	this.province = province;
58		- }
59		-
60		- public Integer getProvinceId() {
61		- return provinceId;
62		- }
63		-
64		- public void setProvinceId(Integer provinceId) {
65		- this.provinceId = provinceId;
66	40	}
67	41	}

	1	+package com.lyms.platform.operate.web.result;
	2	+
	3	+/**
	4	+ * Created by Administrator on 2016/4/29 0029.
	5	+ */
	6	+public class AddressInner {
	7	+ private int id;
	8	+ private String name;
	9	+
	10	+ public int getId() {
	11	+ return id;
	12	+ }
	13	+
	14	+ public void setId(int id) {
	15	+ this.id = id;
	16	+ }
	17	+
	18	+ public String getName() {
	19	+ return name;
	20	+ }
	21	+
	22	+ public void setName(String name) {
	23	+ this.name = name;
	24	+ }
	25	+}