jiangjiazhi / regional-platform

Commit 295cedb25cec7addcab93a47f5d3927b0f94017a

Authored by gengxiaokai almost 7 years ago

Exists in master and in 6 other branches

婚检

Showing 5 changed files with 212 additions and 72 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

...	...	@@ -351,15 +351,19 @@
351	351	private String zhiDaoYiJian;
352	352	//婚检医生
353	353	private String hunJianDoctor;
	354	+ //婚前卫生咨询
	355	+ private String hunqianHealth;
	356	+ //咨询指导结果
	357	+ private String guidanceResults;
354	358
355	359
356	360	/*********新增（gxk）*********/
357	361	//既往病史
358		- private Map<String,String> maritalBingHistory;
	362	+ private Map<String,Object> maritalBingHistory;
359	363	//手术史(1:有 2:无 3:其他)
360		- private Map<String,String> surgeryHistory;
	364	+ private Map<String,Object> surgeryHistory;
361	365	//现病史
362		- private Map<String,String> nowBingHistory;
	366	+ private Map<String,Object> nowBingHistory;
363	367	//足月
364	368	private Integer zuyue;
365	369	//早产
366	370
367	371
368	372
...	...	@@ -367,15 +371,19 @@
367	371	//流产
368	372	private Integer liuchan;
369	373	//家庭史
370		- private Map<String,String> familyHistory;
	374	+ private Map<String,Object> familyHistory;
371	375	//智力(1:异常 2:正常)
372		- private Map<String,String> intelligence;
	376	+ private Map<String,Object> intelligence;
373	377	//智力详情
374	378	private String intelligenceDetails;
375	379	//皮肤毛发(1:异常 2:正常)
376	380	private Integer pfmf;
	381	+ //皮肤毛发详情
	382	+ private String pfmfDetails;
377	383	//五官（1: 异常 2: 正常）
378	384	private Integer wuguan;
	385	+ //五官详情
	386	+ private String wuguanDetails;
379	387	//四肢脊柱（1: 异常 2: 正常）
380	388	private Integer siZhiJiZhu;
381	389	//四肢脊柱详情
...	...	@@ -426,6 +434,14 @@
426	434	this.wuguan = wuguan;
427	435	}
428	436
	437	+ public String getWuguanDetails() {
	438	+ return wuguanDetails;
	439	+ }
	440	+
	441	+ public void setWuguanDetails(String wuguanDetails) {
	442	+ this.wuguanDetails = wuguanDetails;
	443	+ }
	444	+
