jiangjiazhi / regional-platform

Authored by gengxiaokai over 6 years ago

Exists in master and in 6 other branches

Showing 3 changed files with 41 additions and 0 deletions

...	...	@@ -525,9 +525,27 @@
525	525
526	526	private String umbilicus;//脐
527	527	private String umXqFy;//脐带血清反应
	528	+ private String skinContact;//皮肤接触及早吮吸>=30分钟
	529	+ private String zhixi;//窒息（0：青紫；1：苍白）
528	530
529	531	public Baby(){
530	532
	533	+ }
	534	+
	535	+ public String getSkinContact() {
	536	+ return skinContact;
	537	+ }
	538	+
	539	+ public void setSkinContact(String skinContact) {
	540	+ this.skinContact = skinContact;
	541	+ }
	542	+
	543	+ public String getZhixi() {
	544	+ return zhixi;
	545	+ }
	546	+
	547	+ public void setZhixi(String zhixi) {
	548	+ this.zhixi = zhixi;
531	549	}
532	550
533	551	public String getUmbilicus() {

...	...	@@ -3067,6 +3067,8 @@
3067	3067	/********************************/
3068	3068	babyMap.put("umbilicus",temp.getUmbilicus());
3069	3069	babyMap.put("umXqFy",temp.getUmXqFy());
	3070	+ babyMap.put("skinContact",temp.getSkinContact());
	3071	+ babyMap.put("zhixi",temp.getZhixi());
3070	3072
3071	3073	babyList.add(babyMap);
3072	3074	}

...	...	@@ -309,6 +309,7 @@
309	309	this.gjOther = gjOther;
310	310	}
311	311
	312	+
312	313	/****威海妇幼新增分娩记录字段****/
313	314	private Integer parity;//胎次
314	315	private String gsqsDate;//宫缩起始时间
...	...	@@ -1122,6 +1123,8 @@
1122	1123	/***********新增结束**********/
1123	1124	private String umbilicus;//脐
1124	1125	private String umXqFy;//脐带血清反应
	1126	+ private String skinContact;//皮肤接触及早吮吸>=30分钟
	1127	+ private String zhixi;//窒息（0：青紫；1：苍白）
1125	1128
1126	1129	@Override
1127	1130	public MaternalDeliverModel.Baby convertToDataModel() {
1128	1131
...	...	@@ -1231,8 +1234,26 @@
1231	1234
1232	1235	baby.setUmbilicus(umbilicus);
1233	1236	baby.setUmXqFy(umXqFy);
	1237	+ baby.setSkinContact(skinContact);
	1238	+ baby.setZhixi(zhixi);
1234	1239
1235	1240	return baby;
	1241	+ }
	1242	+
	1243	+ public String getSkinContact() {
	1244	+ return skinContact;
	1245	+ }
	1246	+
	1247	+ public void setSkinContact(String skinContact) {
	1248	+ this.skinContact = skinContact;
	1249	+ }
	1250	+
	1251	+ public String getZhixi() {
	1252	+ return zhixi;
	1253	+ }
	1254	+
	1255	+ public void setZhixi(String zhixi) {
	1256	+ this.zhixi = zhixi;
1236	1257	}
1237	1258
1238	1259	public String getUmbilicus() {