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

patient-co-wlyy/src/main/java/com/yihu/wlyy/service/app/statistics/StatisticsAllService.java

@@ -145,8 +145,7 @@ public class StatisticsAllService extends BaseService {
                "     wlyy_quota_result " +
                " where " +
                "     quato_code = ? " +
                "   and level1_type = ? and del = '1'" +
                "   and quota_date = ? ";
                "   and level1_type = ? and del = '1'" ;
        if (level == 4) {
            // 市级别
@@ -160,6 +159,8 @@ public class StatisticsAllService extends BaseService {
        } else if (level == 1) {
            sql += " and qkdoctor_code = ?";
        }
            sql += "   order by quota_date DESC " +
                    "   limit 0,1";
        List<Map<String, Object>> result = jdbcTemplate.queryForList(sql, new Object[]{index, level, endDate, area});
@@ -703,9 +704,7 @@ public class StatisticsAllService extends BaseService {
                "     quato_code = '" + index + "' " +
                "   and level1_type = ? and del = '1'" +
                "   and quota_date = ? " +
                "   and " + areaField + " = ? " +
                "   order by quota_date DESC " +
                "   limit 0,1";
                "   and " + areaField + " = ? ";
        resultList = jdbcTemplate.queryForList(sql, new Object[]{low_level, date, area});