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

patient-co-statistics/src/main/java/com/yihu/wlyy/statistics/job/business/CurrentDayAllQuotaJob.java

@@ -1679,13 +1679,31 @@ public class CurrentDayAllQuotaJob implements Job {
                    " WHERE t.level = 2 AND t.del='1' AND t.town= ? AND LENGTH(t.code)<=10 GROUP BY left(t.code,8) order by avgCount DESC ";
            return town_hos_SQL;
        } else if ("team_SQL".equals(code)) {
            //查找所有团队
            String team_SQL = "SELECT  t.id,t.`name` ,d.hospital,ifnull(ROUND(AVG(s.score),1),0) as avgCount " +
                    " FROM wlyy_doctor d " +
                    " RIGHT JOIN wlyy_admin_team t on t.leader_code = d.code " +
                    " LEFT JOIN wlyy_evaluate_score s ON d.code = s.doctor " +
                    " WHERE LENGTH(d.hospital)<=10 " +
                    " GROUP BY t.id,left(d.hospital,8) order by avgCount DESC ";
            //查找所有机构底下所有团队
            String team_SQL = "SELECT " +
                    " tm.`name`, " +
                    " tm.id, " +
                    " tm.org_code AS hospital, " +
                    " ifnull(ss.avgCount, 0) " +
                    " FROM " +
                    " wlyy_admin_team tm " +
                    " LEFT JOIN ( " +
                    " SELECT " +
                    "  t.admin_team_code, " +
                    "  d.hospital, " +
                    "  ifnull(ROUND(AVG(s.score), 1), 0) AS avgCount " +
                    " FROM " +
                    "  wlyy_doctor d " +
                    " JOIN wlyy_evaluate_score s ON d. CODE = s.doctor " +
                    " JOIN wlyy_consult_team t ON t.consult = s.consult " +
                    " WHERE " +
                    "  LENGTH(d.hospital) <= 10 " +
                    " GROUP BY " +
                    "  t.admin_team_code, " +
                    "  LEFT (d.hospital, 8) " +
                    " ) ss ON ss.admin_team_code = tm.id " +
                    " ORDER BY " +
                    " avgCount DESC";
            return team_SQL;
        } else if ("All_hos_SQL".equals(code)) {
            //查找所有机构

patient-co-wlyy/src/main/java/com/yihu/wlyy/service/app/sign/SignWebService.java

@@ -236,13 +236,13 @@ public class SignWebService extends BaseService {
                patients = jdbcTemplate.queryForList(sql, new Object[]{doctor, 2});
                break;
            case 3:// 已签约
                patients = jdbcTemplate.queryForList(isSignSql, new Object[]{doctor, 1});
                patients = jdbcTemplate.queryForList(isSignSql, new Object[]{doctor,doctor, 1});
                break;
            case 4:// 4已经解约
                patients = jdbcTemplate.queryForList(surrSql, new Object[]{doctor, -3, -4});
                patients = jdbcTemplate.queryForList(surrSql, new Object[]{doctor,doctor, -3, -4});
                break;
            case 5: // 未缴费
                patients = jdbcTemplate.queryForList(sqlExpenses, new Object[]{doctor, 0});
                patients = jdbcTemplate.queryForList(sqlExpenses, new Object[]{doctor,doctor, 0});
        }
        return patients;