Merge branch 'dev' of http://192.168.1.220:10080/Amoy2/wlyy2.0 into dev

business/im-service/src/main/java/com/yihu/jw/im/service/ImService.java

@@ -2140,7 +2140,8 @@ public class ImService {
					"d.id as \"patientId\"," +
					"d.idcard as \"patientIdcard\"," +
					"d.sex as \"patientSex\"," +
					"d.photo AS \"patientPhoto\" " +
					"d.photo AS \"patientPhoto\", " +
					"b.doctor as \"doctor\"  "+
					"FROM wlyy_consult a," +
					"wlyy_consult_team b," +
					"base_patient d " +
@@ -2172,7 +2173,8 @@ public class ImService {
					"op.type as \"consultType\"," +
					"op.general_doctor as \"generalDoctor\"," +
					"op.icd10_name as \"icd10Name\"," +
					"d.photo AS \"patientPhoto\" " +
					"d.photo AS \"patientPhoto\" , " +
					"b.doctor as \"doctor\"  "+
					"FROM wlyy_consult_team b," +
					"base_patient d," +
					"wlyy_consult a   " +

common/common-entity/src/main/java/com/yihu/jw/entity/specialist/rehabilitation/PatientRehabilitationPlanDO.java

@@ -2,7 +2,6 @@ package com.yihu.jw.entity.specialist.rehabilitation;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yihu.jw.entity.UuidIdentityEntityWithOperator;
import org.springframework.data.annotation.CreatedDate;
import javax.persistence.Column;
import javax.persistence.Entity;
@@ -52,6 +51,8 @@ public class PatientRehabilitationPlanDO extends UuidIdentityEntityWithOperator
    @Column(name = "team_code")
    private Integer teamCode;//专科医生签约团队
    private String healthStatusCode;//健康情况
    @Column(name = "saas_id")
    public String getSaasId() {
        return saasId;
@@ -203,4 +204,13 @@ public class PatientRehabilitationPlanDO extends UuidIdentityEntityWithOperator
    public void setTeamCode(Integer teamCode) {
        this.teamCode = teamCode;
    }
    @Column(name = "health_status_code")
    public String getHealthStatusCode() {
        return healthStatusCode;
    }
    public void setHealthStatusCode(String healthStatusCode) {
        this.healthStatusCode = healthStatusCode;
    }
}