jiangjiazhi / regional-platform

Commit 4dcad0de817aeaaf83de6db922aaa8852a56c96b

Authored by gengxiaokai over 7 years ago

Exists in master and in 6 other branches

婚检

Showing 5 changed files with 271 additions and 120 deletions

platform-dal/src/main/java/com/lyms/platform/pojo/PremaritalCheckup.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/PremaritalCheckupFacade.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/PremaritalCheckupAddRequest.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PremaritalCheckupPageResult.java
platform-operate-api/src/main/java/com/lyms/platform/operate/web/result/PremaritalCheckupResult.java

...	...	@@ -7,6 +7,7 @@
7	7	import org.springframework.data.mongodb.core.mapping.Document;
8	8
9	9	import java.util.Date;
	10	+import java.util.Map;
10	11
11	12	/**
12	13	* 婚前检查(男/女)
...	...	@@ -66,8 +67,8 @@
66	67	private String menstrualAmount;
67	68	//末次月经
68	69	private String lastMenses;
69		- //痛经(1:有 2:无)
70		- private String menorrhalgia;
	70	+ //痛经(1:有 2:无)（1:无 2:轻 3:中 4:重）
	71	+ private Integer menorrhalgia;
71	72	//人流
72	73	private Integer renLiu;
73	74
...	...	@@ -185,8 +186,10 @@
185	186	private Integer zaYin;
186	187	//杂音详情
187	188	private String zaYinDetails;
188		- //肝
189		- private String gan;
	189	+ //肝(1:未及 2:可及)
	190	+ private Integer gan;
	191	+ //肝可及详情
	192	+ private String ganDetails;
190	193	//脾
191	194	private String pi;
192	195	//体格检查其他
193	196
194	197
...	...	@@ -348,11 +351,11 @@
348	351
349	352	/*********新增（gxk）*********/
350	353	//既往病史
351		- private String maritalBingHistory;
	354	+ private Map<String,String> maritalBingHistory;
352	355	//手术史(1:有 2:无 3:其他)
353		- private String surgeryHistory;
	356	+ private Map<String,String> surgeryHistory;
354	357	//现病史
355		- private String nowBingHistory;
	358	+ private Map<String,String> nowBingHistory;
356	359	//足月
357	360	private Integer zuyue;
358	361	//早产
359	362
360	363
...	...	@@ -360,15 +363,19 @@
360	363	//流产
361	364	private Integer liuchan;
362	365	//家庭史
363		- private String familyHistory;
	366	+ private Map<String,String> familyHistory;
364	367	//智力(1:异常 2:正常)
365	368	private Integer intelligence;
	369	+ //智力详情
	370	+ private String intelligenceDetails;
366	371	//皮肤毛发(1:异常 2:正常)
367	372	private Integer pfmf;
368	373	//五官（1: 异常 2: 正常）
369	374	private Integer wuguan;
370		- //四肢脊柱
371		- private String siZhiJiZhu;
	375	+ //四肢脊柱（1: 异常 2: 正常）
	376	+ private Integer siZhiJiZhu;
	377	+ //四肢脊柱详情
	378	+ private String siZhiJiZhuDetails;
