jiangjiazhi / regional-platform

Authored by yangfei almost 8 years ago

Exists in master and in 6 other branches

Showing 2 changed files with 25 additions and 3 deletions

...	...	@@ -28,7 +28,7 @@
28	28	//分娩地址方式，本院、外院
29	29	private String fmType;
30	30	//外院地址
31		- private Date fmAddr;
	31	+ private String fmAddr;
32	32	private Date dueDate1;
33	33	//分娩孕周
34	34	private String dueWeek;
35	35
...	...	@@ -131,11 +131,11 @@
131	131	this.fmType = fmType;
132	132	}
133	133
134		- public Date getFmAddr() {
	134	+ public String getFmAddr() {
135	135	return fmAddr;
136	136	}
137	137
138		- public void setFmAddr(Date fmAddr) {
	138	+ public void setFmAddr(String fmAddr) {
139	139	this.fmAddr = fmAddr;
140	140	}
141	141

...	...	@@ -33,6 +33,10 @@
33	33	private List<Placenta> placentas;
34	34	//胎盘及新生儿
35	35	private List<MaternalDeliverModel.ExtPlacenta> extPlacentas;
	36	+ //分娩地址方式，本院、外院
	37	+ private String fmType;
	38	+ //外院地址
	39	+ private String fmAddr;
36	40	//分娩方式
37	41	private Map deliveryMode;
38	42	//手术原因
...	...	@@ -125,6 +129,22 @@
125	129	this.extPlacentas = extPlacentas;
126	130	}
127	131
	132	+ public String getFmType() {
	133	+ return fmType;
	134	+ }
	135	+
	136	+ public void setFmType(String fmType) {
	137	+ this.fmType = fmType;
	138	+ }
	139	+
	140	+ public String getFmAddr() {
	141	+ return fmAddr;
	142	+ }
	143	+
	144	+ public void setFmAddr(String fmAddr) {
	145	+ this.fmAddr = fmAddr;
	146	+ }
	147	+
128	148	public Double getoHloseBloodL() {
129	149	return oHloseBloodL;
130	150	}
...	...	@@ -160,6 +180,8 @@
160	180	@Override
161	181	public MaternalDeliverModel convertToDataModel() {
162	182	MaternalDeliverModel maternalDeliverModel=new MaternalDeliverModel();
	183	+ maternalDeliverModel.setFmType(fmType);
	184	+ maternalDeliverModel.setFmAddr(fmAddr);
163	185	maternalDeliverModel.setParentId(parentId);
164	186	maternalDeliverModel.setDueDate(dueDate);
165	187	maternalDeliverModel.setDueWeek(dueWeek);