jiangjiazhi / regional-platform

Authored by jiangjiazhi over 9 years ago

Exists in master and in 8 other branches

Showing 3 changed files with 48 additions and 1 deletions

...	...	@@ -3,6 +3,7 @@
3	3	import org.springframework.data.mongodb.core.mapping.Document;
4	4
5	5	import java.io.Serializable;
	6	+import java.util.Date;
6	7	import java.util.List;
7	8
8	9	/**
...	...	@@ -15,7 +16,10 @@
15	16
16	17	private String id;
17	18	private String parentId;
18		-
	19	+ //预产期
	20	+ private Date dueDate;
	21	+ //末次月经
	22	+ private Date lastMenses;
19	23	// 既往史
20	24	private String pastHistory ;
21	25	// 家族史
...	...	@@ -688,6 +692,22 @@
688	692
689	693	public void setYghxkt(String yghxkt) {
690	694	this.yghxkt = yghxkt;
	695	+ }
	696	+
	697	+ public Date getDueDate() {
	698	+ return dueDate;
	699	+ }
	700	+
	701	+ public void setDueDate(Date dueDate) {
	702	+ this.dueDate = dueDate;
	703	+ }
	704	+
	705	+ public Date getLastMenses() {
	706	+ return lastMenses;
	707	+ }
	708	+
	709	+ public void setLastMenses(Date lastMenses) {
	710	+ this.lastMenses = lastMenses;
691	711	}
692	712	}

...	...	@@ -3,8 +3,10 @@
3	3	import com.lyms.platform.common.base.IBasicRequestConvert;
4	4	import com.lyms.platform.common.core.annotation.form.FormParam;
5	5	import com.lyms.platform.common.core.annotation.form.Form;
	6	+import com.lyms.platform.common.utils.DateUtil;
6	7	import com.lyms.platform.common.utils.JsonUtil;
7	8	import com.lyms.platform.pojo.AntExChuModel;
	9	+import org.apache.commons.lang.StringUtils;
8	10	import org.hibernate.validator.constraints.NotEmpty;
9	11
10	12	import java.util.Date;
...	...	@@ -789,6 +791,13 @@
789	791	antExChuModel.setProdDoctor(prodDoctor);
790	792	antExChuModel.setCheckTime(checkTime);
791	793	antExChuModel.setNextCheckTime(JsonUtil.obj2JsonString(nextCheckTime));
	794	+ if(StringUtils.isNotEmpty(lastMenses)){
	795	+ antExChuModel.setLastMenses(DateUtil.parseYMD(lastMenses));
	796	+ }
	797	+ if(StringUtils.isNotEmpty(dueDate)){
	798	+ antExChuModel.setDueDate(DateUtil.parseYMD(dueDate));
	799	+ }
	800	+
792	801	return antExChuModel;
793	802	}
794	803

1	1	package com.lyms.platform.operate.web.result;
2	2
	3	+import com.lyms.platform.common.utils.DateUtil;
3	4	import com.lyms.platform.common.utils.JsonUtil;
4	5	import com.lyms.platform.operate.web.request.MatDeliverAddRequest;
5	6	import com.lyms.platform.pojo.AntExChuModel;
	7	+import org.apache.commons.lang.StringUtils;
6	8
7	9	import java.util.List;
8	10	import java.util.Map;
...	...	@@ -36,6 +38,8 @@
36	38	private String remarks;*/
37	39	//末次月经
38	40	private String lastMenses;
	41	+ //预产期
	42	+ private String dueDate;
39	43
40	44	/**
41	45	* 初检信息
42	46
...	...	@@ -823,8 +827,22 @@
823	827	setHivkt(antExChuModel.getHivkt());
824	828	setYdfmw(JsonUtil.str2Obj(antExChuModel.getYdfmw(), Map.class));
825	829	setYdqjd(antExChuModel.getYdqjd());
	830	+ if(null!=antExChuModel.getDueDate()){
	831	+ setDueDate(DateUtil.getyyyy_MM_dd(antExChuModel.getDueDate()));
	832	+ }
	833	+ if(null!=antExChuModel.getLastMenses()) {
	834	+ setLastMenses(DateUtil.getyyyy_MM_dd(antExChuModel.getLastMenses()));
	835	+ }
826	836	}
827	837	return this;
	838	+ }
	839	+
	840	+ public String getDueDate() {
	841	+ return dueDate;
	842	+ }
	843	+
	844	+ public void setDueDate(String dueDate) {
	845	+ this.dueDate = dueDate;
828	846	}
829	847	}