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

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

@@ -138,7 +138,7 @@ public class SignPatientLabelInfoService extends BaseService {
                        "    AND t1.status > 0 " +
                        "    AND t1.admin_team_code = ? limit " + start + "," + pagesize;
                args = new Object[]{labelCode, labelType,doctor, teamCode};
                args = new Object[]{labelCode, labelType, doctor, teamCode};
            }
        }
@@ -376,9 +376,9 @@ public class SignPatientLabelInfoService extends BaseService {
                                (teamCode > 0 ? "    AND t1.admin_team_code = ? " : "");
                        if (teamCode > 0) {
                            args = new Object[]{labelType,doctor, teamCode};
                            args = new Object[]{labelType, doctor, teamCode};
                        } else {
                            args = new Object[]{labelType,doctor};
                            args = new Object[]{labelType, doctor};
                        }
                    } else {
                        sql = " SELECT " +
@@ -627,13 +627,13 @@ public class SignPatientLabelInfoService extends BaseService {
                "    wlyy_sign_family t1 " +
                (StringUtils.isNotEmpty(labelCode) || StringUtils.isNotEmpty(labelType) ?
                        " join " : " left join ") +
                "    wlyy_sign_patient_label_info t2 " +
                "    (select patient,label,label_name,label_type from wlyy_sign_patient_label_info " +
                "    where status = 1 " +
                (StringUtils.isNotEmpty(labelCode) ? " AND label = ? " : "") +
                (StringUtils.isNotEmpty(labelType) ? " AND label_type = ? " : "") + ") t2" +
                " ON t1.patient = t2.patient " +
                " WHERE " +
                "    t2.status = 1 " +
                (StringUtils.isNotEmpty(labelCode) ? " AND t2.label = ? " : "") +
                (StringUtils.isNotEmpty(labelType) ? " AND t2.label_type = ? " : "") +
                "    AND t1." + (doc.getLevel() == 2 ? "doctor" : "doctor_health") + " = ? " +
                "    t1." + (doc.getLevel() == 2 ? "doctor" : "doctor_health") + " = ? " +
                "    AND t1.status > 0 " +
                "    AND (t1.name like ? OR t2.label_name like ?) " +
                (teamCode > 0 ? (" AND admin_team_code = " + teamCode) : "")