Merge branch 'dev' of http://192.168.1.220:10080/Amoy/patient-co-management into dev

patient-co-figure/src/main/java/com/yihu/figure/model/patient/portrait/UserPortrait.java

@@ -20,6 +20,9 @@ public class UserPortrait extends IdEntity {
    private String subCategoryName;//标签子类别名称
    private String value;//标签名称
    private Date czrq;//
    private String healthAppraise;//健康评估
    private String healthSuggest;//健康建议
    private String recommendService;//推荐服务
    public String getUserCode() {
        return userCode;
@@ -76,4 +79,28 @@ public class UserPortrait extends IdEntity {
    public void setSubCategoryName(String subCategoryName) {
        this.subCategoryName = subCategoryName;
    }
    public String getHealthAppraise() {
        return healthAppraise;
    }
    public void setHealthAppraise(String healthAppraise) {
        this.healthAppraise = healthAppraise;
    }
    public String getHealthSuggest() {
        return healthSuggest;
    }
    public void setHealthSuggest(String healthSuggest) {
        this.healthSuggest = healthSuggest;
    }
    public String getRecommendService() {
        return recommendService;
    }
    public void setRecommendService(String recommendService) {
        this.recommendService = recommendService;
    }
}

patient-co-figure/src/main/java/com/yihu/figure/service/PortraitService.java

@@ -187,6 +187,7 @@ public class PortraitService {
    }
    public UserPortrait findPortraitById(Long id) {
        return userPortraitDao.findOne(id);
    }
}