jiangjiazhi / regional-platform

Commit 8bf87a8f4a256c00d3fa262eedb1934fdd1bf877

Authored by gengxiaokai over 6 years ago

Exists in master and in 6 other branches

威海分娩记录修改

Showing 3 changed files with 115 additions and 12 deletions

platform-dal/src/main/java/com/lyms/platform/pojo/MaternalDeliverModel.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/MatDeliverAddRequest.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/MaternalDeliverResult.java

...	...	@@ -1747,11 +1747,11 @@
1747	1747	/*****威海再次新增字段（12月计划中）*****/
1748	1748	private Integer gravidity;//孕次
1749	1749	private String department;//科室(1：产一；2：产二)
1750		- private List<String> myzd;//母婴阻断
	1750	+ private List 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> ssCount;//手术清点
	1754	+ private List<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<String> getMyzd() {
	1885	+ public List getMyzd() {
1886	1886	return myzd;
1887	1887	}
1888	1888
1889		- public void setMyzd(List<String> myzd) {
	1889	+ public void setMyzd(List 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> getSsCount() {
	1917	+ public List<Map<String,Object>> getSsCount() {
1918	1918	return ssCount;
1919	1919	}
1920	1920
1921		- public void setSsCount(List<Map> ssCount) {
	1921	+ public void setSsCount(List<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<String> getMyzd() {
	232	+ public List getMyzd() {
233	233	return myzd;
234	234	}
235	235
236		- public void setMyzd(List<String> myzd) {
	236	+ public void setMyzd(List 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> getSsCount() {
	264	+ public List<Map<String,Object>> getSsCount() {
265	265	return ssCount;
266	266	}
267	267
268		- public void setSsCount(List<Map> ssCount) {
	268	+ public void setSsCount(List<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<String> myzd;//母婴阻断
	300	+ private List 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> ssCount;//手术清点
	304	+ private List<Map<String,Object>> ssCount;//手术清点
305	305	private String ssProcedure;//所施手术
306	306
307	307

...	...	@@ -125,6 +125,80 @@
125	125	private String sszcjg;//手术助产经过
126	126	private String remarks;//备注
127	127
	128	+ /*****威海再次新增字段（12月计划中）*****/
	129	+ private Integer gravidity;//孕次
	130	+ private String department;//科室(1：产一；2：产二)
	131	+ private List myzd;//母婴阻断
	132	+ private String analMode;//镇痛方式（1：无痛；2：无痛+陪娩；3：导乐+陪娩；4：陪娩）
	133	+ private String hyCondition;//会阴情况（1：Ⅰ度；2：Ⅱ度；3：Ⅲ度；4：侧切）
	134	+ private String ssRecord;//手术记录
	135	+ private List<Map<String,Object>> ssCount;//手术清点
	136	+ private String ssProcedure;//所施手术
	137	+
	138	+ public String getSsProcedure() {
	139	+ return ssProcedure;
	140	+ }
	141	+
	142	+ public void setSsProcedure(String ssProcedure) {
	143	+ this.ssProcedure = ssProcedure;
	144	+ }
	145	+
	146	+ public Integer getGravidity() {
	147	+ return gravidity;
	148	+ }
	149	+
	150	+ public void setGravidity(Integer gravidity) {
	151	+ this.gravidity = gravidity;
	152	+ }
	153	+
	154	+ public String getDepartment() {
	155	+ return department;
	156	+ }
	157	+
	158	+ public void setDepartment(String department) {
	159	+ this.department = department;
	160	+ }
	161	+
	162	+ public List getMyzd() {
	163	+ return myzd;
	164	+ }
	165	+
	166	+ public void setMyzd(List myzd) {
	167	+ this.myzd = myzd;
	168	+ }
	169	+
	170	+ public String getAnalMode() {
	171	+ return analMode;
	172	+ }
	173	+
	174	+ public void setAnalMode(String analMode) {
	175	+ this.analMode = analMode;
	176	+ }
	177	+
	178	+ public String getHyCondition() {
	179	+ return hyCondition;
	180	+ }
	181	+
	182	+ public void setHyCondition(String hyCondition) {
	183	+ this.hyCondition = hyCondition;
	184	+ }
	185	+
	186	+ public String getSsRecord() {
	187	+ return ssRecord;
	188	+ }
	189	+
	190	+ public void setSsRecord(String ssRecord) {
	191	+ this.ssRecord = ssRecord;
	192	+ }
	193	+
	194	+ public List<Map<String, Object>> getSsCount() {
	195	+ return ssCount;
	196	+ }
	197	+
	198	+ public void setSsCount(List<Map<String, Object>> ssCount) {
	199	+ this.ssCount = ssCount;
	200	+ }
	201	+
128	202	public Integer getParity() {
129	203	return parity;
130	204	}
...	...	@@ -288,6 +362,14 @@
288	362	setSszcjg(destModel.getSszcjg());
289	363	setRemarks(destModel.getRemarks());
290	364
	365	+ setGravidity(destModel.getGravidity());
	366	+ setDepartment(destModel.getDepartment());
	367	+ setMyzd(destModel.getMyzd());
	368	+ setAnalMode(destModel.getAnalMode());
	369	+ setSsRecord(destModel.getSsRecord());
	370	+ setSsCount(destModel.getSsCount());
	371	+ setSsProcedure(destModel.getSsProcedure());
	372	+
291	373	return this;
292	374	}
293	375
...	...	@@ -494,6 +576,8 @@
494	576	private String stReflex;//手头反射
495	577	private String sAbility;//吮能力
496	578	/***********新增结束**********/
	579	+ private String umbilicus;//脐
	580	+ private String umXqFy;//脐带血清反应
497	581
498	582	public Baby(){}//增加无参构造方法
499	583	public Baby(MaternalDeliverModel.Baby babyModel){
...	...	@@ -595,6 +679,25 @@
595	679	setStReflex(babyModel.getStReflex());
596	680	setsAbility(babyModel.getsAbility());
597	681
	682	+ setUmbilicus(babyModel.getUmbilicus());
	683	+ setUmXqFy(babyModel.getUmXqFy());
	684	+
	685	+ }
	686	+
	687	+ public String getUmXqFy() {
	688	+ return umXqFy;
	689	+ }
	690	+
	691	+ public void setUmXqFy(String umXqFy) {
	692	+ this.umXqFy = umXqFy;
	693	+ }
	694	+
	695	+ public String getUmbilicus() {
	696	+ return umbilicus;
	697	+ }
	698	+
	699	+ public void setUmbilicus(String umbilicus) {
	700	+ this.umbilicus = umbilicus;
598	701	}
599	702
600	703	public String getNbnaNum() {