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

common/common-entity/src/main/java/com/yihu/jw/entity/health/bank/TaskPatientDetailDO.java

@@ -55,6 +55,15 @@ public class TaskPatientDetailDO extends UuidIdentityEntityWithOperator implemen
    @Column(name = "street")
    private String street;
    @Column(name = "street_name")
    private String streetName;
    @Column(name = "town")
    private String town;
    @Column(name = "town_name")
    private String townName;
    @Transient
    private AccountDO accountDO;//账户信息
@@ -68,7 +77,7 @@ public class TaskPatientDetailDO extends UuidIdentityEntityWithOperator implemen
    private String name;//居民名称
    @Transient
    @Column(name = "hopital_name")
    private String hospitalName;//社区名称
    @Transient
@@ -205,7 +214,7 @@ public class TaskPatientDetailDO extends UuidIdentityEntityWithOperator implemen
        this.hospital = hospital;
    }
    @Transient
    @Column(name = "hospital_name")
    public String getHospitalName() {
        return hospitalName;
    }
@@ -261,4 +270,30 @@ public class TaskPatientDetailDO extends UuidIdentityEntityWithOperator implemen
        this.activityDO = activityDO;
    }
    @Column(name = "town_name")
    public String getTownName() {
        return townName;
    }
    public void setTownName(String townName) {
        this.townName = townName;
    }
    @Column(name = "town")
    public String getTown() {
        return town;
    }
    public void setTown(String town) {
        this.town = town;
    }
    @Column(name = "street_name")
    public String getStreetName() {
        return streetName;
    }
    public void setStreetName(String streetName) {
        this.streetName = streetName;
    }
}

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

@@ -86,7 +86,7 @@ public class RehabilitationManageService {
            sql+=" and p.disease='"+diseaseCode+"'";
        }
        if(StringUtils.isNotEmpty(patientCondition)){
            sql += " and (f.idcard like '%"+patientCondition+"%' or p.name like '%"+patientCondition+"%') ";
            sql += " and p.name like '%"+patientCondition+"%' ";
        }
        String finalSql = "";