| 
															
																@ -327,6 +327,10 @@ public class Patient extends IdEntity implements Serializable { 
															 | 
														
													
												
													
														
															| 
															 | 
															
																 
															 | 
															
															 | 
															
																 
															 | 
														
													
												
													
														
															| 
															 | 
															
																    @Transient 
															 | 
															
															 | 
															
																    @Transient 
															 | 
														
													
												
													
														
															| 
															 | 
															
																	public String getDiseaseName() {//0健康,1高血压,2糖尿病,3高血压+糖尿病 
															 | 
															
															 | 
															
																	public String getDiseaseName() {//0健康,1高血压,2糖尿病,3高血压+糖尿病 
															 | 
														
													
												
													
														
															| 
															 | 
															
																 
															 | 
															
															 | 
															
																		if(disease==null){ 
															 | 
														
													
												
													
														
															| 
															 | 
															
																 
															 | 
															
															 | 
															
																			this.diseaseName = ""; 
															 | 
														
													
												
													
														
															| 
															 | 
															
																 
															 | 
															
															 | 
															
																			return diseaseName; 
															 | 
														
													
												
													
														
															| 
															 | 
															
																 
															 | 
															
															 | 
															
																		} 
															 | 
														
													
												
													
														
															| 
															 | 
															
																		if(0==disease) { 
															 | 
															
															 | 
															
																		if(0==disease) { 
															 | 
														
													
												
													
														
															| 
															 | 
															
																			this.diseaseName = "健康"; 
															 | 
															
															 | 
															
																			this.diseaseName = "健康"; 
															 | 
														
													
												
													
														
															| 
															 | 
															
																		}else if(1==disease) { 
															 | 
															
															 | 
															
																		}else if(1==disease) { 
															 | 
														
													
												
											
												
													
														
															 | 
															
																@ -347,6 +351,10 @@ public class Patient extends IdEntity implements Serializable { 
															 | 
														
													
												
													
														
															| 
															 | 
															
																 
															 | 
															
															 | 
															
																 
															 | 
														
													
												
													
														
															| 
															 | 
															
																	@Transient 
															 | 
															
															 | 
															
																	@Transient 
															 | 
														
													
												
													
														
															| 
															 | 
															
																	public String getDiseaseConditionName() { 
															 | 
															
															 | 
															
																	public String getDiseaseConditionName() { 
															 | 
														
													
												
													
														
															| 
															 | 
															
																 
															 | 
															
															 | 
															
																		if(null==diseaseCondition){ 
															 | 
														
													
												
													
														
															| 
															 | 
															
																 
															 | 
															
															 | 
															
																			this.diseaseConditionName = ""; 
															 | 
														
													
												
													
														
															| 
															 | 
															
																 
															 | 
															
															 | 
															
																			return diseaseConditionName; 
															 | 
														
													
												
													
														
															| 
															 | 
															
																 
															 | 
															
															 | 
															
																		} 
															 | 
														
													
												
													
														
															| 
															 | 
															
																		if(0==diseaseCondition) { 
															 | 
															
															 | 
															
																		if(0==diseaseCondition) { 
															 | 
														
													
												
													
														
															| 
															 | 
															
																			this.diseaseConditionName = "绿标"; 
															 | 
															
															 | 
															
																			this.diseaseConditionName = "绿标"; 
															 | 
														
													
												
													
														
															| 
															 | 
															
																		}else if(1==diseaseCondition) { 
															 | 
															
															 | 
															
																		}else if(1==diseaseCondition) { 
															 |