jiangjiazhi / regional-platform

Authored by jiangjiazhi over 8 years ago

Exists in master and in 8 other branches

Showing 3 changed files with 31 additions and 1 deletions

...	...	@@ -27,6 +27,7 @@
27	27	private Integer tireNumber;
28	28	//胎盘
29	29	private String placenta;
	30	+ private String deathCauseText;
30	31	/*//心率
31	32	private double heartRate;
32	33	//胎方位
...	...	@@ -132,6 +133,14 @@
132	133
133	134	public void setPid(String pid) {
134	135	this.pid = pid;
	136	+ }
	137	+
	138	+ public String getDeathCauseText() {
	139	+ return deathCauseText;
	140	+ }
	141	+
	142	+ public void setDeathCauseText(String deathCauseText) {
	143	+ this.deathCauseText = deathCauseText;
135	144	}
136	145
137	146	public static class Baby {

...	...	@@ -52,6 +52,8 @@
52	52	private String maternalInfo;
53	53	//死亡原因
54	54	private String deathCause;
	55	+ //死亡原因其他
	56	+ private String deathCauseText;
55	57	//产后血压
56	58	private Map chBp;
57	59	//产后2小时血压
...	...	@@ -80,6 +82,14 @@
80	82	//接生医生
81	83	private String deliverDoctor;
82	84
	85	+ public String getDeathCauseText() {
	86	+ return deathCauseText;
	87	+ }
	88	+
	89	+ public void setDeathCauseText(String deathCauseText) {
	90	+ this.deathCauseText = deathCauseText;
	91	+ }
	92	+
83	93	public List<MaternalDeliverModel.ExtPlacenta> getExtPlacentas() {
84	94	return extPlacentas;
85	95	}
...	...	@@ -157,6 +167,7 @@
157	167	maternalDeliverModel.setUmbilicalCordLength(umbilicalCordLength);*/
158	168	maternalDeliverModel.setExtPlacentas(extPlacentas);
159	169	maternalDeliverModel.setFmHospital(fmHospital);
	170	+ maternalDeliverModel.setDeathCauseText(deathCauseText);
160	171	maternalDeliverModel.setDeliverDoctor(deliverDoctor);
161	172	maternalDeliverModel.setId(id);
162	173	return maternalDeliverModel;

...	...	@@ -65,6 +65,8 @@
65	65	private Integer rHloseBloodL;
66	66	//第3产层+产后失血量
67	67	private Integer sHloseBloodL;
	68	+ //死亡原因其他
	69	+ private String deathCauseText;
68	70	//失血原因
69	71	private Map loseBloodCause;
70	72	//产科并发症
71	73
...	...	@@ -77,10 +79,18 @@
77	79	//接生医生
78	80	private Map<String,String> deliverDoctor;
79	81
	82	+ public String getDeathCauseText() {
	83	+ return deathCauseText;
	84	+ }
	85	+
	86	+ public void setDeathCauseText(String deathCauseText) {
	87	+ this.deathCauseText = deathCauseText;
	88	+ }
	89	+
80	90	public MaternalDeliverResult convertToResult(MaternalDeliverModel destModel) {
81	91	setId(destModel.getId());
82	92	setParentId(destModel.getParentId());
83		-
	93	+ setDeathCauseText(destModel.getDeathCauseText());
84	94	setDueDate(destModel.getDueDate());
85	95	setDueWeek(destModel.getDueWeek());
86	96	setTireNumber(destModel.getTireNumber());