jiangjiazhi / regional-platform

Commit 9a8d28b1c041c0d913d1cca0e51548f6813cfe00

Authored by jiangjiazhi over 9 years ago

Exists in master and in 8 other branches

产妇增加字段

Showing 6 changed files with 225 additions and 287 deletions

platform-dal/src/main/java/com/lyms/platform/pojo/MaternalDeliverModel.java
platform-dal/src/main/java/com/lyms/platform/pojo/ReferralApplyOrderModel.java
platform-dal/src/main/java/com/lyms/platform/pojo/SieveApplyOrderModel.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/ApplyOrderFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/MatDeliverAddRequest.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/MaternalDeliverResult.java

...	...	@@ -71,7 +71,7 @@
71	71	private String loseBloodCause;
72	72	//产科并发症
73	73	private String ocs;
74		- //胎盘娩出方式
	74	+ /* //胎盘娩出方式
75	75	private String tpmcType;
76	76	//娩出方式
77	77	private String mcType;
...	...	@@ -84,29 +84,9 @@
84	84	// 脐带异常
85	85	private String umbilicalCordEx;
86	86	// 脐带异常类型
87		- private String umbilicalCordExType;
88		- /* //新生儿性别;
89		- private String babyGender;
90		- //新生儿重量
91		- private String babyWeight;
92		- //新生儿生长
93		- private String babyHeight;
94		- //畸形
95		- private String deformity;
96		- //apgar评分
97		- private String apgarScore;
98		- //窒息分钟
99		- private String asphyxiaM;
100		- // 妊娠结局
101		- private String pregnancyOut;
102		- //新生儿疾病
103		- private String babyHealthy;
104		- //母婴接触开始
105		- private String contactStartM;
106		- //母婴接触时间
107		- private String contactM;
108		- //早吮吸
109		- private String earlySuck;*/
	87	+ private String umbilicalCordExType;*/
	88	+ private List<ExtPlacenta> extPlacentas;
	89	+
110	90	//存放新生儿表的id
111	91	private List<String> baby;
112	92	//分娩医院
113	93
...	...	@@ -114,7 +94,78 @@
114	94	//接生医生
115	95	private String deliverDoctor;
116	96	private Integer yn;
	97	+ public class ExtPlacenta{
	98	+ //胎盘娩出方式
	99	+ private String tpmcType;
	100	+ //娩出方式
	101	+ private String mcType;
	102	+ // 胎盘大小
	103	+ private java.util.Map tpSize;
	104	+ // 胎盘重量
	105	+ private String tpWeight;
	106	+ //脐带长度
	107	+ private String umbilicalCordLength;
	108	+ // 脐带异常
	109	+ private String umbilicalCordEx;
	110	+ // 脐带异常类型
	111	+ private String umbilicalCordExType;
117	112
	113	+ public String getMcType() {
	114	+ return mcType;
	115	+ }
	116	+
	117	+ public void setMcType(String mcType) {
	118	+ this.mcType = mcType;
	119	+ }
	120	+
	121	+ public String getTpmcType() {
	122	+ return tpmcType;
	123	+ }
	124	+
	125	+ public void setTpmcType(String tpmcType) {
	126	+ this.tpmcType = tpmcType;
	127	+ }
	128	+
	129	+ public java.util.Map getTpSize() {
	130	+ return tpSize;
	131	+ }
	132	+
	133	+ public void setTpSize(java.util.Map tpSize) {
	134	+ this.tpSize = tpSize;
	135	+ }
	136	+
	137	+ public String getTpWeight() {
	138	+ return tpWeight;
	139	+ }
	140	+
	141	+ public void setTpWeight(String tpWeight) {
	142	+ this.tpWeight = tpWeight;
	143	+ }
	144	+
	145	+ public String getUmbilicalCordEx() {
	146	+ return umbilicalCordEx;
	147	+ }
	148	+
	149	+ public void setUmbilicalCordEx(String umbilicalCordEx) {
	150	+ this.umbilicalCordEx = umbilicalCordEx;
	151	+ }
	152	+
	153	+ public String getUmbilicalCordExType() {
	154	+ return umbilicalCordExType;
	155	+ }
	156	+
	157	+ public void setUmbilicalCordExType(String umbilicalCordExType) {
	158	+ this.umbilicalCordExType = umbilicalCordExType;
	159	+ }
	160	+
	161	+ public String getUmbilicalCordLength() {
	162	+ return umbilicalCordLength;
	163	+ }
	164	+
	165	+ public void setUmbilicalCordLength(String umbilicalCordLength) {
	166	+ this.umbilicalCordLength = umbilicalCordLength;
	167	+ }
	168	+ }