372	379	//体积左
373	380	private String volumeLeft;
374	381	//体积右
375	382
376	383
...	...	@@ -391,14 +398,22 @@
391	398	this.volumeRight = volumeRight;
392	399	}
393	400
394		- public String getSiZhiJiZhu() {
	401	+ public Integer getSiZhiJiZhu() {
395	402	return siZhiJiZhu;
396	403	}
397	404
398		- public void setSiZhiJiZhu(String siZhiJiZhu) {
	405	+ public void setSiZhiJiZhu(Integer siZhiJiZhu) {
399	406	this.siZhiJiZhu = siZhiJiZhu;
400	407	}
401	408
	409	+ public String getSiZhiJiZhuDetails() {
	410	+ return siZhiJiZhuDetails;
	411	+ }
	412	+
	413	+ public void setSiZhiJiZhuDetails(String siZhiJiZhuDetails) {
	414	+ this.siZhiJiZhuDetails = siZhiJiZhuDetails;
	415	+ }
	416	+
402	417	public Integer getWuguan() {
403	418	return wuguan;
404	419	}
405	420
...	...	@@ -423,11 +438,19 @@
423	438	this.intelligence = intelligence;
424	439	}
425	440
426		- public String getFamilyHistory() {
	441	+ public String getIntelligenceDetails() {
	442	+ return intelligenceDetails;
	443	+ }
	444	+
	445	+ public void setIntelligenceDetails(String intelligenceDetails) {
	446	+ this.intelligenceDetails = intelligenceDetails;
	447	+ }
	448	+
	449	+ public Map<String, String> getFamilyHistory() {
427	450	return familyHistory;
428	451	}
429	452
430		- public void setFamilyHistory(String familyHistory) {
	453	+ public void setFamilyHistory(Map<String, String> familyHistory) {
431	454	this.familyHistory = familyHistory;
432	455	}
433	456
434	457
435	458
436	459
437	460
438	461
...	...	@@ -455,27 +478,27 @@
455	478	this.liuchan = liuchan;
456	479	}
457	480
458		- public String getNowBingHistory() {
	481	+ public Map<String, String> getNowBingHistory() {
459	482	return nowBingHistory;
460	483	}
461	484
462		- public void setNowBingHistory(String nowBingHistory) {
	485	+ public void setNowBingHistory(Map<String, String> nowBingHistory) {
463	486	this.nowBingHistory = nowBingHistory;
464	487	}
465	488
466		- public String getSurgeryHistory() {
	489	+ public Map<String, String> getSurgeryHistory() {
467	490	return surgeryHistory;
468	491	}
469	492
470		- public void setSurgeryHistory(String surgeryHistory) {
	493	+ public void setSurgeryHistory(Map<String, String> surgeryHistory) {
471	494	this.surgeryHistory = surgeryHistory;
472	495	}
473	496
474		- public String getMaritalBingHistory() {
	497	+ public Map<String, String> getMaritalBingHistory() {
475	498	return maritalBingHistory;
476	499	}
477	500
478		- public void setMaritalBingHistory(String maritalBingHistory) {
	501	+ public void setMaritalBingHistory(Map<String, String> maritalBingHistory) {
479	502	this.maritalBingHistory = maritalBingHistory;
480	503	}
481	504
482	505
...	...	@@ -679,11 +702,11 @@
679	702	this.lastMenses = lastMenses;
680	703	}
681	704
682		- public String getMenorrhalgia() {
	705	+ public Integer getMenorrhalgia() {
683	706	return menorrhalgia;
684	707	}
685	708
686		- public void setMenorrhalgia(String menorrhalgia) {
	709	+ public void setMenorrhalgia(Integer menorrhalgia) {
687	710	this.menorrhalgia = menorrhalgia;
688	711	}
689	712
690	713
691	714
...	...	@@ -1119,12 +1142,20 @@
1119	1142	this.zaYinDetails = zaYinDetails;
1120	1143	}
1121	1144
1122		- public String getGan() {
	1145	+ public Integer getGan() {
1123	1146	return gan;
1124	1147	}
1125	1148
1126		- public void setGan(String gan) {
	1149	+ public void setGan(Integer gan) {
1127	1150	this.gan = gan;
	1151	+ }
	1152	+
	1153	+ public String getGanDetails() {
	1154	+ return ganDetails;
	1155	+ }
	1156	+
	1157	+ public void setGanDetails(String ganDetails) {
	1158	+ this.ganDetails = ganDetails;
1128	1159	}
1129	1160
1130	1161	public String getPi() {

...	...	@@ -294,6 +294,7 @@
294	294	checkupResult.setZaYin(result.getZaYin());
295	295	checkupResult.setZaYinDetails(result.getZaYinDetails());
296	296	checkupResult.setGan(result.getGan());
	297	+ checkupResult.setGanDetails(result.getGanDetails());
297	298	checkupResult.setPi(result.getPi());
298	299	checkupResult.setTiGeQiTa(result.getTiGeQiTa());
299	300
...	...	@@ -390,6 +391,7 @@
390	391	checkupResult.setPfmf(result.getPfmf());
391	392	checkupResult.setWuguan(result.getWuguan());
392	393	checkupResult.setSiZhiJiZhu(result.getSiZhiJiZhu());
	394	+ checkupResult.setSiZhiJiZhuDetails(result.getSiZhiJiZhuDetails());
393	395	checkupResult.setVolumeLeft(result.getVolumeLeft());
394	396	checkupResult.setVolumeRight(result.getVolumeRight());
395	397
...	...	@@ -571,6 +573,8 @@
571	573	checkup.setFamilyHistory(addRequest.getFamilyHistory());
572	574	//智力
573	575	checkup.setIntelligence(addRequest.getIntelligence());
	576	+ //智力详情
	577	+ checkup.setIntelligenceDetails(addRequest.getIntelligenceDetails());
574	578	//皮肤毛发
575	579	checkup.setPfmf(addRequest.getPfmf());
576	580	//五官
...	...	@@ -1012,7 +1016,7 @@
1012	1016	map.put("menstrualCycle", checkup.getMenstrualCycle());
1013	1017	map.put("menstrualAmount", checkup.getMenstrualAmount());
1014	1018	map.put("lastMenses", checkup.getLastMenses());
1015		- map.put("menorrhalgia", FunvCommonUtil.havaOrNOString(checkup.getMenorrhalgia(), one));
	1019	+ map.put("menorrhalgia", FunvCommonUtil.havaOrNOString(checkup.getMenorrhalgia().toString(), one));
1016	1020	map.put("renLiu", checkup.getRenLiu());
1017	1021	map.put("maritalHistory", FunvCommonUtil.havaOrNOInteger(checkup.getMaritalHistory(), one));
1018	1022	map.put("sangOu", FunvCommonUtil.havaOrNOInteger(checkup.getSangOu(), three));
1019	1023
...	...	@@ -2179,10 +2183,11 @@
2179	2183	checkupResult.setJiaZhuangXian(itemHandle(result.getJiaZhuangXian(),result.getJiaZhuangXianDetails()));
2180	2184	checkupResult.setXiongKuo(itemHandle(result.getXiongKuo(), result.getXiongKuoDetails()));
2181	2185	checkupResult.setFei(itemHandle(result.getFei(), result.getFeiDetails()));
2182		- checkupResult.setHeartRate(UnitHandle(result.getHeartRate(),UnitConstants.CIFEN));
	2186	+ checkupResult.setHeartRate(UnitHandle(result.getHeartRate(), UnitConstants.CIFEN));
2183	2187	checkupResult.setHeartRhythm(StringUtils.isNotEmpty(result.getHeartRhythm()) ? result.getHeartRhythm() : "");
2184	2188	checkupResult.setZaYin(itemHandle(result.getZaYin(), result.getZaYinDetails()));
2185	2189	checkupResult.setGan(result.getGan());
	2190	+ checkupResult.setGanDetails(result.getGanDetails());
2186	2191	checkupResult.setPi(result.getPi());
2187	2192	checkupResult.setTiGeQiTa(result.getTiGeQiTa());
2188	2193

...	...	@@ -3,6 +3,8 @@
3	3	import com.lyms.platform.common.core.annotation.form.Form;
4	4	import com.lyms.platform.pojo.DoctorModel;
5	5
	6	+import java.util.Map;
	7	+
6	8	/**
7	9	* 婚前检查请求数据
8	10	*
9	11
10	12
11	13
12	14
...	...	@@ -49,20 +51,20 @@
49	51	private String menstrualAmount;
50	52	//末次月经
51	53	private String lastMenses;
52		- //痛经
53		- private String menorrhalgia;
	54	+ //痛经（1:无 2:轻 3:中 4:重）
	55	+ private Integer menorrhalgia;
54	56	//人流
55	57	private Integer renLiu;
56	58
57	59
58	60	//既往病史
59		- private String maritalBingHistory;
	61	+ private Map<String,String> maritalBingHistory;
60	62	//手术史
61		- private String surgeryHistory;
	63	+ private Map<String,String> surgeryHistory;
62	64	//现病史
63		- private String nowBingHistory;
	65	+ private Map<String,String> nowBingHistory;
64	66	//家庭史
65		- private String familyHistory;
	67	+ private Map<String,String> familyHistory;
66	68	//与本人关系
67	69	private String relationWithMe;
68	70
69	71
...	...	@@ -109,8 +111,12 @@
109	111	private String yuYanNengLiDetails;
110	112	//智力(1:异常 2:正常)
111	113	private Integer intelligence;
	114	+ //智力详情
	115	+ private String intelligenceDetails;
112	116	//皮肤毛发(1:异常 2:正常)
113	117	private Integer pfmf;
	118	+ //皮肤毛发详情
	119	+ private String pfmfDetails;
114	120	//特殊面容(1: 异常 2: 正常)
115	121	private Integer teShuMianRong;
116	122	//特殊面容详情
...	...	@@ -121,6 +127,8 @@
121	127	private String teShuTiTaiDetails;
122	128	//五官（1: 异常 2: 正常）
123	129	private Integer wuguan;
	130	+ //五官详情
	131	+ private String wuguanDetails;
124	132	//身高
125	133	private String height;
126	134	//体重
127	135
...	...	@@ -198,16 +206,20 @@
198	206	private Integer zaYin;
199	207	//杂音详情
200	208	private String zaYinDetails;
201		- //肝
202		- private String gan;
	209	+ //肝(1:未及 2:可及)
	210	+ private Integer gan;
	211	+ //肝可及详情
	212	+ private String ganDetails;
203	213	//脾
204	214	private String pi;
205	215	//体格检查其他
206	216	private String tiGeQiTa;
207	217	//体格检查医生签字
208	218	private String tiGeSign;
209		- //四肢脊柱
210		- private String siZhiJiZhu;
	219	+ //四肢脊柱(1: 异常 2: 正常)
	220	+ private Integer siZhiJiZhu;
	221	+ //四肢脊柱详情
	222	+ private String siZhiJiZhuDetails;
211	223	/**************** 生殖检查 ******************/
212	224	/* 第二特征 */
213	225	//体态(1: 异常 2: 正常)
214	226
215	227
...	...	@@ -386,14 +398,102 @@
386	398
387	399	private Integer sexType;
388	400
389		- public String getSiZhiJiZhu() {
	401	+ public Map<String, String> getMaritalBingHistory() {
	402	+ return maritalBingHistory;
	403	+ }
	404	+
	405	+ public void setMaritalBingHistory(Map<String, String> maritalBingHistory) {
	406	+ this.maritalBingHistory = maritalBingHistory;
	407	+ }
	408	+
	409	+ public Map<String, String> getSurgeryHistory() {
	410	+ return surgeryHistory;
	411	+ }
	412	+
	413	+ public void setSurgeryHistory(Map<String, String> surgeryHistory) {
	414	+ this.surgeryHistory = surgeryHistory;
	415	+ }
	416	+
	417	+ public Map<String, String> getNowBingHistory() {
	418	+ return nowBingHistory;
	419	+ }
	420	+
	421	+ public void setNowBingHistory(Map<String, String> nowBingHistory) {
	422	+ this.nowBingHistory = nowBingHistory;
	423	+ }
	424	+
	425	+ public Map<String, String> getFamilyHistory() {
	426	+ return familyHistory;
	427	+ }
	428	+
	429	+ public void setFamilyHistory(Map<String, String> familyHistory) {
	430	+ this.familyHistory = familyHistory;
	431	+ }
	432	+
	433	+ public Integer getIntelligence() {
	434	+ return intelligence;
	435	+ }
	436	+
	437	+ public void setIntelligence(Integer intelligence) {
	438	+ this.intelligence = intelligence;
	439	+ }
	440	+
	441	+ public String getIntelligenceDetails() {
	442	+ return intelligenceDetails;
	443	+ }
	444	+
	445	+ public void setIntelligenceDetails(String intelligenceDetails) {
	446	+ this.intelligenceDetails = intelligenceDetails;
	447	+ }
	448	+
	449	+ public String getPfmfDetails() {
	450	+ return pfmfDetails;
	451	+ }
	452	+
	453	+ public void setPfmfDetails(String pfmfDetails) {
	454	+ this.pfmfDetails = pfmfDetails;
	455	+ }
	456	+
	457	+ public String getWuguanDetails() {
	458	+ return wuguanDetails;
	459	+ }
	460	+
	461	+ public void setWuguanDetails(String wuguanDetails) {
	462	+ this.wuguanDetails = wuguanDetails;
	463	+ }
	464	+
	465	+ public Integer getGan() {
	466	+ return gan;
	467	+ }
	468	+
	469	+ public void setGan(Integer gan) {
	470	+ this.gan = gan;
	471	+ }
	472	+
	473	+ public String getGanDetails() {
	474	+ return ganDetails;
	475	+ }
	476	+
	477	+ public void setGanDetails(String ganDetails) {
	478	+ this.ganDetails = ganDetails;
	479	+ }
	480	+
	481	+ public Integer getSiZhiJiZhu() {
390	482	return siZhiJiZhu;
391	483	}
392	484
393		- public void setSiZhiJiZhu(String siZhiJiZhu) {
	485	+ public void setSiZhiJiZhu(Integer siZhiJiZhu) {
394	486	this.siZhiJiZhu = siZhiJiZhu;
395	487	}
396	488
	489	+ public String getSiZhiJiZhuDetails() {
	490	+ return siZhiJiZhuDetails;
	491	+ }
	492	+
	493	+ public void setSiZhiJiZhuDetails(String siZhiJiZhuDetails) {
	494	+ this.siZhiJiZhuDetails = siZhiJiZhuDetails;
	495	+ }
	496	+
397	497	public Integer getPfmf() {
398	498	return pfmf;
399	499	}
400	500
...	...	@@ -554,11 +654,11 @@
554	654	this.lastMenses = lastMenses;
555	655	}
556	656
557		- public String getMenorrhalgia() {
	657	+ public Integer getMenorrhalgia() {
558	658	return menorrhalgia;
559	659	}
560	660
561		- public void setMenorrhalgia(String menorrhalgia) {
	661	+ public void setMenorrhalgia(Integer menorrhalgia) {
562	662	this.menorrhalgia = menorrhalgia;
563	663	}
564	664
565	665
...	...	@@ -1011,14 +1111,7 @@
1011	1111	this.zaYinDetails = zaYinDetails;
1012	1112	}
1013	1113
1014		- public String getGan() {
1015		- return gan;
1016		- }
1017	1114
1018		- public void setGan(String gan) {
1019		- this.gan = gan;
1020		- }
1021		-
1022	1115	public String getPi() {
1023	1116	return pi;
1024	1117	}
1025	1118
...	...	@@ -1557,38 +1650,7 @@
1557	1650
1558	1651
1559	1652	//新增
1560		- public String getMaritalBingHistory() {
1561		- return maritalBingHistory;
1562		- }
1563	1653
1564		- public void setMaritalBingHistory(String maritalBingHistory) {
1565		- this.maritalBingHistory = maritalBingHistory;
1566		- }
1567		-
1568		- public String getSurgeryHistory() {
1569		- return surgeryHistory;
1570		- }
1571		-
1572		- public void setSurgeryHistory(String surgeryHistory) {
1573		- this.surgeryHistory = surgeryHistory;
1574		- }
1575		-
1576		- public String getNowBingHistory() {
1577		- return nowBingHistory;
1578		- }
1579		-
1580		- public void setNowBingHistory(String nowBingHistory) {
1581		- this.nowBingHistory = nowBingHistory;
1582		- }
1583		-
1584		- public String getFamilyHistory() {
1585		- return familyHistory;
1586		- }
1587		-
1588		- public void setFamilyHistory(String familyHistory) {
1589		- this.familyHistory = familyHistory;
1590		- }
1591		-
1592	1654	public String getRelationWithMe() {
1593	1655	return relationWithMe;
1594	1656	}
...	...	@@ -1635,14 +1697,6 @@
1635	1697
1636	1698	public void setOneDoctorSign(String oneDoctorSign) {
1637	1699	this.oneDoctorSign = oneDoctorSign;
1638		- }
1639		-
1640		- public Integer getIntelligence() {
1641		- return intelligence;
1642		- }
1643		-
1644		- public void setIntelligence(Integer intelligence) {
1645		- this.intelligence = intelligence;
1646	1700	}
1647	1701
1648	1702	public Integer getWuguan() {

...	...	@@ -171,8 +171,10 @@
171	171	//杂音(1: 异常 2: 正常)
172	172	private String zaYin;
173	173
174		- //肝
175		- private String gan;
	174	+ //肝(1:未及 2:可及)
	175	+ private Integer gan;
	176	+ //肝可及详情
	177	+ private String ganDetails;
176	178	//脾
177	179	private String pi;
178	180	//体格检查其他
179	181
180	182
...	...	@@ -665,12 +667,20 @@
665	667	this.zaYin = zaYin;
666	668	}
667	669
668		- public String getGan() {
	670	+ public Integer getGan() {
669	671	return gan;
670	672	}
671	673
672		- public void setGan(String gan) {
	674	+ public void setGan(Integer gan) {
673	675	this.gan = gan;
	676	+ }
	677	+
	678	+ public String getGanDetails() {
	679	+ return ganDetails;
	680	+ }
	681	+
	682	+ public void setGanDetails(String ganDetails) {
	683	+ this.ganDetails = ganDetails;
674	684	}
675	685
676	686	public String getPi() {

...	...	@@ -3,6 +3,7 @@
3	3	import com.lyms.platform.pojo.DoctorModel;
4	4
5	5	import java.util.Date;
	6	+import java.util.Map;
6	7
7	8	/**
8	9	* Created by Administrator on 2016/12/15 0015.
...	...	@@ -51,8 +52,8 @@
51	52	private String menstrualAmount;
52	53	//末次月经
53	54	private String lastMenses;
54		- //痛经(1:有 2:无)
55		- private String menorrhalgia;
	55	+ //痛经(1:有 2:无) （1:无 2:轻 3:中 4:重）
	56	+ private Integer menorrhalgia;
56	57	//人流
57	58	private Integer renLiu;
58	59
...	...	@@ -170,8 +171,10 @@
170	171	private Integer zaYin;
171	172	//杂音详情
172	173	private String zaYinDetails;
173		- //肝
174		- private String gan;
	174	+ //肝(1:未及 2:可及)
	175	+ private Integer gan;
	176	+ //肝可及详情
	177	+ private String ganDetails;
175	178	//脾
176	179	private String pi;
177	180	//体格检查其他
178	181
179	182
...	...	@@ -333,11 +336,11 @@
333	336
334	337	/********新增*********/
335	338	//既往病史
336		- private String maritalBingHistory;
	339	+ private Map<String,String> maritalBingHistory;
337	340	//手术史(1:有 2:无 3:其他)
338		- private String surgeryHistory;
	341	+ private Map<String,String> surgeryHistory;
339	342	//现病史
340		- private String nowBingHistory;
	343	+ private Map<String,String> nowBingHistory;
341	344	//足月
342	345	private Integer zuyue;
343	346	//早产
344	347
345	348
346	349
347	350
348	351
349	352
350	353
351	354
352	355
353	356
...	...	@@ -345,45 +348,101 @@
345	348	//流产
346	349	private Integer liuchan;
347	350	//家庭史
348		- private String familyHistory;
	351	+ private Map<String,String> familyHistory;
349	352	//智力(1:异常 2:正常)
350	353	private Integer intelligence;
	354	+ //智力详情
	355	+ private String intelligenceDetails;
351	356	//皮肤毛发(1:异常 2:正常)
352	357	private Integer pfmf;
	358	+ //皮肤毛发详情
	359	+ private String pfmfDetails;
353	360	//五官（1: 异常 2: 正常）
354	361	private Integer wuguan;
355		- //四肢脊柱
356		- private String siZhiJiZhu;
	362	+ //五官详情
	363	+ private String wuguanDetails;
	364	+ //四肢脊柱（1: 异常 2: 正常）
	365	+ private Integer siZhiJiZhu;
	366	+ //四肢脊柱详情
	367	+ private String siZhiJiZhuDetails;
357	368	//体积左
358	369	private String volumeLeft;
359	370	//体积右
360	371	private String volumeRight;
361	372
362	373
363		- public String getMaritalBingHistory() {
	374	+ public String getGanDetails() {
	375	+ return ganDetails;
	376	+ }
	377	+
	378	+ public void setGanDetails(String ganDetails) {
	379	+ this.ganDetails = ganDetails;
	380	+ }
	381	+
	382	+ public Map<String, String> getMaritalBingHistory() {
364	383	return maritalBingHistory;
365	384	}
366	385
367		- public void setMaritalBingHistory(String maritalBingHistory) {
	386	+ public void setMaritalBingHistory(Map<String, String> maritalBingHistory) {
368	387	this.maritalBingHistory = maritalBingHistory;
369	388	}
370	389
371		- public String getSurgeryHistory() {
	390	+ public Map<String, String> getSurgeryHistory() {
372	391	return surgeryHistory;
373	392	}
374	393
375		- public void setSurgeryHistory(String surgeryHistory) {
	394	+ public void setSurgeryHistory(Map<String, String> surgeryHistory) {
376	395	this.surgeryHistory = surgeryHistory;
377	396	}
378	397
379		- public String getNowBingHistory() {
	398	+ public Map<String, String> getNowBingHistory() {
380	399	return nowBingHistory;
381	400	}
382	401
383		- public void setNowBingHistory(String nowBingHistory) {
	402	+ public void setNowBingHistory(Map<String, String> nowBingHistory) {
384	403	this.nowBingHistory = nowBingHistory;
385	404	}
386	405
	406	+ public Map<String, String> getFamilyHistory() {
	407	+ return familyHistory;
	408	+ }
	409	+
	410	+ public void setFamilyHistory(Map<String, String> familyHistory) {
	411	+ this.familyHistory = familyHistory;
	412	+ }
	413	+
	414	+ public String getIntelligenceDetails() {
	415	+ return intelligenceDetails;
	416	+ }
	417	+
	418	+ public void setIntelligenceDetails(String intelligenceDetails) {
	419	+ this.intelligenceDetails = intelligenceDetails;
	420	+ }
	421	+
	422	+ public String getPfmfDetails() {
	423	+ return pfmfDetails;
	424	+ }
	425	+
	426	+ public void setPfmfDetails(String pfmfDetails) {
	427	+ this.pfmfDetails = pfmfDetails;
	428	+ }
	429	+
	430	+ public String getWuguanDetails() {
	431	+ return wuguanDetails;
	432	+ }
	433	+
	434	+ public void setWuguanDetails(String wuguanDetails) {
	435	+ this.wuguanDetails = wuguanDetails;
	436	+ }
	437	+
	438	+ public String getSiZhiJiZhuDetails() {
	439	+ return siZhiJiZhuDetails;
	440	+ }
	441	+
	442	+ public void setSiZhiJiZhuDetails(String siZhiJiZhuDetails) {
	443	+ this.siZhiJiZhuDetails = siZhiJiZhuDetails;
	444	+ }
	445	+
387	446	public Integer getZuyue() {
388	447	return zuyue;
389	448	}
...	...	@@ -408,14 +467,6 @@
408	467	this.liuchan = liuchan;
409	468	}
410	469
411		- public String getFamilyHistory() {
412		- return familyHistory;
413		- }
414		-
415		- public void setFamilyHistory(String familyHistory) {
416		- this.familyHistory = familyHistory;
417		- }
418		-
419	470	public Integer getIntelligence() {
420	471	return intelligence;
421	472	}
422	473
...	...	@@ -440,11 +491,11 @@
440	491	this.wuguan = wuguan;
441	492	}
442	493
443		- public String getSiZhiJiZhu() {
	494	+ public Integer getSiZhiJiZhu() {
444	495	return siZhiJiZhu;
445	496	}
446	497
447		- public void setSiZhiJiZhu(String siZhiJiZhu) {
	498	+ public void setSiZhiJiZhu(Integer siZhiJiZhu) {
448	499	this.siZhiJiZhu = siZhiJiZhu;
449	500	}
450	501
451	502
...	...	@@ -616,11 +667,11 @@
616	667	this.lastMenses = lastMenses;
617	668	}
618	669
619		- public String getMenorrhalgia() {
	670	+ public Integer getMenorrhalgia() {
620	671	return menorrhalgia;
621	672	}
622	673
623		- public void setMenorrhalgia(String menorrhalgia) {
	674	+ public void setMenorrhalgia(Integer menorrhalgia) {
624	675	this.menorrhalgia = menorrhalgia;
625	676	}
626	677
627	678
...	...	@@ -1056,11 +1107,11 @@
1056	1107	this.zaYinDetails = zaYinDetails;
1057	1108	}
1058	1109
1059		- public String getGan() {
	1110	+ public Integer getGan() {
1060	1111	return gan;
1061	1112	}
1062	1113
1063		- public void setGan(String gan) {
	1114	+ public void setGan(Integer gan) {
1064	1115	this.gan = gan;
1065	1116	}
1066	1117