Merge branch 'dev' of huangwenjie/wlyy2.0 into dev

common/common-rest-model/src/main/java/com/yihu/jw/restmodel/specialist/PatientSignInfoVO.java

@@ -38,6 +38,10 @@ public class PatientSignInfoVO {
    private String dept;
    @ApiModelProperty("科室")
    private String deptName;
    @ApiModelProperty("职称")
    private String job;
    @ApiModelProperty("性别")
    private Integer sex;
    @ApiModelProperty("团队")
    private String teamName;
    @ApiModelProperty("团队code")
@@ -215,4 +219,20 @@ public class PatientSignInfoVO {
    public void setSsc(String ssc) {
        this.ssc = ssc;
    }
    
    public String getJob() {
        return job;
    }
    
    public void setJob(String job) {
        this.job = job;
    }
    
    public Integer getSex() {
        return sex;
    }
    
    public void setSex(Integer sex) {
        this.sex = sex;
    }
}

svr/svr-wlyy-specialist/src/main/java/com/yihu/jw/service/SpecialistService.java

@@ -634,6 +634,8 @@ public class SpecialistService{
                " d.photo, " +
                " d.dept, " +
                " d.dept_name AS deptName, " +
                " d.job_name AS job, " +
                " d.sex AS sex, " +
                " d.hospital, " +
                " d.hospital_name AS hospital_name, " +
                " d.`level` " +