118	169	public Integer getYn() {
119	170	return yn;
120	171	}
121	172
...	...	@@ -227,13 +278,7 @@
227	278	this.maternalInfo = maternalInfo;
228	279	}
229	280
230		- public String getMcType() {
231		- return mcType;
232		- }
233	281
234		- public void setMcType(String mcType) {
235		- this.mcType = mcType;
236		- }
237	282
238	283	public Integer getNeedleNum() {
239	284	return needleNum;
240	285
...	...	@@ -363,52 +408,12 @@
363	408	this.totalprocess = totalprocess;
364	409	}
365	410
366		- public String getTpmcType() {
367		- return tpmcType;
	411	+ public List<ExtPlacenta> getExtPlacentas() {
	412	+ return extPlacentas;
368	413	}
369	414
370		- public void setTpmcType(String tpmcType) {
371		- this.tpmcType = tpmcType;
372		- }
373		-
374		- public String getTpSize() {
375		- return tpSize;
376		- }
377		-
378		- public void setTpSize(String tpSize) {
379		- this.tpSize = tpSize;
380		- }
381		-
382		- public String getTpWeight() {
383		- return tpWeight;
384		- }
385		-
386		- public void setTpWeight(String tpWeight) {
387		- this.tpWeight = tpWeight;
388		- }
389		-
390		- public String getUmbilicalCordEx() {
391		- return umbilicalCordEx;
392		- }
393		-
394		- public void setUmbilicalCordEx(String umbilicalCordEx) {
395		- this.umbilicalCordEx = umbilicalCordEx;
396		- }
397		-
398		- public String getUmbilicalCordExType() {
399		- return umbilicalCordExType;
400		- }
401		-
402		- public void setUmbilicalCordExType(String umbilicalCordExType) {
403		- this.umbilicalCordExType = umbilicalCordExType;
404		- }
405		-
406		- public String getUmbilicalCordLength() {
407		- return umbilicalCordLength;
408		- }
409		-
410		- public void setUmbilicalCordLength(String umbilicalCordLength) {
411		- this.umbilicalCordLength = umbilicalCordLength;
	415	+ public void setExtPlacentas(List<ExtPlacenta> extPlacentas) {
	416	+ this.extPlacentas = extPlacentas;
412	417	}
413	418	}

...	...	@@ -2,6 +2,8 @@
2	2
3	3	import org.springframework.data.mongodb.core.mapping.Document;
4	4
	5	+import java.util.Date;
	6	+
5	7	/**
6	8	* 转诊申请单
7	9	* <p>
...	...	@@ -27,6 +29,26 @@
27	29	private String transferMode;
28	30	//申请医生
29	31	private String applyDoctor;
	32	+ //创建时间
	33	+ private Date created;
	34	+ //申请单状态 0 已接收 1 已转出 2 建议转诊
	35	+ private Integer status;
	36	+
	37	+ public Integer getStatus() {
	38	+ return status;
	39	+ }
	40	+
	41	+ public void setStatus(Integer status) {
	42	+ this.status = status;
	43	+ }
	44	+
	45	+ public Date getCreated() {
	46	+ return created;
	47	+ }
	48	+
	49	+ public void setCreated(Date created) {
	50	+ this.created = created;
	51	+ }
30	52
31	53	public String getApplyDoctor() {
32	54	return applyDoctor;

...	...	@@ -2,6 +2,8 @@
2	2
3	3	import org.springframework.data.mongodb.core.mapping.Document;
4	4
	5	+import java.util.Date;
	6	+
5	7	/**
6	8	* 产筛申请单
7	9	* <p>
...	...	@@ -20,6 +22,17 @@
20	22	private String checkDate;
21	23	//申请医生
22	24	private String applyDoctor;
	25	+
	26	+ public Date getCreated() {
	27	+ return created;
	28	+ }
	29	+
	30	+ public void setCreated(Date created) {
	31	+ this.created = created;
	32	+ }
	33	+
	34	+ //创建时间
	35	+ private Date created;
23	36
24	37	public String getApplyDoctor() {
25	38	return applyDoctor;

...	...	@@ -13,6 +13,7 @@
13	13	import org.springframework.beans.factory.annotation.Autowired;
14	14	import org.springframework.stereotype.Component;
15	15
	16	+import java.util.Date;
16	17	import java.util.List;
17	18
18	19	/**
...	...	@@ -30,7 +31,10 @@
30	31	* @return
31	32	*/
32	33	public BaseResponse addOneReferralApplyOrder(ReferralApplyOrderAddRequest referralApplyOrderAddRequest) {
33		- applyOrderService.addOneReferralApplyOrder(referralApplyOrderAddRequest.convertToDataModel());
	34	+ ReferralApplyOrderModel referralApplyOrderModel = referralApplyOrderAddRequest.convertToDataModel();
	35	+ referralApplyOrderModel.setCreated(new Date());
	36	+ referralApplyOrderModel.setStatus(0);
	37	+ applyOrderService.addOneReferralApplyOrder(referralApplyOrderModel);
34	38	return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功");
35	39	}
36	40
...	...	@@ -41,7 +45,9 @@
41	45	* @return
42	46	*/
43	47	public BaseResponse addOneSieveApplyOrder(SieveApplyOrderAddRequest sieveApplyOrderAddRequest) {
44		- applyOrderService.addOneSieveApplyOrder(sieveApplyOrderAddRequest.convertToDataModel());
	48	+ SieveApplyOrderModel sieveApplyOrderModel = sieveApplyOrderAddRequest.convertToDataModel();
	49	+ sieveApplyOrderModel.setCreated(new Date());
	50	+ applyOrderService.addOneSieveApplyOrder(sieveApplyOrderModel);
45	51	return new BaseResponse().setErrorcode(ErrorCodeConstants.SUCCESS).setErrormsg("成功");
46	52	}
47	53

...	...	@@ -12,6 +12,7 @@
12	12	import java.util.ArrayList;
13	13	import java.util.Date;
14	14	import java.util.List;
	15	+import java.util.Map;
15	16
16	17	/**
17	18	* Created by Administrator on 2016/6/17 0017.
18	19
19	20
20	21
21	22
...	...	@@ -31,18 +32,20 @@
31	32	private String placenta;
32	33	//胎盘信息
33	34	private List<Placenta> placentas;
	35	+ //胎盘及新生儿
	36	+ private List<MaternalDeliverModel.ExtPlacenta> extPlacentas;
34	37	//分娩方式
35		- private String deliveryMode;
	38	+ private Map deliveryMode;
36	39	//手术原因
37	40	private String operationCause;
38	41	//产程 h 小时 m 分
39		- private String prodprocess;
	42	+ private Map prodprocess;
40	43	//总产程
41		- private String totalprocess;
	44	+ private Map totalprocess;
42	45	//会阴情况
43	46	private String perinealCondition;
44	47	//撕裂等级
45		- private int siLielevel;
	48	+ private Integer siLielevel;
46	49	//锋线针数
47	50	private Integer needleNum;
48	51	//产妇情况
49	52
...	...	@@ -50,9 +53,9 @@
50	53	//死亡原因
51	54	private String deathCause;
52	55	//产后血压
53		- private String chBp;
	56	+ private Map chBp;
54	57	//产后2小时血压
55		- private String ch2Bp;
	58	+ private Map ch2Bp;
56	59	//呼吸
57	60	private String breath;
58	61	// 脉搏
59	62
60	63
...	...	@@ -68,27 +71,23 @@
68	71	//失血原因
69	72	private String loseBloodCause;
70	73	//产科并发症
71		- private String ocs;
72		- //胎盘娩出方式
73		- private String tpmcType;
74		- //娩出方式
75		- private String mcType;
76		- // 胎盘大小
77		- private String tpSize;
78		- // 胎盘重量
79		- private String tpWeight;
80		- //脐带长度
81		- private String umbilicalCordLength;
82		- // 脐带异常
83		- private String umbilicalCordEx;
84		- // 脐带异常类型
85		- private String umbilicalCordExType;
	74	+ private java.util.Map ocs;
86	75
	76	+
87	77	private List<Baby> babies;
88	78	//分娩医院
89	79	private String fmHospital;
90	80	//接生医生
91	81	private String deliverDoctor;
	82	+
	83	+ public List<MaternalDeliverModel.ExtPlacenta> getExtPlacentas() {
	84	+ return extPlacentas;
	85	+ }
	86	+
	87	+ public void setExtPlacentas(List<MaternalDeliverModel.ExtPlacenta> extPlacentas) {
	88	+ this.extPlacentas = extPlacentas;
	89	+ }
	90	+
92	91	@Override
93	92	public MaternalDeliverModel convertToDataModel() {
94	93	MaternalDeliverModel maternalDeliverModel=new MaternalDeliverModel();
95	94
96	95
...	...	@@ -98,17 +97,17 @@
98	97	maternalDeliverModel.setTireNumber(tireNumber);
99	98	maternalDeliverModel.setPlacenta(placenta);
100	99	maternalDeliverModel.setPlacentas(placentas);
101		- maternalDeliverModel.setDeliveryMode(deliveryMode);
	100	+ maternalDeliverModel.setDeliveryMode(JsonUtil.obj2JsonString(deliveryMode));
102	101	maternalDeliverModel.setOperationCause(operationCause);
103		- maternalDeliverModel.setProdprocess(prodprocess);
104		- maternalDeliverModel.setTotalprocess(totalprocess);
	102	+ maternalDeliverModel.setProdprocess(JsonUtil.obj2JsonString(prodprocess));
	103	+ maternalDeliverModel.setTotalprocess(JsonUtil.obj2JsonString(totalprocess));
105	104	maternalDeliverModel.setPerinealCondition(perinealCondition);
106	105	maternalDeliverModel.setSiLielevel(siLielevel);
107	106	maternalDeliverModel.setNeedleNum(needleNum);
108	107	maternalDeliverModel.setMaternalInfo(maternalInfo);
109	108	maternalDeliverModel.setDeathCause(deathCause);
110		- maternalDeliverModel.setChBp(chBp);
111		- maternalDeliverModel.setCh2Bp(ch2Bp);
	109	+ maternalDeliverModel.setChBp(JsonUtil.obj2JsonString(chBp));
	110	+ maternalDeliverModel.setCh2Bp(JsonUtil.obj2JsonString(ch2Bp));
112	111	maternalDeliverModel.setBreath(breath);
113	112	maternalDeliverModel.setPulse(pulse);
114	113	maternalDeliverModel.setoHloseBloodL(oHloseBloodL);
115	114
...	...	@@ -116,14 +115,15 @@
116	115	maternalDeliverModel.setrHloseBloodL(rHloseBloodL);
117	116	maternalDeliverModel.setsHloseBloodL(sHloseBloodL);
118	117	maternalDeliverModel.setLoseBloodCause(loseBloodCause);
119		- maternalDeliverModel.setOcs(ocs);
120		- maternalDeliverModel.setTpmcType(tpmcType);
	118	+ maternalDeliverModel.setOcs(JsonUtil.obj2JsonString(ocs));
	119	+ /*maternalDeliverModel.setTpmcType(tpmcType);
121	120	maternalDeliverModel.setMcType(mcType);
122	121	maternalDeliverModel.setTpSize(tpSize);
123	122	maternalDeliverModel.setTpWeight(tpWeight);
124	123	maternalDeliverModel.setUmbilicalCordExType(umbilicalCordExType);
125	124	maternalDeliverModel.setUmbilicalCordEx(umbilicalCordEx);
126		- maternalDeliverModel.setUmbilicalCordLength(umbilicalCordLength);
	125	+ maternalDeliverModel.setUmbilicalCordLength(umbilicalCordLength);*/
	126	+ maternalDeliverModel.setExtPlacentas(extPlacentas);
127	127	maternalDeliverModel.setFmHospital(fmHospital);
128	128	maternalDeliverModel.setDeliverDoctor(deliverDoctor);
129	129	return maternalDeliverModel;
130	130
...	...	@@ -145,46 +145,7 @@
145	145	this.breath = breath;
146	146	}
147	147
148		- public String getCh2Bp() {
149		- return ch2Bp;
150		- }
151	148
152		- public void setCh2Bp(String ch2Bp) {
153		- this.ch2Bp = ch2Bp;
154		- }
155		-
156		- public String getChBp() {
157		- return chBp;
158		- }
159		-
160		- public void setChBp(String chBp) {
161		- this.chBp = chBp;
162		- }
163		-
164		- public String getDeathCause() {
165		- return deathCause;
166		- }
167		-
168		- public void setDeathCause(String deathCause) {
169		- this.deathCause = deathCause;
170		- }
171		-
172		- public String getDeliverDoctor() {
173		- return deliverDoctor;
174		- }
175		-
176		- public void setDeliverDoctor(String deliverDoctor) {
177		- this.deliverDoctor = deliverDoctor;
178		- }
179		-
180		- public String getDeliveryMode() {
181		- return deliveryMode;
182		- }
183		-
184		- public void setDeliveryMode(String deliveryMode) {
185		- this.deliveryMode = deliveryMode;
186		- }
187		-
188	149	public String getDueDate() {
189	150	return dueDate;
190	151	}
191	152
...	...	@@ -233,13 +194,7 @@
233	194	this.maternalInfo = maternalInfo;
234	195	}
235	196
236		- public String getMcType() {
237		- return mcType;
238		- }
239	197
240		- public void setMcType(String mcType) {
241		- this.mcType = mcType;
242		- }
243	198
244	199	public Integer getNeedleNum() {
245	200	return needleNum;
246	201
...	...	@@ -249,13 +204,7 @@
249	204	this.needleNum = needleNum;
250	205	}
251	206
252		- public String getOcs() {
253		- return ocs;
254		- }
255	207
256		- public void setOcs(String ocs) {
257		- this.ocs = ocs;
258		- }
259	208
260	209	public String getoHloseBloodL() {
261	210	return oHloseBloodL;
262	211
...	...	@@ -305,13 +254,7 @@
305	254	this.placentas = placentas;
306	255	}
307	256
308		- public String getProdprocess() {
309		- return prodprocess;
310		- }
311	257
312		- public void setProdprocess(String prodprocess) {
313		- this.prodprocess = prodprocess;
314		- }
315	258
316	259	public String getPulse() {
317	260	return pulse;
318	261
319	262
320	263
321	264
322	265
323	266
324	267
325	268
326	269
327	270
328	271
329	272
330	273
331	274
332	275
...	...	@@ -361,63 +304,69 @@
361	304	this.tireNumber = tireNumber;
362	305	}
363	306
364		- public String getTotalprocess() {
365		- return totalprocess;
	307	+ public Map getCh2Bp() {
	308	+ return ch2Bp;
366	309	}
367	310
368		- public void setTotalprocess(String totalprocess) {
369		- this.totalprocess = totalprocess;
	311	+ public void setCh2Bp(Map ch2Bp) {
	312	+ this.ch2Bp = ch2Bp;
370	313	}
371	314
372		- public String getTpmcType() {
373		- return tpmcType;
	315	+ public Map getChBp() {
	316	+ return chBp;
374	317	}
375	318
376		- public void setTpmcType(String tpmcType) {
377		- this.tpmcType = tpmcType;
	319	+ public void setChBp(Map chBp) {
	320	+ this.chBp = chBp;
378	321	}
379	322
380		- public String getTpSize() {
381		- return tpSize;
	323	+ public String getDeathCause() {
	324	+ return deathCause;
382	325	}
383	326
384		- public void setTpSize(String tpSize) {
385		- this.tpSize = tpSize;
	327	+ public void setDeathCause(String deathCause) {
	328	+ this.deathCause = deathCause;
386	329	}
387	330
388		- public String getTpWeight() {
389		- return tpWeight;
	331	+ public String getDeliverDoctor() {
	332	+ return deliverDoctor;
390	333	}
391	334
392		- public void setTpWeight(String tpWeight) {
393		- this.tpWeight = tpWeight;
	335	+ public void setDeliverDoctor(String deliverDoctor) {
	336	+ this.deliverDoctor = deliverDoctor;
394	337	}
395	338
396		- public String getUmbilicalCordEx() {
397		- return umbilicalCordEx;
	339	+ public Map getDeliveryMode() {
	340	+ return deliveryMode;
398	341	}
399	342
400		- public void setUmbilicalCordEx(String umbilicalCordEx) {
401		- this.umbilicalCordEx = umbilicalCordEx;
	343	+ public void setDeliveryMode(Map deliveryMode) {
	344	+ this.deliveryMode = deliveryMode;
402	345	}
403	346
404		- public String getUmbilicalCordExType() {
405		- return umbilicalCordExType;
	347	+ public Map getOcs() {
	348	+ return ocs;
406	349	}
407	350
408		- public void setUmbilicalCordExType(String umbilicalCordExType) {
409		- this.umbilicalCordExType = umbilicalCordExType;
	351	+ public void setOcs(Map ocs) {
	352	+ this.ocs = ocs;
410	353	}
411	354
412		- public String getUmbilicalCordLength() {
413		- return umbilicalCordLength;
	355	+ public Map getProdprocess() {
	356	+ return prodprocess;
414	357	}
415	358
416		- public void setUmbilicalCordLength(String umbilicalCordLength) {
417		- this.umbilicalCordLength = umbilicalCordLength;
	359	+ public void setProdprocess(Map prodprocess) {
	360	+ this.prodprocess = prodprocess;
418	361	}
419	362
	363	+ public Map getTotalprocess() {
	364	+ return totalprocess;
	365	+ }
420	366
	367	+ public void setTotalprocess(Map totalprocess) {
	368	+ this.totalprocess = totalprocess;
	369	+ }
421	370
422	371	public static class Placenta{
423	372	//心率
...	...	@@ -461,6 +410,7 @@
461	410	this.join = join;
462	411	}
463	412	}
	413	+
464	414	public class Baby implements IBasicRequestConvert<BabyModel>{
465	415
466	416	private String id;

1	1	package com.lyms.platform.operate.web.result;
2	2
3		-import com.lyms.platform.common.base.IBasicResultConvert;
4	3	import com.lyms.platform.common.enums.SexEnum;
5		-import com.lyms.platform.pojo.AntenatalExaminationModel;
	4	+import com.lyms.platform.common.utils.JsonUtil;
6	5	import com.lyms.platform.pojo.BabyModel;
7	6	import com.lyms.platform.pojo.MaternalDeliverModel;
8		-import com.lyms.platform.pojo.Patients;
9	7
10	8	import java.util.List;
	9	+import java.util.Map;
11	10
12	11	/**
13	12	* 产妇分娩
14	13
...	...	@@ -30,11 +29,11 @@
30	29	//胎盘信息
31	30	private List<Placenta> placentas;
32	31	//分娩方式
33		- private String deliveryMode;
	32	+ private Map deliveryMode;
34	33	//手术原因
35	34	private String operationCause;
36	35	//产程 h 小时 m 分
37		- private String prodprocess;
	36	+ private Map prodprocess;
38	37	//总产程
39	38	private String totalprocess;
40	39	//会阴情况
41	40
...	...	@@ -48,9 +47,9 @@
48	47	//死亡原因
49	48	private String deathCause;
50	49	//产后血压
51		- private String chBp;
	50	+ private Map chBp;
52	51	//产后2小时血压
53		- private String ch2Bp;
	52	+ private Map ch2Bp;
54	53	//呼吸
55	54	private String breath;
56	55	// 脉搏
...	...	@@ -66,21 +65,8 @@
66	65	//失血原因
67	66	private String loseBloodCause;
68	67	//产科并发症
69		- private String ocs;
70		- //胎盘娩出方式
71		- private String tpmcType;
72		- //娩出方式
73		- private String mcType;
74		- // 胎盘大小
75		- private String tpSize;
76		- // 胎盘重量
77		- private String tpWeight;
78		- //脐带长度
79		- private String umbilicalCordLength;
80		- // 脐带异常
81		- private String umbilicalCordEx;
82		- // 脐带异常类型
83		- private String umbilicalCordExType;
	68	+ private Map ocs;
	69	+ private List<MaternalDeliverModel.ExtPlacenta> extPlacentas;
84	70
85	71	private List<Baby> babies;
86	72	//分娩医院
87	73
88	74
...	...	@@ -97,18 +83,18 @@
97	83	setTireNumber(destModel.getTireNumber());
98	84	setPlacenta(destModel.getPlacenta());
99	85	setPlacentas(destModel.getPlacentas());
100		- setDeliveryMode(destModel.getDeliveryMode());
	86	+ setDeliveryMode(JsonUtil.str2Obj(destModel.getDeliveryMode(),Map.class));
101	87	setOperationCause(destModel.getOperationCause());
102	88
103		- setProdprocess(destModel.getProdprocess());
	89	+ setProdprocess(JsonUtil.str2Obj(destModel.getProdprocess(),Map.class));
104	90	setTotalprocess(destModel.getTotalprocess());
105	91	setPerinealCondition(destModel.getPerinealCondition());
106	92	setSiLielevel(destModel.getSiLielevel());
107	93	setNeedleNum(destModel.getNeedleNum());
108	94	setMaternalInfo(destModel.getMaternalInfo());
109	95	setDeathCause(destModel.getDeathCause());
110		- setChBp(destModel.getChBp());
111		- setCh2Bp(destModel.getCh2Bp());
	96	+ setChBp(JsonUtil.str2Obj(destModel.getChBp(),Map.class));
	97	+ setCh2Bp(JsonUtil.str2Obj(destModel.getCh2Bp(),Map.class));
112	98	setBreath(destModel.getBreath());
113	99	setPulse(destModel.getPulse());
114	100	setoHloseBloodL(destModel.getoHloseBloodL());
...	...	@@ -116,14 +102,8 @@
116	102	setrHloseBloodL(destModel.getrHloseBloodL());
117	103	setsHloseBloodL(destModel.getsHloseBloodL());
118	104	setLoseBloodCause(destModel.getLoseBloodCause());
119		- setOcs(destModel.getOcs());
120		- setTpmcType(destModel.getTpmcType());
121		- setMcType(destModel.getMcType());
122		- setTpSize(destModel.getTpSize());
123		- setTpWeight(destModel.getTpWeight());
124		- setUmbilicalCordLength(destModel.getUmbilicalCordLength());
125		- setUmbilicalCordEx(destModel.getUmbilicalCordEx());
126		- setUmbilicalCordExType(destModel.getUmbilicalCordExType());
	105	+ setOcs(JsonUtil.str2Obj(destModel.getOcs(),Map.class));
	106	+ setExtPlacentas(destModel.getExtPlacentas());
127	107	setFmHospital(destModel.getFmHospital());
128	108
129	109	setDeliverDoctor(destModel.getDeliverDoctor());
130	110
131	111
...	...	@@ -327,22 +307,8 @@
327	307	this.breath = breath;
328	308	}
329	309
330		- public String getCh2Bp() {
331		- return ch2Bp;
332		- }
333	310
334		- public void setCh2Bp(String ch2Bp) {
335		- this.ch2Bp = ch2Bp;
336		- }
337	311
338		- public String getChBp() {
339		- return chBp;
340		- }
341		-
342		- public void setChBp(String chBp) {
343		- this.chBp = chBp;
344		- }
345		-
346	312	public String getDeathCause() {
347	313	return deathCause;
348	314	}
349	315
...	...	@@ -359,13 +325,7 @@
359	325	this.deliverDoctor = deliverDoctor;
360	326	}
361	327
362		- public String getDeliveryMode() {
363		- return deliveryMode;
364		- }
365	328
366		- public void setDeliveryMode(String deliveryMode) {
367		- this.deliveryMode = deliveryMode;
368		- }
369	329
370	330	public String getDueDate() {
371	331	return dueDate;
372	332
...	...	@@ -415,13 +375,7 @@
415	375	this.maternalInfo = maternalInfo;
416	376	}
417	377
418		- public String getMcType() {
419		- return mcType;
420		- }
421	378
422		- public void setMcType(String mcType) {
423		- this.mcType = mcType;
424		- }
425	379
426	380	public Integer getNeedleNum() {
427	381	return needleNum;
428	382
...	...	@@ -431,13 +385,7 @@
431	385	this.needleNum = needleNum;
432	386	}
433	387
434		- public String getOcs() {
435		- return ocs;
436		- }
437	388
438		- public void setOcs(String ocs) {
439		- this.ocs = ocs;
440		- }
441	389
442	390	public String getoHloseBloodL() {
443	391	return oHloseBloodL;
444	392
...	...	@@ -487,13 +435,7 @@
487	435	this.placentas = placentas;
488	436	}
489	437
490		- public String getProdprocess() {
491		- return prodprocess;
492		- }
493	438
494		- public void setProdprocess(String prodprocess) {
495		- this.prodprocess = prodprocess;
496		- }
497	439
498	440	public String getPulse() {
499	441	return pulse;
500	442
501	443
502	444
503	445
504	446
505	447
506	448
507	449
508	450
509	451
510	452
...	...	@@ -551,52 +493,52 @@
551	493	this.totalprocess = totalprocess;
552	494	}
553	495
554		- public String getTpmcType() {
555		- return tpmcType;
	496	+ public Map getCh2Bp() {
	497	+ return ch2Bp;
556	498	}
557	499
558		- public void setTpmcType(String tpmcType) {
559		- this.tpmcType = tpmcType;
	500	+ public void setCh2Bp(Map ch2Bp) {
	501	+ this.ch2Bp = ch2Bp;
560	502	}
561	503
562		- public String getTpSize() {
563		- return tpSize;
	504	+ public Map getChBp() {
	505	+ return chBp;
564	506	}
565	507
566		- public void setTpSize(String tpSize) {
567		- this.tpSize = tpSize;
	508	+ public void setChBp(Map chBp) {
	509	+ this.chBp = chBp;
568	510	}
569	511
570		- public String getTpWeight() {
571		- return tpWeight;
	512	+ public Map getDeliveryMode() {
	513	+ return deliveryMode;
572	514	}
573	515
574		- public void setTpWeight(String tpWeight) {
575		- this.tpWeight = tpWeight;
	516	+ public void setDeliveryMode(Map deliveryMode) {
	517	+ this.deliveryMode = deliveryMode;
576	518	}
577	519
578		- public String getUmbilicalCordEx() {
579		- return umbilicalCordEx;
	520	+ public List<MaternalDeliverModel.ExtPlacenta> getExtPlacentas() {
	521	+ return extPlacentas;
580	522	}
581	523
582		- public void setUmbilicalCordEx(String umbilicalCordEx) {
583		- this.umbilicalCordEx = umbilicalCordEx;
	524	+ public void setExtPlacentas(List<MaternalDeliverModel.ExtPlacenta> extPlacentas) {
	525	+ this.extPlacentas = extPlacentas;
584	526	}
585	527
586		- public String getUmbilicalCordExType() {
587		- return umbilicalCordExType;
	528	+ public Map getOcs() {
	529	+ return ocs;
588	530	}
589	531
590		- public void setUmbilicalCordExType(String umbilicalCordExType) {
591		- this.umbilicalCordExType = umbilicalCordExType;
	532	+ public void setOcs(Map ocs) {
	533	+ this.ocs = ocs;
592	534	}
593	535
594		- public String getUmbilicalCordLength() {
595		- return umbilicalCordLength;
	536	+ public Map getProdprocess() {
	537	+ return prodprocess;
596	538	}
597	539
598		- public void setUmbilicalCordLength(String umbilicalCordLength) {
599		- this.umbilicalCordLength = umbilicalCordLength;
	540	+ public void setProdprocess(Map prodprocess) {
	541	+ this.prodprocess = prodprocess;
600	542	}
601	543	}