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

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

@@ -179,7 +179,7 @@ public class CurrentDayAllQuotaJob implements Job {
        computequota_26();//统计未缴费签约总数
        computequota_27();//统计代预约量
        computequota_28();//统计平均值
        computequota_29(); //统计续签
//        computequota_29(); //统计续签 没用
        computequota_31(); //统计续签夸团队
        computequota_32(); //统计续签夸社区
        computequota_33(); //统计续签夸区

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

@@ -4037,17 +4037,17 @@ public class StatisticsService extends BaseService {
            //团队的续签量
            renewIndex="42";
            //团队的转签
            switchIndex="39";
            switchIndex="35";
        }else if("2".equals(level)){
            //社区的续签量
            renewIndex="43";
            //社区的转签
            switchIndex="39";
            switchIndex="35";
        }else{
            //区和市的续签量
            renewIndex="44";
            //区和市的转签
            switchIndex="39";
            switchIndex="35";
        }
        JSONObject jo = new JSONObject();

patient-co-wlyy/src/main/java/com/yihu/wlyy/web/statistic/StatisticsController.java

@@ -1520,7 +1520,7 @@ public class StatisticsController extends BaseController {
            }
            result.put("index_29", statisticsAllService.getLevelTwoLowLevelTotalSignAndRenew(area, level, index, sort, lowLevel, year));
            result.put("index_"+index, statisticsAllService.getLevelTwoLowLevelTotalSignAndRenew(area, level, index, sort, lowLevel, year));
            return write(200, "查询成功", "data", result);
        } catch (Exception e) {