fangcheng / regional-platform

Commit 6a46bbb20ff9d258a7d9ac875a349cdcd848ae45

Authored by jiangjiazhi over 9 years ago

产妇增加字段

Showing 1 changed file with 65 additions and 22 deletions

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

...	...	@@ -7,6 +7,7 @@
7	7	import com.lyms.platform.pojo.AntExChuModel;
8	8	import com.lyms.platform.pojo.AntenatalExaminationModel;
9	9	import com.lyms.platform.pojo.Patients;
	10	+import com.sun.javafx.collections.MappingChange;
10	11	import org.apache.commons.collections.CollectionUtils;
11	12
12	13	import java.util.ArrayList;
...	...	@@ -85,7 +86,7 @@
85	86	//体重指数
86	87	private String baricIndex ;
87	88	// 本次妊娠情况
88		- private String cestationInfo;
	89	+ private Map cestationInfo;
89	90	// 宫高
90	91	private String gonggao ;
91	92	//腹围
...	...	@@ -108,7 +109,7 @@
108	109	//高危评分
109	110	private String highriskSocre;
110	111	// 其他高危
111		- private String otherHighRisk;
	112	+ private Map otherHighRisk;
112	113	// 诊断
113	114	private String diagnosis;
114	115	//处理意见
...	...	@@ -120,7 +121,7 @@
120	121	//产检日期
121	122	private String checkTime;
122	123	//下次产检时间
123		- private String nextCheckTime;
	124	+ private Map nextCheckTime;
