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

common/common-entity/src/main/java/com/yihu/jw/entity/care/contacts/PatientSosContactsDO.java

@@ -4,6 +4,7 @@ package com.yihu.jw.entity.care.contacts;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.yihu.jw.entity.IdEntity;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
import javax.persistence.Transient;
@@ -29,6 +30,7 @@ public class PatientSosContactsDO extends IdEntity {
    private String relationName;
    @Column(name = "patient")
    public String getPatient() {
        return patient;
    }
@@ -37,6 +39,7 @@ public class PatientSosContactsDO extends IdEntity {
        this.patient = patient;
    }
    @Column(name = "sos_name")
    public String getSosName() {
        return sosName;
    }
@@ -45,6 +48,7 @@ public class PatientSosContactsDO extends IdEntity {
        this.sosName = sosName;
    }
    @Column(name = "sos_phone")
    public String getSosPhone() {
        return sosPhone;
    }
@@ -53,6 +57,7 @@ public class PatientSosContactsDO extends IdEntity {
        this.sosPhone = sosPhone;
    }
    @Column(name = "relation")
    public Integer getRelation() {
        return relation;
    }
@@ -62,6 +67,7 @@ public class PatientSosContactsDO extends IdEntity {
    }
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+08:00")
    @Column(name = "update_time")
    public Date getUpdateTime() {
        return updateTime;
    }
@@ -70,6 +76,7 @@ public class PatientSosContactsDO extends IdEntity {
        this.updateTime = updateTime;
    }
    @Column(name = "success_flag")
    public Integer getSuccessFlag() {
        return successFlag;
    }
@@ -78,6 +85,7 @@ public class PatientSosContactsDO extends IdEntity {
        this.successFlag = successFlag;
    }
    @Column(name = "del")
    public Integer getDel() {
        return del;
    }
@@ -95,6 +103,7 @@ public class PatientSosContactsDO extends IdEntity {
        this.relationName = relationName;
    }
    @Column(name = "phone_seqid")
    public Integer getPhoneSeqid() {
        return phoneSeqid;
    }
@@ -103,6 +112,7 @@ public class PatientSosContactsDO extends IdEntity {
        this.phoneSeqid = phoneSeqid;
    }
    @Column(name = "update_info")
    public String getUpdateInfo() {
        return updateInfo;
    }
@@ -111,6 +121,7 @@ public class PatientSosContactsDO extends IdEntity {
        this.updateInfo = updateInfo;
    }
    @Column(name = "error_info")
    public String getErrorInfo() {
        return errorInfo;
    }

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/service/patient/CarePatientService.java

@@ -738,7 +738,7 @@ public class CarePatientService extends BaseJpaService<BasePatientDO, BasePatien
        String sql = "select t2.id,t2.name,t2.sex,t2.mobile,t2.idcard,if(t2.openid is null,0,1) online,t2.photo,t1.family_relation,t1.patient older,t3.name olderName " +
                "from base_patient t2 left JOIN base_patient_family_member t1 on t1.family_member = t2.id " +
                "left join base_patient t3 on t3.id = t1.patient  " +
                "where t2.archive_type=3 and t2.del=1 ";
                "where t2.archive_type=3 and t2.del=1 and t3.archive_type=1 and t3.del=1 ";
        if (StringUtils.isNotBlank(name)){
            sql += " and t3.name like '%"+name+"%'";
        }
@@ -755,7 +755,7 @@ public class CarePatientService extends BaseJpaService<BasePatientDO, BasePatien
        String sql = "select t2.id,t1.patient " +
                "from base_patient t2 left JOIN base_patient_family_member t1 on t1.family_member = t2.id " +
                "left join base_patient t3 on t3.id = t1.patient  " +
                "where t2.archive_type=3 and t2.del=1 ";
                "where t2.archive_type=3 and t2.del=1 and t3.archive_type=1 and t3.del=1 ";
        if (StringUtils.isNotBlank(name)){
            sql += " and t3.name like '%"+name+"%'";
        }