429	445	public Integer getPfmf() {
430	446	return pfmf;
431	447	}
432	448
...	...	@@ -434,11 +450,19 @@
434	450	this.pfmf = pfmf;
435	451	}
436	452
437		- public Map<String, String> getIntelligence() {
	453	+ public String getPfmfDetails() {
	454	+ return pfmfDetails;
	455	+ }
	456	+
	457	+ public void setPfmfDetails(String pfmfDetails) {
	458	+ this.pfmfDetails = pfmfDetails;
	459	+ }
	460	+
	461	+ public Map<String, Object> getIntelligence() {
438	462	return intelligence;
439	463	}
440	464
441		- public void setIntelligence(Map<String, String> intelligence) {
	465	+ public void setIntelligence(Map<String, Object> intelligence) {
442	466	this.intelligence = intelligence;
443	467	}
444	468
445	469
...	...	@@ -450,11 +474,11 @@
450	474	this.intelligenceDetails = intelligenceDetails;
451	475	}
452	476
453		- public Map<String, String> getFamilyHistory() {
	477	+ public Map<String, Object> getFamilyHistory() {
454	478	return familyHistory;
455	479	}
456	480
457		- public void setFamilyHistory(Map<String, String> familyHistory) {
	481	+ public void setFamilyHistory(Map<String, Object> familyHistory) {
458	482	this.familyHistory = familyHistory;
459	483	}
460	484
461	485
462	486
463	487
464	488
465	489
...	...	@@ -482,28 +506,28 @@
482	506	this.liuchan = liuchan;
483	507	}
484	508
485		- public Map<String, String> getNowBingHistory() {
486		- return nowBingHistory;
	509	+ public Map<String, Object> getMaritalBingHistory() {
	510	+ return maritalBingHistory;
487	511	}
488	512
489		- public void setNowBingHistory(Map<String, String> nowBingHistory) {
490		- this.nowBingHistory = nowBingHistory;
	513	+ public void setMaritalBingHistory(Map<String, Object> maritalBingHistory) {
	514	+ this.maritalBingHistory = maritalBingHistory;
491	515	}
492	516
493		- public Map<String, String> getSurgeryHistory() {
	517	+ public Map<String, Object> getSurgeryHistory() {
494	518	return surgeryHistory;
495	519	}
496	520
497		- public void setSurgeryHistory(Map<String, String> surgeryHistory) {
	521	+ public void setSurgeryHistory(Map<String, Object> surgeryHistory) {
498	522	this.surgeryHistory = surgeryHistory;
499	523	}
500	524
501		- public Map<String, String> getMaritalBingHistory() {
502		- return maritalBingHistory;
	525	+ public Map<String, Object> getNowBingHistory() {
	526	+ return nowBingHistory;
503	527	}
504	528
505		- public void setMaritalBingHistory(Map<String, String> maritalBingHistory) {
506		- this.maritalBingHistory = maritalBingHistory;
	529	+ public void setNowBingHistory(Map<String, Object> nowBingHistory) {
	530	+ this.nowBingHistory = nowBingHistory;
507	531	}
508	532
509	533	public Integer getSexType() {
...	...	@@ -1714,5 +1738,20 @@
1714	1738	this.hunJianDoctor = hunJianDoctor;
1715	1739	}
1716	1740
	1741	+ public String getHunqianHealth() {
	1742	+ return hunqianHealth;
	1743	+ }
	1744	+
	1745	+ public void setHunqianHealth(String hunqianHealth) {
	1746	+ this.hunqianHealth = hunqianHealth;
	1747	+ }
	1748	+
	1749	+ public String getGuidanceResults() {
	1750	+ return guidanceResults;
	1751	+ }
	1752	+
	1753	+ public void setGuidanceResults(String guidanceResults) {
	1754	+ this.guidanceResults = guidanceResults;
	1755	+ }
1717	1756	}

...	...	@@ -369,17 +369,18 @@
369	369	checkupResult.setYiXueYiJian(result.getYiXueYiJian());
370	370	checkupResult.setYiJianQiTaDetails(result.getYiJianQiTaDetails());
371	371	checkupResult.setZhiDaoYiJian(result.getZhiDaoYiJian());
372		- String hunJianDoctor = "";
	372	+ /*String hunJianDoctor = "";
373	373	if (result.getHunJianDoctor()!=null){
374	374	Users users = usersService.getUsers(Integer.parseInt(result.getHunJianDoctor()));
375	375	if (users!=null && users.getYn()==YnEnums.YES.getId()){
376	376	hunJianDoctor = users.getName();
377	377	}
378		- }
379		-// checkupResult.setHunJianDoctor(result.getHunJianDoctor());
380		- checkupResult.setHunJianDoctor(hunJianDoctor);
	378	+ }*/
	379	+ checkupResult.setHunJianDoctor(result.getHunJianDoctor());
	380	+ // checkupResult.setHunJianDoctor(hunJianDoctor);
381	381
382	382	//新增字段赋值
	383	+ checkupResult.setBloodshed(result.getBloodshed());
383	384	checkupResult.setMaritalBingHistory(result.getMaritalBingHistory());
384	385	checkupResult.setSurgeryHistory(result.getSurgeryHistory());
385	386	checkupResult.setNowBingHistory(result.getNowBingHistory());
386	387
387	388
...	...	@@ -389,13 +390,18 @@
389	390	checkupResult.setFamilyHistory(result.getFamilyHistory());
390	391	checkupResult.setIntelligence(result.getIntelligence());
391	392	checkupResult.setPfmf(result.getPfmf());
	393	+ checkupResult.setPfmfDetails(result.getPfmfDetails());
392	394	checkupResult.setWuguan(result.getWuguan());
	395	+ checkupResult.setWuguanDetails(result.getWuguanDetails());
393	396	checkupResult.setSiZhiJiZhu(result.getSiZhiJiZhu());
394	397	checkupResult.setSiZhiJiZhuDetails(result.getSiZhiJiZhuDetails());
395	398	checkupResult.setVolumeLeft(result.getVolumeLeft());
396	399	checkupResult.setVolumeRight(result.getVolumeRight());
397	400	checkupResult.setPosition(result.getPosition());
398	401	checkupResult.setDegree(result.getDegree());
	402	+ checkupResult.setGanDetails(result.getGanDetails());
	403	+ checkupResult.setHunqianHealth(result.getHunqianHealth());
	404	+ checkupResult.setGuidanceResults(result.getGuidanceResults());
399	405
400	406	return checkupResult;
401	407	}
...	...	@@ -559,6 +565,8 @@
559	565	}
560	566	//血缘关系
561	567	checkup.setIsBloodshed(addRequest.getIsBloodshed());
	568	+ //血缘详情
	569	+ checkup.setBloodshed(addRequest.getBloodshed());
562	570	//既往病史
563	571	checkup.setMaritalBingHistory(addRequest.getMaritalBingHistory());
564	572	//手术史
565	573
566	574
...	...	@@ -579,10 +587,16 @@
579	587	checkup.setIntelligenceDetails(addRequest.getIntelligenceDetails());
580	588	//皮肤毛发
581	589	checkup.setPfmf(addRequest.getPfmf());
	590	+ //皮肤毛发详情
	591	+ checkup.setPfmfDetails(addRequest.getPfmfDetails());
582	592	//五官
583	593	checkup.setWuguan(addRequest.getWuguan());
	594	+ //五官详情
	595	+ checkup.setWuguanDetails(addRequest.getWuguanDetails());
584	596	//四肢脊柱
585	597	checkup.setSiZhiJiZhu(addRequest.getSiZhiJiZhu());
	598	+ //四肢脊柱详情
	599	+ checkup.setSiZhiJiZhuDetails(addRequest.getSiZhiJiZhuDetails());
586	600	//双侧扪及左体积
587	601	checkup.setVolumeLeft(addRequest.getVolumeLeft());
588	602	//双侧扪及右体积
589	603
...	...	@@ -591,9 +605,14 @@
591	605	checkup.setPosition(addRequest.getPosition());
592	606	//程度
593	607	checkup.setDegree(addRequest.getDegree());
	608	+ //肝详情
	609	+ checkup.setGanDetails(addRequest.getGanDetails());
	610	+ //婚前卫生咨询
	611	+ checkup.setHunqianHealth(addRequest.getHunqianHealth());
	612	+ //咨询指导结果
	613	+ checkup.setGuidanceResults(addRequest.getGuidanceResults());
594	614
595	615
596		-
597	616	/* 婚育史 */
598	617	//女性
599	618	checkup.setMenarcheAge(addRequest.getMenarcheAge());
...	...	@@ -1862,7 +1881,7 @@
1862	1881	checkupResult.setSpouseName(result.getSpouseName());
1863	1882	checkupResult.setSpouseCertificateType(getBaseicConfigByid(result.getSpouseCertificateTypeId()));
1864	1883	checkupResult.setSpouseCertificateNum(result.getSpouseCertificateNum());
1865		- String isBloodshed= "";
	1884	+ /*String isBloodshed= "";
1866	1885	if (result.getIsBloodshed() != null && 1 == result.getIsBloodshed())
1867	1886	{
1868	1887	isBloodshed = "有";
1869	1888
...	...	@@ -1870,9 +1889,12 @@
1870	1889	else if (result.getIsBloodshed() != null && 2 == result.getIsBloodshed())
1871	1890	{
1872	1891	isBloodshed = "无";
1873		- }
1874		- checkupResult.setIsBloodshed(isBloodshed);
	1892	+ }*/
1875	1893
	1894	+ //新增血缘关系
	1895	+ checkupResult.setIsBloodshed(result.getIsBloodshed());
	1896	+ checkupResult.setBloodshed(result.getBloodshed());
	1897	+
1876	1898	checkupResult.setHunJianDate(DateUtil.getyyyy_MM_dd(result.getPremaritalUpTime()));
1877	1899	String hunJianDoctor = "";
1878	1900	if (result.getHunJianDoctor()!=null){
...	...	@@ -1882,6 +1904,7 @@
1882	1904	}
1883	1905	}
1884	1906	checkupResult.setHunJianDoctor(hunJianDoctor);
	1907	+ //checkupResult.setHunJianDoctor(result.getHunJianDoctor());
1885	1908
1886	1909	//查询的时候,返回医院的名称
1887	1910	if (result.getHospitalId()!=null){
...	...	@@ -1899,7 +1922,7 @@
1899	1922
1900	1923	checkupResult.setMenstrualAmount(result.getMenstrualAmount());
1901	1924	checkupResult.setLastMenses(result.getLastMenses());
1902		- String menorrhalgia= "";
	1925	+ /*String menorrhalgia= "";
1903	1926	if (result.getMenorrhalgia() != null && "1".equals(result.getMenorrhalgia()))
1904	1927	{
1905	1928	menorrhalgia = "有";
...	...	@@ -1907,8 +1930,9 @@
1907	1930	else if (result.getMenorrhalgia() != null && "2".equals(result.getMenorrhalgia()))
1908	1931	{
1909	1932	menorrhalgia = "无";
1910		- }
1911		- checkupResult.setMenorrhalgia(menorrhalgia);
	1933	+ }*/
	1934	+ //修改痛经赋值和数据类型
	1935	+ checkupResult.setMenorrhalgia(result.getMenorrhalgia());
1912	1936
1913	1937	if (result.getRenLiu() != null)
1914	1938	{
...	...	@@ -2406,6 +2430,10 @@
2406	2430	}
2407	2431	checkupResult.setYiXueYiJian(yxyj);
2408	2432	checkupResult.setZhiDaoYiJian(result.getZhiDaoYiJian());
	2433	+
	2434	+ //新增
	2435	+ checkupResult.setMaritalBingHistory(result.getMaritalBingHistory());
	2436	+
2409	2437	return checkupResult;
2410	2438	}
2411	2439

...	...	@@ -58,13 +58,13 @@
58	58
59	59
60	60	//既往病史
61		- private Map<String,String> maritalBingHistory;
	61	+ private Map<String,Object> maritalBingHistory;
62	62	//手术史
63		- private Map<String,String> surgeryHistory;
	63	+ private Map<String,Object> surgeryHistory;
64	64	//现病史
65		- private Map<String,String> nowBingHistory;
	65	+ private Map<String,Object> nowBingHistory;
66	66	//家庭史
67		- private Map<String,String> familyHistory;
	67	+ private Map<String,Object> familyHistory;
68	68	//与本人关系
69	69	private String relationWithMe;
70	70
...	...	@@ -110,7 +110,7 @@
110	110	//语言能力异常详情
111	111	private String yuYanNengLiDetails;
112	112	//智力(1:异常 2:正常)
113		- private Map<String,String> intelligence;
	113	+ private Map<String,Object> intelligence;
114	114	//智力详情
115	115	private String intelligenceDetails;
116	116	//皮肤毛发(1:异常 2:正常)
117	117
118	118
119	119
120	120
121	121
122	122
123	123
124	124
125	125
...	...	@@ -402,43 +402,43 @@
402	402
403	403	private Integer sexType;
404	404
405		- public Map<String, String> getMaritalBingHistory() {
	405	+ public Map<String, Object> getMaritalBingHistory() {
406	406	return maritalBingHistory;
407	407	}
408	408
409		- public void setMaritalBingHistory(Map<String, String> maritalBingHistory) {
	409	+ public void setMaritalBingHistory(Map<String, Object> maritalBingHistory) {
410	410	this.maritalBingHistory = maritalBingHistory;
411	411	}
412	412
413		- public Map<String, String> getSurgeryHistory() {
	413	+ public Map<String, Object> getSurgeryHistory() {
414	414	return surgeryHistory;
415	415	}
416	416
417		- public void setSurgeryHistory(Map<String, String> surgeryHistory) {
	417	+ public void setSurgeryHistory(Map<String, Object> surgeryHistory) {
418	418	this.surgeryHistory = surgeryHistory;
419	419	}
420	420
421		- public Map<String, String> getNowBingHistory() {
	421	+ public Map<String, Object> getNowBingHistory() {
422	422	return nowBingHistory;
423	423	}
424	424
425		- public void setNowBingHistory(Map<String, String> nowBingHistory) {
	425	+ public void setNowBingHistory(Map<String, Object> nowBingHistory) {
426	426	this.nowBingHistory = nowBingHistory;
427	427	}
428	428
429		- public Map<String, String> getFamilyHistory() {
	429	+ public Map<String, Object> getFamilyHistory() {
430	430	return familyHistory;
431	431	}
432	432
433		- public void setFamilyHistory(Map<String, String> familyHistory) {
	433	+ public void setFamilyHistory(Map<String, Object> familyHistory) {
434	434	this.familyHistory = familyHistory;
435	435	}
436	436
437		- public Map<String, String> getIntelligence() {
	437	+ public Map<String, Object> getIntelligence() {
438	438	return intelligence;
439	439	}
440	440
441		- public void setIntelligence(Map<String, String> intelligence) {
	441	+ public void setIntelligence(Map<String, Object> intelligence) {
442	442	this.intelligence = intelligence;
443	443	}
444	444

1	1	package com.lyms.platform.operate.web.result;
2	2
3	3
	4	+import java.util.Map;
4	5
5	6	/**
6	7	* Created by Administrator on 2016/12/15 0015.
...	...	@@ -53,7 +54,9 @@
53	54	//配偶证件号
54	55	private String spouseCertificateNum;
55	56	//血缘关系(1: 有 2: 无)
56		- private String isBloodshed;
	57	+ private Integer isBloodshed;
	58	+ //血缘详情
	59	+ private String Bloodshed;
57	60
58	61	/**婚检信息 */
59	62
...	...	@@ -81,7 +84,7 @@
81	84	//末次月经
82	85	private String lastMenses;
83	86	//痛经(1:有 2:无)
84		- private String menorrhalgia;
	87	+ private Integer menorrhalgia;
85	88	//人流
86	89	private String renLiu;
87	90
...	...	@@ -321,6 +324,48 @@
321	324	//指导意见
322	325	private String zhiDaoYiJian;
323	326
	327	+ //xinzeng
	328	+ //既往病史
	329	+ private Map<String,Object> maritalBingHistory;
	330	+ //手术史
	331	+ private Map<String,Object> surgeryHistory;
	332	+ //现病史
	333	+ private Map<String,Object> nowBingHistory;
	334	+ //家庭史
	335	+ private Map<String,Object> familyHistory;
	336	+
	337	+ public Map<String, Object> getMaritalBingHistory() {
	338	+ return maritalBingHistory;
	339	+ }
	340	+
	341	+ public void setMaritalBingHistory(Map<String, Object> maritalBingHistory) {
	342	+ this.maritalBingHistory = maritalBingHistory;
	343	+ }
	344	+
	345	+ public Map<String, Object> getSurgeryHistory() {
	346	+ return surgeryHistory;
	347	+ }
	348	+
	349	+ public void setSurgeryHistory(Map<String, Object> surgeryHistory) {
	350	+ this.surgeryHistory = surgeryHistory;
	351	+ }
	352	+
	353	+ public Map<String, Object> getNowBingHistory() {
	354	+ return nowBingHistory;
	355	+ }
	356	+
	357	+ public void setNowBingHistory(Map<String, Object> nowBingHistory) {
	358	+ this.nowBingHistory = nowBingHistory;
	359	+ }
	360	+
	361	+ public Map<String, Object> getFamilyHistory() {
	362	+ return familyHistory;
	363	+ }
	364	+
	365	+ public void setFamilyHistory(Map<String, Object> familyHistory) {
	366	+ this.familyHistory = familyHistory;
	367	+ }
	368	+
324	369	public String getUsername() {
325	370	return username;
326	371	}
327	372
328	373
...	...	@@ -393,14 +438,22 @@
393	438	this.spouseCertificateNum = spouseCertificateNum;
394	439	}
395	440
396		- public String getIsBloodshed() {
	441	+ public Integer getIsBloodshed() {
397	442	return isBloodshed;
398	443	}
399	444
400		- public void setIsBloodshed(String isBloodshed) {
	445	+ public void setIsBloodshed(Integer isBloodshed) {
401	446	this.isBloodshed = isBloodshed;
402	447	}
403	448
	449	+ public String getBloodshed() {
	450	+ return Bloodshed;
	451	+ }
	452	+
	453	+ public void setBloodshed(String bloodshed) {
	454	+ Bloodshed = bloodshed;
	455	+ }
	456	+
404	457	public String getHunJianDate() {
405	458	return hunJianDate;
406	459	}
407	460
...	...	@@ -457,11 +510,11 @@
457	510	this.lastMenses = lastMenses;
458	511	}
459	512
460		- public String getMenorrhalgia() {
	513	+ public Integer getMenorrhalgia() {
461	514	return menorrhalgia;
462	515	}
463	516
464		- public void setMenorrhalgia(String menorrhalgia) {
	517	+ public void setMenorrhalgia(Integer menorrhalgia) {
465	518	this.menorrhalgia = menorrhalgia;
466	519	}
467	520

...	...	@@ -332,15 +332,19 @@
332	332	private String zhiDaoYiJian;
333	333	//婚检医生
334	334	private String hunJianDoctor;
	335	+ //婚前卫生咨询
	336	+ private String hunqianHealth;
	337	+ //咨询指导结果
	338	+ private String guidanceResults;
335	339
336	340
337	341	/********新增*********/
338	342	//既往病史
339		- private Map<String,String> maritalBingHistory;
	343	+ private Map<String,Object> maritalBingHistory;
340	344	//手术史(1:有 2:无 3:其他)
341		- private Map<String,String> surgeryHistory;
	345	+ private Map<String,Object> surgeryHistory;
342	346	//现病史
343		- private Map<String,String> nowBingHistory;
	347	+ private Map<String,Object> nowBingHistory;
344	348	//足月
345	349	private Integer zuyue;
346	350	//早产
347	351
...	...	@@ -348,9 +352,9 @@
348	352	//流产
349	353	private Integer liuchan;
350	354	//家庭史
351		- private Map<String,String> familyHistory;
	355	+ private Map<String,Object> familyHistory;
352	356	//智力(1:异常 2:正常)
353		- private Map<String,String> intelligence;
	357	+ private Map<String,Object> intelligence;
354	358	//智力详情
355	359	private String intelligenceDetails;
356	360	//皮肤毛发(1:异常 2:正常)
357	361
358	362
359	363
360	364
361	365
362	366
363	367
364	368
...	...	@@ -398,38 +402,46 @@
398	402	this.ganDetails = ganDetails;
399	403	}
400	404
401		- public Map<String, String> getMaritalBingHistory() {
	405	+ public Map<String, Object> getMaritalBingHistory() {
402	406	return maritalBingHistory;
403	407	}
404	408
405		- public void setMaritalBingHistory(Map<String, String> maritalBingHistory) {
	409	+ public void setMaritalBingHistory(Map<String, Object> maritalBingHistory) {
406	410	this.maritalBingHistory = maritalBingHistory;
407	411	}
408	412
409		- public Map<String, String> getSurgeryHistory() {
	413	+ public Map<String, Object> getSurgeryHistory() {
410	414	return surgeryHistory;
411	415	}
412	416
413		- public void setSurgeryHistory(Map<String, String> surgeryHistory) {
	417	+ public void setSurgeryHistory(Map<String, Object> surgeryHistory) {
414	418	this.surgeryHistory = surgeryHistory;
415	419	}
416	420
417		- public Map<String, String> getNowBingHistory() {
	421	+ public Map<String, Object> getNowBingHistory() {
418	422	return nowBingHistory;
419	423	}
420	424
421		- public void setNowBingHistory(Map<String, String> nowBingHistory) {
	425	+ public void setNowBingHistory(Map<String, Object> nowBingHistory) {
422	426	this.nowBingHistory = nowBingHistory;
423	427	}
424	428
425		- public Map<String, String> getFamilyHistory() {
	429	+ public Map<String, Object> getFamilyHistory() {
426	430	return familyHistory;
427	431	}
428	432
429		- public void setFamilyHistory(Map<String, String> familyHistory) {
	433	+ public void setFamilyHistory(Map<String, Object> familyHistory) {
430	434	this.familyHistory = familyHistory;
431	435	}
432	436
	437	+ public Map<String, Object> getIntelligence() {
	438	+ return intelligence;
	439	+ }
	440	+
	441	+ public void setIntelligence(Map<String, Object> intelligence) {
	442	+ this.intelligence = intelligence;
	443	+ }
	444	+
433	445	public String getIntelligenceDetails() {
434	446	return intelligenceDetails;
435	447	}
...	...	@@ -486,14 +498,6 @@
486	498	this.liuchan = liuchan;
487	499	}
488	500
489		- public Map<String, String> getIntelligence() {
490		- return intelligence;
491		- }
492		-
493		- public void setIntelligence(Map<String, String> intelligence) {
494		- this.intelligence = intelligence;
495		- }
496		-
497	501	public Integer getPfmf() {
498	502	return pfmf;
499	503	}
...	...	@@ -1692,6 +1696,22 @@
1692	1696
1693	1697	public void setHunJianDoctor(String hunJianDoctor) {
1694	1698	this.hunJianDoctor = hunJianDoctor;
	1699	+ }
	1700	+
	1701	+ public String getHunqianHealth() {
	1702	+ return hunqianHealth;
	1703	+ }
	1704	+
	1705	+ public void setHunqianHealth(String hunqianHealth) {
	1706	+ this.hunqianHealth = hunqianHealth;
	1707	+ }
	1708	+
	1709	+ public String getGuidanceResults() {
	1710	+ return guidanceResults;
	1711	+ }
	1712	+
	1713	+ public void setGuidanceResults(String guidanceResults) {
	1714	+ this.guidanceResults = guidanceResults;
1695	1715	}
1696	1716	}