jiangjiazhi / regional-platform

Authored by gengxiaokai over 6 years ago

Exists in master and in 6 other branches

Showing 4 changed files with 75 additions and 9 deletions

...	...	@@ -256,6 +256,10 @@
256	256	private String fuGaoYou;
257	257	//精索静脉曲张
258	258	private Integer jingMai;
	259	+ //部位
	260	+ private String position;
	261	+ //程度
	262	+ private String degree;
259	263	//精索静脉曲张(左)
260	264	private String jingMaiZuo;
261	265	//精索静脉曲张(右)
...	...	@@ -365,7 +369,7 @@
365	369	//家庭史
366	370	private Map<String,String> familyHistory;
367	371	//智力(1:异常 2:正常)
368		- private Integer intelligence;
	372	+ private Map<String,String> intelligence;
369	373	//智力详情
370	374	private String intelligenceDetails;
371	375	//皮肤毛发(1:异常 2:正常)
372	376
...	...	@@ -430,11 +434,11 @@
430	434	this.pfmf = pfmf;
431	435	}
432	436
433		- public Integer getIntelligence() {
	437	+ public Map<String, String> getIntelligence() {
434	438	return intelligence;
435	439	}
436	440
437		- public void setIntelligence(Integer intelligence) {
	441	+ public void setIntelligence(Map<String, String> intelligence) {
438	442	this.intelligence = intelligence;
439	443	}
440	444
...	...	@@ -1388,6 +1392,22 @@
1388	1392
1389	1393	public void setJingMai(Integer jingMai) {
1390	1394	this.jingMai = jingMai;
	1395	+ }
	1396	+
	1397	+ public String getPosition() {
	1398	+ return position;
	1399	+ }
	1400	+
	1401	+ public void setPosition(String position) {
	1402	+ this.position = position;
	1403	+ }
	1404	+
	1405	+ public String getDegree() {
	1406	+ return degree;
	1407	+ }
	1408	+
	1409	+ public void setDegree(String degree) {
	1410	+ this.degree = degree;
1391	1411	}
1392	1412
1393	1413	public String getJingMaiZuo() {

...	...	@@ -394,6 +394,8 @@
394	394	checkupResult.setSiZhiJiZhuDetails(result.getSiZhiJiZhuDetails());
395	395	checkupResult.setVolumeLeft(result.getVolumeLeft());
396	396	checkupResult.setVolumeRight(result.getVolumeRight());
	397	+ checkupResult.setPosition(result.getPosition());
	398	+ checkupResult.setDegree(result.getDegree());
397	399
398	400	return checkupResult;
399	401	}
...	...	@@ -585,6 +587,11 @@
585	587	checkup.setVolumeLeft(addRequest.getVolumeLeft());
586	588	//双侧扪及右体积
587	589	checkup.setVolumeRight(addRequest.getVolumeRight());
	590	+ //部位
	591	+ checkup.setPosition(addRequest.getPosition());
	592	+ //程度
	593	+ checkup.setDegree(addRequest.getDegree());
	594	+
588	595
589	596
590	597	/* 婚育史 */

...	...	@@ -110,7 +110,7 @@
110	110	//语言能力异常详情
111	111	private String yuYanNengLiDetails;
112	112	//智力(1:异常 2:正常)
113		- private Integer intelligence;
	113	+ private Map<String,String> intelligence;
114	114	//智力详情
115	115	private String intelligenceDetails;
116	116	//皮肤毛发(1:异常 2:正常)
...	...	@@ -289,6 +289,10 @@
289	289	private String fuGaoYou;
290	290	//精索静脉曲张
291	291	private Integer jingMai;
	292	+ //部位
	293	+ private String position;
	294	+ //程度
	295	+ private String degree;
292	296	//精索静脉曲张(左)
293	297	private String jingMaiZuo;
294	298	//精索静脉曲张(右)
295	299
...	...	@@ -430,11 +434,11 @@
430	434	this.familyHistory = familyHistory;
431	435	}
432	436
433		- public Integer getIntelligence() {
	437	+ public Map<String, String> getIntelligence() {
434	438	return intelligence;
435	439	}
436	440
437		- public void setIntelligence(Integer intelligence) {
	441	+ public void setIntelligence(Map<String, String> intelligence) {
438	442	this.intelligence = intelligence;
439	443	}
440	444
...	...	@@ -1342,6 +1346,22 @@
1342	1346
1343	1347	public void setJingMai(Integer jingMai) {
1344	1348	this.jingMai = jingMai;
	1349	+ }
	1350	+
	1351	+ public String getPosition() {
	1352	+ return position;
	1353	+ }
	1354	+
	1355	+ public void setPosition(String position) {
	1356	+ this.position = position;
	1357	+ }
	1358	+
	1359	+ public String getDegree() {
	1360	+ return degree;
	1361	+ }
	1362	+
	1363	+ public void setDegree(String degree) {
	1364	+ this.degree = degree;
1345	1365	}
1346	1366
1347	1367	public String getJingMaiZuo() {

...	...	@@ -350,7 +350,7 @@
350	350	//家庭史
351	351	private Map<String,String> familyHistory;
352	352	//智力(1:异常 2:正常)
353		- private Integer intelligence;
	353	+ private Map<String,String> intelligence;
354	354	//智力详情
355	355	private String intelligenceDetails;
356	356	//皮肤毛发(1:异常 2:正常)
357	357
358	358
...	...	@@ -369,8 +369,27 @@
369	369	private String volumeLeft;
370	370	//体积右
371	371	private String volumeRight;
	372	+ //部位
	373	+ private String position;
	374	+ //程度
	375	+ private String degree;
372	376
	377	+ public String getPosition() {
	378	+ return position;
	379	+ }
373	380
	381	+ public void setPosition(String position) {
	382	+ this.position = position;
	383	+ }
	384	+
	385	+ public String getDegree() {
	386	+ return degree;
	387	+ }
	388	+
	389	+ public void setDegree(String degree) {
	390	+ this.degree = degree;
	391	+ }
	392	+
374	393	public String getGanDetails() {
375	394	return ganDetails;
376	395	}
377	396
...	...	@@ -467,11 +486,11 @@
467	486	this.liuchan = liuchan;
468	487	}
469	488
470		- public Integer getIntelligence() {
	489	+ public Map<String, String> getIntelligence() {
471	490	return intelligence;
472	491	}
473	492
474		- public void setIntelligence(Integer intelligence) {
	493	+ public void setIntelligence(Map<String, String> intelligence) {
475	494	this.intelligence = intelligence;
476	495	}
477	496