Merge branch 'dev' of trick9191/jw2.0 into dev

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

@@ -14,11 +14,21 @@ import java.io.Serializable;
@Table(name = "wlyy_patient_hospital_record")
public class PatientHospitalRecordDO extends IdEntityWithOperation implements Serializable {
    private String saasId;//
    private String code;//智业记录code
    private String patient;//患者
    private String patientName;//患者姓名
    private String type;//出院：1；住院：0
    @Column(name = "saas_id")
    public String getSaasId() {
        return saasId;
    }
    public void setSaasId(String saasId) {
        this.saasId = saasId;
    }
    @Column(name = "code")
    public String getCode() {
        return code;

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

@@ -14,12 +14,22 @@ import java.io.Serializable;
@Table(name = "wlyy_specialist_Article")
public class SpecialistArticleDO extends IdEntityWithOperation implements Serializable {
    private String saasId;
    private String patient;//居民
    private String patientName;//居民
    private String doctor;//医生
    private String doctorName;//医生
    private String article;//文章
    @Column(name = "saas_id")
    public String getSaasId() {
        return saasId;
    }
    public void setSaasId(String saasId) {
        this.saasId = saasId;
    }
    @Column(name = "patient")
    public String getPatient() {
        return patient;

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

@@ -14,6 +14,7 @@ import java.io.Serializable;
@Table(name = "wlyy_specialist_consult")
public class SpecialistConsultDO extends IdEntityWithOperation implements Serializable {
    private String saasId;
    private String consult;//关联咨询code
    private String doctor;//专科医生
    private String doctorName;//专科医生姓名
@@ -24,6 +25,15 @@ public class SpecialistConsultDO extends IdEntityWithOperation implements Serial
    private String reply;// 1.专科医生已经参与；0.~未参与
    private String content;//咨询内容
    @Column(name = "saas_id")
    public String getSaasId() {
        return saasId;
    }
    public void setSaasId(String saasId) {
        this.saasId = saasId;
    }
    @Column(name = "consult")
    public String getConsult() {
        return consult;

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

@@ -14,6 +14,7 @@ import java.io.Serializable;
@Table(name = "wlyy_specialist")
public class SpecialistDO extends IdEntityWithOperation implements Serializable {
    private String saasId;
    private String name; //专科医生姓名
    private String profession; //专业
    private String professionName; // 专业名称
@@ -23,6 +24,15 @@ public class SpecialistDO extends IdEntityWithOperation implements Serializable
    private String hospitalName;//医院名称
    private String del;//1：有效；0：删除
    @Column(name = "saas_id")
    public String getSaasId() {
        return saasId;
    }
    public void setSaasId(String saasId) {
        this.saasId = saasId;
    }
    @Column(name = "name")
    public String getName() {
        return name;

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

@@ -15,6 +15,7 @@ import java.util.Date;
@Table(name = "wlyy_specialist_patient_relation")
public class SpecialistPatientRelationDO extends IdEntityWithOperation implements Serializable {
    private String saasId;
    private String dischargeRecord;//最新出院记录
    private String doctor;//专科医生
    private String doctorName;//专科医生姓名
@@ -30,6 +31,15 @@ public class SpecialistPatientRelationDO extends IdEntityWithOperation implement
    private Integer teamCode;//签约团队
    private Date signDate;//签约日期
    @Column(name = "saas_id")
    public String getSaasId() {
        return saasId;
    }
    public void setSaasId(String saasId) {
        this.saasId = saasId;
    }
    @Column(name = "discharge_record")
    public String getDischargeRecord() {
        return dischargeRecord;