Merge branch 'dev' of lyr/patient-co-management into dev

patient-co-wlyy/src/main/java/com/yihu/wlyy/service/app/label/SignPatientLabelInfoService.java

@@ -593,7 +593,7 @@ public class SignPatientLabelInfoService extends BaseService {
                " from" +
                "     (select * from wlyy_sign_family where " + (doc.getLevel() == 2 ? " doctor" : "doctor_health") + " = ? and status > 0 " +
                (teamCode > 0 ? (" and admin_team_code = " + teamCode) : "") + " ) a" +
                " left join" +
                (StringUtils.isNotEmpty(labelCode) || StringUtils.isNotEmpty(labelType) ? " join " : " left join ")+
                "     (select * from wlyy_sign_patient_label_info where status = 1 " +
                (StringUtils.isNotEmpty(labelCode) ? " and label = ? " : "") +
                (StringUtils.isNotEmpty(labelType) ? " and label_type = ? " : "") + ") b" +