|
@ -393,9 +393,9 @@ public class SignPatientLabelInfoService extends BaseService {
|
|
|
sql = "SELECT " +
|
|
|
" t1.* " +
|
|
|
" FROM " +
|
|
|
" wlyy_sign_family t1, " +
|
|
|
" wlyy_sign_patient_label_info t2, " +
|
|
|
" wlyy_patient p "+
|
|
|
" wlyy_sign_family t1 " +
|
|
|
" left join wlyy_sign_patient_label_info t2 on t1.patient = t2.patient " +
|
|
|
" left join wlyy_patient p on p.`code` = t1.patient "+
|
|
|
" WHERE " +
|
|
|
" t2.label = ? " +
|
|
|
" AND t2.label_type = ? " +
|
|
@ -403,7 +403,8 @@ public class SignPatientLabelInfoService extends BaseService {
|
|
|
" AND t1.patient = t2.patient " +
|
|
|
" AND (t1.doctor = ? or t1.doctor_health = ?)" +
|
|
|
" AND t1.status > 0 " +
|
|
|
" AND t1.admin_team_code = ? " ;
|
|
|
" AND t1.admin_team_code = ? "+
|
|
|
" AND p.`status` =1 ";
|
|
|
if(isFollowWeChat){
|
|
|
sql += " AND p.openid IS NOT NULL AND p.openid <>'' ";
|
|
|
}
|