|
@ -604,11 +604,15 @@ public class JMJkEduArticleService extends BaseService {
|
|
|
}
|
|
|
if (!StringUtils.isEmpty(labelDisease)) {
|
|
|
if (!whereSql.endsWith(" and ( ")) {
|
|
|
whereSql += " or (l.label_type = 3 AND l.label in (" + labelDisease + "))) ";
|
|
|
whereSql += " or (l.label_type = 3 AND l.label in (" + labelDisease + ")) ";
|
|
|
} else {
|
|
|
whereSql += " (l.label_type = 1 AND l.label in (" + labelDisease + "))) ";
|
|
|
whereSql += " l.label_type = 1 AND l.label in (" + labelDisease + ")) ";
|
|
|
}
|
|
|
}
|
|
|
if (!StringUtils.isEmpty(labelHealth) || !StringUtils.isEmpty(labelDisease)) {
|
|
|
whereSql += ")";
|
|
|
}
|
|
|
|
|
|
tableSql += " left join wlyy_patient p on p.code=w.patient AND p.openid IS NOT NULL and p.openid <>''";
|
|
|
if (!StringUtils.isEmpty(labelSex)) {
|
|
|
whereSql += " and p.sex in (" + labelSex + ") ";
|