jiangjiazhi / regional-platform

Authored by gengxiaokai over 6 years ago

Exists in master and in 6 other branches

Showing 6 changed files with 46 additions and 0 deletions

...	...	@@ -380,6 +380,15 @@
380	380	private Integer skinContact;//皮肤接触及早吮吸>=30分钟
381	381	private String zhixi;//窒息（0：青紫；1：苍白）
382	382	private String impression;//印象
	383	+ private String qzdbh;//亲子带编号
	384	+
	385	+ public String getQzdbh() {
	386	+ return qzdbh;
	387	+ }
	388	+
	389	+ public void setQzdbh(String qzdbh) {
	390	+ this.qzdbh = qzdbh;
	391	+ }
383	392
384	393	public String getUmbilicus() {
385	394	return umbilicus;

...	...	@@ -528,9 +528,18 @@
528	528	private Integer skinContact;//皮肤接触及早吮吸>=30分钟
529	529	private String zhixi;//窒息（0：青紫；1：苍白）
530	530	private String impression;//印象
	531	+ private String qzdbh;//亲子带编号
531	532
532	533	public Baby(){
533	534
	535	+ }
	536	+
	537	+ public String getQzdbh() {
	538	+ return qzdbh;
	539	+ }
	540	+
	541	+ public void setQzdbh(String qzdbh) {
	542	+ this.qzdbh = qzdbh;
534	543	}
535	544
536	545	public String getImpression() {

...	...	@@ -906,6 +906,7 @@
906	906	babyModel1.setSkinContact(baby.getSkinContact());
907	907	babyModel1.setZhixi(baby.getZhixi());
908	908	babyModel1.setImpression(baby.getImpression());
	909	+ babyModel1.setQzdbh(baby.getQzdbh());
909	910
910	911	babyService.findAndModify(query.convertToQuery(), babyModel1);
911	912	}
...	...	@@ -1081,6 +1082,12 @@
1081	1082	babyModel.setYbReflex(baby1.getYbReflex());
1082	1083	babyModel.setStReflex(baby1.getStReflex());
1083	1084	babyModel.setsAbility(baby1.getsAbility());
	1085	+ babyModel.setUmbilicus(baby1.getUmbilicus());
	1086	+ babyModel.setUmXqFy(baby1.getUmXqFy());
	1087	+ babyModel.setSkinContact(baby1.getSkinContact());
	1088	+ babyModel.setZhixi(baby1.getZhixi());
	1089	+ babyModel.setImpression(baby1.getImpression());
	1090	+ babyModel.setQzdbh(baby1.getQzdbh());
1084	1091
1085	1092
1086	1093	//判断妊娠结局是活产才添加数据

...	...	@@ -3070,6 +3070,7 @@
3070	3070	babyMap.put("skinContact",temp.getSkinContact());
3071	3071	babyMap.put("zhixi",temp.getZhixi());
3072	3072	babyMap.put("impression",temp.getImpression());
	3073	+ babyMap.put("qzdbh",temp.getQzdbh());
3073	3074
3074	3075	babyList.add(babyMap);
3075	3076	}

...	...	@@ -1126,6 +1126,7 @@
1126	1126	private Integer skinContact;//皮肤接触及早吮吸>=30分钟
1127	1127	private String zhixi;//窒息（0：青紫；1：苍白）
1128	1128	private String impression;//印象
	1129	+ private String qzdbh;//亲子带编号
1129	1130
1130	1131	@Override
1131	1132	public MaternalDeliverModel.Baby convertToDataModel() {
1132	1133
...	...	@@ -1238,8 +1239,17 @@
1238	1239	baby.setSkinContact(skinContact);
1239	1240	baby.setZhixi(zhixi);
1240	1241	baby.setImpression(impression);
	1242	+ baby.setQzdbh(qzdbh);
1241	1243
1242	1244	return baby;
	1245	+ }
	1246	+
	1247	+ public String getQzdbh() {
	1248	+ return qzdbh;
	1249	+ }
	1250	+
	1251	+ public void setQzdbh(String qzdbh) {
	1252	+ this.qzdbh = qzdbh;
1243	1253	}
1244	1254
1245	1255	public String getImpression() {

...	...	@@ -684,6 +684,7 @@
684	684	private Integer skinContact;//皮肤接触及早吮吸>=30分钟
685	685	private String zhixi;//窒息（0：青紫；1：苍白）
686	686	private String impression;//印象
	687	+ private String qzdbh;//亲子带编号
687	688
688	689	public Baby(){}//增加无参构造方法
689	690	public Baby(MaternalDeliverModel.Baby babyModel){
690	691
...	...	@@ -790,7 +791,16 @@
790	791	setSkinContact(babyModel.getSkinContact());
791	792	setZhixi(babyModel.getZhixi());
792	793	setImpression(babyModel.getImpression());
	794	+ setQzdbh(babyModel.getQzdbh());
793	795
	796	+ }
	797	+
	798	+ public String getQzdbh() {
	799	+ return qzdbh;
	800	+ }
	801	+
	802	+ public void setQzdbh(String qzdbh) {
	803	+ this.qzdbh = qzdbh;
794	804	}
795	805
796	806	public String getImpression() {