fangcheng / regional-platform

Commit ba9b1fb0097b6b5c6c59b7e1cd65d777c101def0

Authored by jiangjiazhi over 9 years ago

产妇增加字段

Showing 2 changed files with 23 additions and 68 deletions

platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntenatalExaminationResult.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/AntexChuResult.java

...	...	@@ -39,7 +39,7 @@
39	39	FetalPosition 胎方位
40	40	FetalPresentation 胎先露
41	41	join 衔接*/
42		- private String tireData;
	42	+ private List tireData;
43	43	//血红蛋白
44	44	private String hemoglobin;
45	45	//尿蛋白
...	...	@@ -89,7 +89,7 @@
89	89	setId(destModel.getId());
90	90	setOtherRisk(destModel.getOtherRisk());
91	91	setTireNumber(destModel.getTireNumber());
92		- setTireData(JsonUtil.obj2JsonString(destModel.getTireData()));
	92	+ setTireData(destModel.getTireData());
93	93	setType(destModel.getType());
94	94	return this;
95	95	}
96	96
...	...	@@ -246,11 +246,11 @@
246	246	this.riskScore = riskScore;
247	247	}
248	248
249		- public String getTireData() {
	249	+ public List getTireData() {
250	250	return tireData;
251	251	}
252	252
253		- public void setTireData(String tireData) {
	253	+ public void setTireData(List tireData) {
254	254	this.tireData = tireData;
255	255	}
256	256

1	1	package com.lyms.platform.operate.web.result;
2	2
	3	+import com.lyms.platform.common.base.IBasicResultConvert;
	4	+import com.lyms.platform.common.utils.DateUtil;
3	5	import com.lyms.platform.operate.web.request.MatDeliverAddRequest;
	6	+import com.lyms.platform.pojo.AntExChuModel;
	7	+import com.lyms.platform.pojo.AntenatalExaminationModel;
	8	+import com.lyms.platform.pojo.Patients;
	9	+import org.apache.commons.collections.CollectionUtils;
4	10
	11	+import java.util.ArrayList;
5	12	import java.util.Date;
6	13	import java.util.List;
7	14
8	15
...	...	@@ -10,12 +17,12 @@
10	17	* 产前检查初诊 *
11	18	* Created by Administrator on 2016/6/20 0020.
12	19	*/
13		-public class AntexChuResult {
	20	+public class AntexChuResult {
14	21
15	22	private String parentId;
16	23	/基本信息/
17	24	private String id;
18		- //名字
	25	+ /* //名字
19	26	private String name;
20	27	//年龄
21	28	private Integer age;
...	...	@@ -30,7 +37,7 @@
30	37	//高危评分
31	38	private String riskScore;
32	39	//备注
33		- private String remarks;
	40	+ private String remarks;*/
34	41	//末次月经
35	42	private String lastMenses;
36	43
37	44
...	...	@@ -193,13 +200,7 @@
193	200	this.abortion = abortion;
194	201	}
195	202
196		- public Integer getAge() {
197		- return age;
198		- }
199	203
200		- public void setAge(Integer age) {
201		- this.age = age;
202		- }
203	204
204	205	public String getAlbumin() {
205	206	return albumin;
206	207
...	...	@@ -305,14 +306,7 @@
305	306	this.dirOpinion = dirOpinion;
306	307	}
307	308
308		- public String getDueWeek() {
309		- return dueWeek;
310		- }
311	309
312		- public void setDueWeek(String dueWeek) {
313		- this.dueWeek = dueWeek;
314		- }
315		-
316	310	public String getFamilyHistory() {
317	311	return familyHistory;
318	312	}
319	313
...	...	@@ -409,13 +403,7 @@
409	403	this.mdxqsy = mdxqsy;
410	404	}
411	405
412		- public String getName() {
413		- return name;
414		- }
415	406
416		- public void setName(String name) {
417		- this.name = name;
418		- }
419	407
420	408	public String getNcgOther() {
421	409	return ncgOther;
422	410
...	...	@@ -481,13 +469,7 @@
481	469	this.personalHistory = personalHistory;
482	470	}
483	471
484		- public String getPhone() {
485		- return phone;
486		- }
487	472
488		- public void setPhone(String phone) {
489		- this.phone = phone;
490		- }
491	473
492	474	public List<MatDeliverAddRequest.Placenta> getPlacentas() {
493	475	return placentas;
494	476
495	477
...	...	@@ -537,38 +519,8 @@
537	519	this.prodTime = prodTime;
538	520	}
539	521
540		- public String getRemarks() {
541		- return remarks;
542		- }
543	522
544		- public void setRemarks(String remarks) {
545		- this.remarks = remarks;
546		- }
547	523
548		- public String getRh() {
549		- return rh;
550		- }
551		-
552		- public void setRh(String rh) {
553		- this.rh = rh;
554		- }
555		-
556		- public String getRiskFactor() {
557		- return riskFactor;
558		- }
559		-
560		- public void setRiskFactor(String riskFactor) {
561		- this.riskFactor = riskFactor;
562		- }
563		-
564		- public String getRiskScore() {
565		- return riskScore;
566		- }
567		-
568		- public void setRiskScore(String riskScore) {
569		- this.riskScore = riskScore;
570		- }
571		-
572	524	public String getStillbirth() {
573	525	return stillbirth;
574	526	}
575	527
...	...	@@ -673,13 +625,7 @@
673	625	this.xqjq = xqjq;
674	626	}
675	627
676		- public String getyChanQi() {
677		- return yChanQi;
678		- }
679	628
680		- public void setyChanQi(String yChanQi) {
681		- this.yChanQi = yChanQi;
682		- }
683	629
684	630	public String getYdfmw() {
685	631	return ydfmw;
...	...	@@ -775,6 +721,15 @@
775	721
776	722	public void setParentId(String parentId) {
777	723	this.parentId = parentId;
	724	+ }
	725	+
	726	+ public AntexChuResult convertToResult(AntExChuModel antExChuModel) {
	727	+ setId(antExChuModel.getId());
	728	+ setParentId(antExChuModel.getParentId());
	729	+ setAbo(antExChuModel.getAbortion());
	730	+ setAlbumin(antExChuModel.getAbortion());
	731	+ setBaricIndex(antExChuModel.getBaricIndex());
	732	+ return this;
778	733	}
779	734	}