jiangjiazhi / regional-platform

Authored by jiangjiazhi about 9 years ago

Exists in master and in 8 other branches

Showing 4 changed files with 10 additions and 10 deletions

...	...	@@ -4,7 +4,7 @@
4	4
5	5	public class Roles {
6	6	private Integer id;
7		- private Integer type; //0¹ÜÀíÔ±½ÇÉ« 1ÓÃ»§½ÇÉ«
	7	+ private Integer type;
8	8	private String name;
9	9	private Integer publishId;
10	10	private String publishName;

...	...	@@ -171,11 +171,11 @@
171	171	return serialVersionUID;
172	172	}
173	173
174		- public int getWeek() {
	174	+ public String getWeek() {
175	175	return week;
176	176	}
177	177
178		- public void setWeek(int week) {
	178	+ public void setWeek(String week) {
179	179	this.week = week;
180	180	}
181	181
...	...	@@ -208,7 +208,7 @@
208	208	private Date mbirth;
209	209	// 助产结构名称
210	210	private String org;
211		- private Integer week;
	211	+ private String week;
212	212
213	213	private String cardNo;
214	214

...	...	@@ -77,7 +77,7 @@
77	77
78	78	private String mbirth;
79	79
80		- private int week;
	80	+ private String week;
81	81
82	82	// 母亲患病情况
83	83	private Map sickenInfo;
84	84
...	...	@@ -325,11 +325,11 @@
325	325	this.mbirth = mbirth;
326	326	}
327	327
328		- public int getWeek() {
	328	+ public String getWeek() {
329	329	return week;
330	330	}
331	331
332		- public void setWeek(int week) {
	332	+ public void setWeek(String week) {
333	333	this.week = week;
334	334	}
335	335

...	...	@@ -68,7 +68,7 @@
68	68
69	69	private String mbirth;
70	70
71		- private int week;
	71	+ private String week;
72	72
73	73	// 具体的访视记录
74	74	private List<BabyVisit> data;
75	75
...	...	@@ -212,11 +212,11 @@
212	212	this.mbirth = mbirth;
213	213	}
214	214
215		- public int getWeek() {
	215	+ public String getWeek() {
216	216	return week;
217	217	}
218	218
219		- public void setWeek(int week) {
	219	+ public void setWeek(String week) {
220	220	this.week = week;
221	221	}
222	222	public String getOrg() {