jiangjiazhi / regional-platform

Authored by jiangjiazhi over 9 years ago

Exists in master and in 8 other branches

Showing 2 changed files with 13 additions and 13 deletions

...	...	@@ -49,7 +49,7 @@
49	49	// B 炒
50	50	private String bChao;
51	51	//血糖
52		- private String bloodSugar;
	52	+ private String fzBloodSugar;
53	53	//高危因素
54	54	private List<String> riskFactor;
55	55	// 高危评分
...	...	@@ -112,7 +112,7 @@
112	112	examinationModel.setHemoglobin(hemoglobin);
113	113	examinationModel.setUrineProtein(urineProtein);
114	114	examinationModel.setbChao(bChao);
115		- examinationModel.setBloodSugar(bloodSugar);
	115	+ examinationModel.setBloodSugar(fzBloodSugar);
116	116	examinationModel.setRiskFactor(JsonUtil.array2JsonString(riskFactor));
117	117	examinationModel.setRiskScore(riskScore);
118	118	examinationModel.setOtherRisk(JsonUtil.obj2JsonString(otherRisk));
119	119
...	...	@@ -151,12 +151,12 @@
151	151	this.bChao = bChao;
152	152	}
153	153
154		- public String getBloodSugar() {
155		- return bloodSugar;
	154	+ public String getFzBloodSugar() {
	155	+ return fzBloodSugar;
156	156	}
157	157
158		- public void setBloodSugar(String bloodSugar) {
159		- this.bloodSugar = bloodSugar;
	158	+ public void setFzBloodSugar(String fzBloodSugar) {
	159	+ this.fzBloodSugar = fzBloodSugar;
160	160	}
161	161
162	162	public Map getBp() {

...	...	@@ -47,7 +47,7 @@
47	47	// B 炒
48	48	private String bChao;
49	49	//血糖
50		- private String bloodSugar;
	50	+ private String fzBloodSugar;
51	51	//高危因素
52	52	private List riskFactor;
53	53	// 高危评分
...	...	@@ -126,7 +126,7 @@
126	126
127	127	setAbdominalCircumference(destModel.getAbdominalCircumference());
128	128	setbChao(destModel.getbChao());
129		- setBloodSugar(destModel.getBloodSugar());
	129	+ setFzBloodSugar(destModel.getBloodSugar());
130	130	try {
131	131	setBp(JsonUtil.str2Obj(destModel.getBp(), java.util.Map.class));
132	132	} catch (Exception e) {
133	133
134	134
...	...	@@ -193,14 +193,14 @@
193	193	this.bChao = bChao;
194	194	}
195	195
196		- public String getBloodSugar() {
197		- return bloodSugar;
198		- }
199	196
200		- public void setBloodSugar(String bloodSugar) {
201		- this.bloodSugar = bloodSugar;
	197	+ public String getFzBloodSugar() {
	198	+ return fzBloodSugar;
202	199	}
203	200
	201	+ public void setFzBloodSugar(String fzBloodSugar) {
	202	+ this.fzBloodSugar = fzBloodSugar;
	203	+ }
204	204
205	205	public String getCheckDate() {
206	206	return checkDate;