jiangjiazhi / regional-platform

Authored by gengxiaokai about 7 years ago

Exists in master and in 6 other branches

Showing 3 changed files with 70 additions and 0 deletions

...	...	@@ -382,6 +382,52 @@
382	382	private String impression;//印象
383	383	private String qzdbh;//亲子带编号
384	384
	385	+ private String hx;//呼吸
	386	+ private String xt;//心跳
	387	+ private String ys;//颜色
	388	+ private String cjfy;//刺激反应
	389	+ private String zl;//张力
	390	+
	391	+ public String getHx() {
	392	+ return hx;
	393	+ }
	394	+
	395	+ public void setHx(String hx) {
	396	+ this.hx = hx;
	397	+ }
	398	+
	399	+ public String getXt() {
	400	+ return xt;
	401	+ }
	402	+
	403	+ public void setXt(String xt) {
	404	+ this.xt = xt;
	405	+ }
	406	+
	407	+ public String getYs() {
	408	+ return ys;
	409	+ }
	410	+
	411	+ public void setYs(String ys) {
	412	+ this.ys = ys;
	413	+ }
	414	+
	415	+ public String getCjfy() {
	416	+ return cjfy;
	417	+ }
	418	+
	419	+ public void setCjfy(String cjfy) {
	420	+ this.cjfy = cjfy;
	421	+ }
	422	+
	423	+ public String getZl() {
	424	+ return zl;
	425	+ }
	426	+
	427	+ public void setZl(String zl) {
	428	+ this.zl = zl;
	429	+ }
	430	+
385	431	public String getQzdbh() {
386	432	return qzdbh;
387	433	}

...	...	@@ -908,6 +908,12 @@
908	908	babyModel1.setImpression(baby.getImpression());
909	909	babyModel1.setQzdbh(baby.getQzdbh());
910	910
	911	+ babyModel1.setHx(baby.getHx());
	912	+ babyModel1.setXt(baby.getXt());
	913	+ babyModel1.setYs(baby.getYs());
	914	+ babyModel.setCjfy(baby.getCjfy());
	915	+ babyModel.setZl(baby.getZl());
	916	+
911	917	babyService.findAndModify(query.convertToQuery(), babyModel1);
912	918	}
913	919	babyList.add(babyModel);
...	...	@@ -1088,6 +1094,12 @@
1088	1094	babyModel.setZhixi(baby1.getZhixi());
1089	1095	babyModel.setImpression(baby1.getImpression());
1090	1096	babyModel.setQzdbh(baby1.getQzdbh());
	1097	+
	1098	+ babyModel.setHx(baby1.getHx());
	1099	+ babyModel.setXt(baby1.getXt());
	1100	+ babyModel.setYs(baby1.getYs());
	1101	+ babyModel.setCjfy(baby1.getCjfy());
	1102	+ babyModel.setZl(baby1.getZl());
1091	1103
1092	1104
1093	1105	//判断妊娠结局是活产才添加数据

...	...	@@ -2788,7 +2788,13 @@
2788	2788
2789	2789	map.put("ysqk",data.getYsqk());
2790	2790	map.put("zgnmz",data.getZgnmz());
	2791	+ map.put("dlfm",data.getDlfm());
	2792	+ map.put("fmzty",data.getFmzty());
	2793	+ map.put("zypbfm",data.getZypbfm());
	2794	+ map.put("totalOneCxl",data.getTotalOneCxl());
	2795	+ map.put("xsebz",data.getXsebz());
2791	2796
	2797	+
2792	2798	/* 产后生理 */
2793	2799	map.put("maternalInfo", data.getMaternalInfo() == null ? "" : CfEnums.getTitle(data.getMaternalInfo()));
2794	2800	map.put("deathCause", com.lyms.platform.common.utils.StringUtils.isEmpty(data.getDeathCause()) ? "--" : DeathCauseEnums.getName(data.getDeathCause()));
...	...	@@ -3074,6 +3080,12 @@
3074	3080	babyMap.put("zhixi",temp.getZhixi());
3075	3081	babyMap.put("impression",temp.getImpression());
3076	3082	babyMap.put("qzdbh",temp.getQzdbh());
	3083	+
	3084	+ babyMap.put("hx",temp.getHx());
	3085	+ babyMap.put("xt",temp.getXt());
	3086	+ babyMap.put("ys",temp.getYs());
	3087	+ babyMap.put("cjfy",temp.getCjfy());
	3088	+ babyMap.put("zl",temp.getZl());
3077	3089
3078	3090	babyList.add(babyMap);
3079	3091	}