fangcheng / regional-platform

Authored by jiangjiazhi almost 9 years ago

Showing 3 changed files with 33 additions and 1 deletions

...	...	@@ -75,6 +75,7 @@
75	75	private String diagnosis;
76	76	//分类
77	77	private String type;
	78	+ private String typeYc;
78	79	//处理意见
79	80	private String treatmentOpinion;
80	81	//指导
...	...	@@ -87,6 +88,14 @@
87	88	private String nextCheckDate;
88	89	private Integer yn;
89	90	private Date created;
	91	+
	92	+ public String getTypeYc() {
	93	+ return typeYc;
	94	+ }
	95	+
	96	+ public void setTypeYc(String typeYc) {
	97	+ this.typeYc = typeYc;
	98	+ }
90	99
91	100	public Date getCreated() {
92	101	return created;

...	...	@@ -57,8 +57,9 @@
57	57	//诊断
58	58	private String diagnosis;
59	59	//分类
60		- @JsonIgnore
61	60	private String type;
	61	+ //异常
	62	+ private String typeYc;
62	63	//处理意见
63	64	private String treatmentOpinion;
64	65	//指导
...	...	@@ -70,6 +71,16 @@
70	71	//下次产检日期
71	72	private String nextCheckDate;
72	73
	74	+
	75	+
	76	+ public String getTypeYc() {
	77	+ return typeYc;
	78	+ }
	79	+
	80	+ public void setTypeYc(String typeYc) {
	81	+ this.typeYc = typeYc;
	82	+ }
	83	+
73	84	@Override
74	85	public AntenatalExaminationModel convertToDataModel() {
75	86	AntenatalExaminationModel examinationModel = new AntenatalExaminationModel();
...	...	@@ -93,6 +104,7 @@
93	104	examinationModel.setOtherRisk(JsonUtil.obj2JsonString(otherRisk));
94	105	examinationModel.setDiagnosis(diagnosis);
95	106	examinationModel.setType(type);
	107	+ examinationModel.setTypeYc(typeYc);
96	108	examinationModel.setTreatmentOpinion(treatmentOpinion);
97	109	examinationModel.setGuide(guide);
98	110	examinationModel.setCheckDoctor(checkDoctor);

...	...	@@ -57,6 +57,8 @@
57	57	private String diagnosis;
58	58	//分类
59	59	private String type;
	60	+ //异常
	61	+ private String typeYc;
60	62	//处理意见
61	63	private String treatmentOpinion;
62	64	//指导
63	65
...	...	@@ -100,7 +102,16 @@
100	102	setTireNumber(destModel.getTireNumber());
101	103	setTireData(destModel.getTireData());
102	104	setType(destModel.getType());
	105	+ setTypeYc(destModel.getTypeYc());
103	106	return this;
	107	+ }
	108	+
	109	+ public String getTypeYc() {
	110	+ return typeYc;
	111	+ }
	112	+
	113	+ public void setTypeYc(String typeYc) {
	114	+ this.typeYc = typeYc;
104	115	}
105	116
106	117	public Map getBp() {