jiangjiazhi / regional-platform

Authored by jiangjiazhi over 9 years ago

Exists in master and in 8 other branches

Showing 3 changed files with 27 additions and 1 deletions

...	...	@@ -32,6 +32,16 @@
32	32	private Date created;
33	33	private Date modified;
34	34
	35	+ private String days;
	36	+
	37	+ public String getDays() {
	38	+ return days;
	39	+ }
	40	+
	41	+ public void setDays(String days) {
	42	+ this.days = days;
	43	+ }
	44	+
35	45	/**
36	46	* 新生儿的id
37	47	*/
...	...	@@ -64,6 +74,7 @@
64	74	public void setModified(Date modified) {
65	75	this.modified = modified;
66	76	}
	77	+
67	78
68	79	/* // 名称
69	80	private String name;

...	...	@@ -8,6 +8,7 @@
8	8	import com.lyms.platform.pojo.BabyModel;
9	9	import com.lyms.platform.pojo.BabyVisitModel;
10	10	import com.lyms.platform.pojo.Patients;
	11	+import org.apache.commons.lang.StringUtils;
11	12
12	13	import java.util.Map;
13	14
...	...	@@ -753,6 +754,9 @@
753	754	babyVisitModel.setNextVisitDate(DateUtil.parseYMD(nextVisitDate));
754	755	babyVisitModel.setDoctorSign(doctorSign);
755	756	babyVisitModel.setId(id);
	757	+ if(StringUtils.isNotEmpty(birth)&&StringUtils.isNotEmpty(currentVisit)){
	758	+ babyVisitModel.setDays((DateUtil.getDays(DateUtil.parseYMD(birth), DateUtil.parseYMD(currentVisit)) + 1) + "");
	759	+ }
756	760	return babyVisitModel;
757	761	}
758	762

...	...	@@ -236,11 +236,22 @@
236	236	@Id
237	237	private String id;
238	238
	239	+ /**
	240	+ * 分娩后的天数
	241	+ */
	242	+ private String days;
239	243
240	244
	245	+
241	246	// 母亲患病情况
242	247
	248	+ public String getDays() {
	249	+ return days;
	250	+ }
243	251
	252	+ public void setDays(String days) {
	253	+ this.days = days;
	254	+ }
244	255
245	256	// 出生情况
246	257	private Map birthSituation;
...	...	@@ -716,7 +727,7 @@
716	727	setBirthSituation(JsonUtil.str2Obj(destModel.getBirthSituation(), Map.class));
717	728	setNeonatalAsphyxia(destModel.getNeonatalAsphyxia());
718	729	setDeformity(JsonUtil.str2Obj(destModel.getDeformity(), Map.class));
719		-
	730	+ setDays(destModel.getDays());
720	731	setHearing(destModel.getHearing());
721	732	setDisease(JsonUtil.str2Obj(destModel.getDisease(),Map.class));
722	733	setBirthWeight(destModel.getBirthWeight());