|
@ -3346,7 +3346,7 @@ public class SignPatientLabelInfoService extends BaseService {
|
|
|
" AND t1.admin_team_code = ? order by t1.openid desc,convert(t1.name using gbk) ";
|
|
|
|
|
|
args = new Object[]{teamCode, labelType, teamCode};
|
|
|
} else {
|
|
|
} else if(!org.springframework.util.StringUtils.isEmpty(labelType)){
|
|
|
sql = "SELECT " +
|
|
|
" DISTINCT t1.* " +
|
|
|
" FROM " +
|
|
@ -3361,6 +3361,17 @@ public class SignPatientLabelInfoService extends BaseService {
|
|
|
" AND t1.admin_team_code = ? order by t1.openid desc,convert(t1.name using gbk) ";
|
|
|
|
|
|
args = new Object[]{labelCode, labelType, teamCode};
|
|
|
}else{
|
|
|
//标签类别为空的时候
|
|
|
sql = "SELECT " +
|
|
|
" DISTINCT t1.* " +
|
|
|
" FROM " +
|
|
|
" wlyy_sign_family t1 " +
|
|
|
" WHERE " +
|
|
|
" t1.status > 0 " +
|
|
|
" AND t1.admin_team_code = ? order by t1.openid desc,convert(t1.name using gbk) ";
|
|
|
|
|
|
args = new Object[]{teamCode};
|
|
|
}
|
|
|
}
|
|
|
|