jiangjiazhi / regional-platform

Authored by gengxiaokai over 6 years ago

Exists in master and in 6 other branches

Showing 2 changed files with 12 additions and 12 deletions

...	...	@@ -1747,11 +1747,11 @@
1747	1747	/*****威海再次新增字段（12月计划中）*****/
1748	1748	private Integer gravidity;//孕次
1749	1749	private String department;//科室(1：产一；2：产二)
1750		- private List myzd;//母婴阻断
	1750	+ private List<Object> myzd;//母婴阻断
1751	1751	private String analMode;//镇痛方式（1：无痛；2：无痛+陪娩；3：导乐+陪娩；4：陪娩）
1752	1752	private String hyCondition;//会阴情况（1：Ⅰ度；2：Ⅱ度；3：Ⅲ度；4：侧切）
1753	1753	private String ssRecord;//手术记录
1754		- private List<Map<String,Object>> ssCount;//手术清点
	1754	+ private Map<String,Object> ssCount;//手术清点
1755	1755	private String ssProcedure;//所施手术
1756	1756
1757	1757	public Integer getParity() {
1758	1758
...	...	@@ -1882,11 +1882,11 @@
1882	1882	this.department = department;
1883	1883	}
1884	1884
1885		- public List getMyzd() {
	1885	+ public List<Object> getMyzd() {
1886	1886	return myzd;
1887	1887	}
1888	1888
1889		- public void setMyzd(List myzd) {
	1889	+ public void setMyzd(List<Object> myzd) {
1890	1890	this.myzd = myzd;
1891	1891	}
1892	1892
1893	1893
...	...	@@ -1914,11 +1914,11 @@
1914	1914	this.ssRecord = ssRecord;
1915	1915	}
1916	1916
1917		- public List<Map<String,Object>> getSsCount() {
	1917	+ public Map<String,Object> getSsCount() {
1918	1918	return ssCount;
1919	1919	}
1920	1920
1921		- public void setSsCount(List<Map<String,Object>> ssCount) {
	1921	+ public void setSsCount(Map<String,Object> ssCount) {
1922	1922	this.ssCount = ssCount;
1923	1923	}
1924	1924

...	...	@@ -229,11 +229,11 @@
229	229	this.department = department;
230	230	}
231	231
232		- public List getMyzd() {
	232	+ public List<Object> getMyzd() {
233	233	return myzd;
234	234	}
235	235
236		- public void setMyzd(List myzd) {
	236	+ public void setMyzd(List<Object> myzd) {
237	237	this.myzd = myzd;
238	238	}
239	239
240	240
...	...	@@ -261,11 +261,11 @@
261	261	this.ssRecord = ssRecord;
262	262	}
263	263
264		- public List<Map<String,Object>> getSsCount() {
	264	+ public Map<String,Object> getSsCount() {
265	265	return ssCount;
266	266	}
267	267
268		- public void setSsCount(List<Map<String,Object>> ssCount) {
	268	+ public void setSsCount(Map<String,Object> ssCount) {
269	269	this.ssCount = ssCount;
270	270	}
271	271
272	272
...	...	@@ -297,11 +297,11 @@
297	297	/*****威海再次新增字段（12月计划中）*****/
298	298	private Integer gravidity;//孕次
299	299	private String department;//科室(1：产一；2：产二)
300		- private List myzd;//母婴阻断
	300	+ private List<Object> myzd;//母婴阻断
301	301	private String analMode;//镇痛方式（1：无痛；2：无痛+陪娩；3：导乐+陪娩；4：陪娩）
302	302	private String hyCondition;//会阴情况（1：Ⅰ度；2：Ⅱ度；3：Ⅲ度；4：侧切）
303	303	private String ssRecord;//手术记录
304		- private List<Map<String,Object>> ssCount;//手术清点
	304	+ private Map<String,Object> ssCount;//手术清点
305	305	private String ssProcedure;//所施手术
306	306
307	307