124	125
125	126
126	127	/-------------辅助检查结果录入------------------/
127	128
...	...	@@ -260,11 +261,11 @@
260	261	this.bxbjs = bxbjs;
261	262	}
262	263
263		- public String getCestationInfo() {
	264	+ public Map getCestationInfo() {
264	265	return cestationInfo;
265	266	}
266	267
267		- public void setCestationInfo(String cestationInfo) {
	268	+ public void setCestationInfo(Map cestationInfo) {
268	269	this.cestationInfo = cestationInfo;
269	270	}
270	271
271	272
...	...	@@ -417,11 +418,11 @@
417	418	this.neoDeath = neoDeath;
418	419	}
419	420
420		- public String getNextCheckTime() {
	421	+ public Map getNextCheckTime() {
421	422	return nextCheckTime;
422	423	}
423	424
424		- public void setNextCheckTime(String nextCheckTime) {
	425	+ public void setNextCheckTime(Map nextCheckTime) {
425	426	this.nextCheckTime = nextCheckTime;
426	427	}
427	428
428	429
429	430
...	...	@@ -433,17 +434,14 @@
433	434	this.nt = nt;
434	435	}
435	436
436		- public String getOtherHighRisk() {
	437	+ public Map getOtherHighRisk() {
437	438	return otherHighRisk;
438	439	}
439	440
440		- public void setOtherHighRisk(String otherHighRisk) {
	441	+ public void setOtherHighRisk(Map otherHighRisk) {
441	442	this.otherHighRisk = otherHighRisk;
442	443	}
443	444
444		-
445		-
446		-
447	445	public List<MatDeliverAddRequest.Placenta> getPlacentas() {
448	446	return placentas;
449	447	}
...	...	@@ -740,13 +738,48 @@
740	738	if(null!=antExChuModel){
741	739	setId(antExChuModel.getId());
742	740	setParentId(antExChuModel.getParentId());
743		- setPastHistory(JsonUtil.str2Obj(antExChuModel.getPastHistory(),Map.class));
744		- setFamilyHistory(JsonUtil.str2Obj(antExChuModel.getFamilyHistory(),Map.class));
745		- setPersonalHistory(JsonUtil.str2Obj(antExChuModel.getPersonalHistory(),Map.class));
746		- setYmjzHistory(JsonUtil.str2Obj(antExChuModel.getYmjzHistory(),Map.class));
747		- setYwgmHistory(JsonUtil.str2Obj(antExChuModel.getYwgmHistory(),Map.class));
748		- setFksxHistory(JsonUtil.str2Obj(antExChuModel.getFksxHistory(),Map.class));
749		- setYsfyHistory(JsonUtil.str2Obj(antExChuModel.getYsfyHistory(),Map.class));
	741	+ try {
	742	+
	743	+ setPastHistory(JsonUtil.str2Obj(antExChuModel.getPastHistory(), Map.class));
	744	+ }catch (Exception e){
	745	+
	746	+ }
	747	+ try {
	748	+ setFamilyHistory(JsonUtil.str2Obj(antExChuModel.getFamilyHistory(), Map.class));
	749	+
	750	+ }catch (Exception e){
	751	+
	752	+ }
	753	+ try {
	754	+ setPersonalHistory(JsonUtil.str2Obj(antExChuModel.getPersonalHistory(), Map.class));
	755	+
	756	+ }catch (Exception e){
	757	+
	758	+ }
	759	+ try {
	760	+ setYmjzHistory(JsonUtil.str2Obj(antExChuModel.getYmjzHistory(), Map.class));
	761	+
	762	+ }catch (Exception e){
	763	+
	764	+ }
	765	+ try {
	766	+ setYwgmHistory(JsonUtil.str2Obj(antExChuModel.getYwgmHistory(), Map.class));
	767	+
	768	+ }catch (Exception e){
	769	+
	770	+ }
	771	+ try {
	772	+ setFksxHistory(JsonUtil.str2Obj(antExChuModel.getFksxHistory(), Map.class));
	773	+
	774	+ }catch (Exception e){
	775	+
	776	+ }
	777	+ try {
	778	+ setYsfyHistory(JsonUtil.str2Obj(antExChuModel.getYsfyHistory(), Map.class));
	779	+
	780	+ }catch (Exception e){
	781	+
	782	+ }
750	783	setPregnancyTimes(antExChuModel.getPregnancyTimes());
751	784	setProdTime(antExChuModel.getProdTime());
752	785	setDelivery(antExChuModel.getDelivery());
753	786
754	787
...	...	@@ -760,19 +793,29 @@
760	793	setWeight(antExChuModel.getWeight());
761	794	setYqWeight(antExChuModel.getYqWeight());
762	795	setBaricIndex(antExChuModel.getBaricIndex());
763		- setCestationInfo(antExChuModel.getCestationInfo());
	796	+ try {
	797	+
	798	+ setCestationInfo(JsonUtil.str2Obj(antExChuModel.getCestationInfo(),Map.class));
	799	+ }catch (Exception e){
	800	+
	801	+ }
764	802	setGonggao(antExChuModel.getGonggao());
765	803	setFuwei(antExChuModel.getFuwei());
766	804	setTireNumber1(antExChuModel.getTireNumber1());
767	805	setPlacentas(antExChuModel.getPlacentas());
768	806	setHighriskSocre(antExChuModel.getHighriskSocre());
769		- setOtherHighRisk(antExChuModel.getOtherHighRisk());
	807	+ setOtherHighRisk(JsonUtil.str2Obj(antExChuModel.getOtherHighRisk(), Map.class));
770	808	setDiagnosis(antExChuModel.getDiagnosis());
771	809	setTreatOpinion(antExChuModel.getTreatOpinion());
772	810	setDirOpinion(antExChuModel.getDirOpinion());
773	811	setProdDoctor(antExChuModel.getProdDoctor());
774	812	setCheckTime(antExChuModel.getCheckTime());
775		- setNextCheckTime(antExChuModel.getNextCheckTime());
	813	+ try {
	814	+
	815	+ setNextCheckTime(JsonUtil.str2Obj(antExChuModel.getNextCheckTime(),Map.class));
	816	+ }catch (Exception e){
	817	+
	818	+ }
776	819	setAbo(antExChuModel.getAbortion());
777	820	setAlbumin(antExChuModel.getAbortion());
778	821	setXhdb(antExChuModel.getXhdb());