bug修改

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

@@ -2509,7 +2509,12 @@ public class StatisticsAllService extends BaseService {
                Integer expenseStatus0amountNum = expenseStatus0.get(map.get("code").toString());
                Integer expenseStatus1amountNum = expenseStatus1.get(map.get("code").toString());
                Integer expenseStatus1SigjnNum = expenseStatus1Sigjn.get(map.get("code").toString());
                if(expenseStatus0amountNum==null){
                    expenseStatus0amountNum=0;
                }
                if(expenseStatus1amountNum==null){
                    expenseStatus1amountNum=0;
                }
                map.put("amount", map.get("amount") != null ? Long.valueOf(map.get("amount").toString()) : 0L);
                map.put("weChatAmount0", expenseStatus0amountNum);//微信关注未交费数
                map.put("weChatAmount1", expenseStatus1amountNum);//微信关注已交费数

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

@@ -1483,15 +1483,18 @@ public class StatisticsController extends BaseController {
    /**
     * 去年的签约量，续签量和续签率 列表
     *
     * @param area
     * @param index      42,43,44
     * @param area    每个层级大的code  例如湖里区 350206  xx社区 3502060100
     * @param level    level1_type等级 1:团队 2社区机构 3区级 4市级
     * @param sort     0:升序 1:降序
     * @param lowLevel 只有可能是 1,2,3,
     * @param lowLevel  只有可能是 1,2,3,不传默认是level-1
     * @param year      不管根据当前时间找年度
     * @return
     */
    @RequestMapping("/lowlevel_all_sign_renew")
    @ResponseBody
    public String getIndexLowLevelTotalSignAndRenew(
            @RequestParam(required = true) String index,
            @RequestParam(required = true) String area,
            @RequestParam(required = true) int level,
            @RequestParam(required = true) int sort,
@@ -1504,20 +1507,10 @@ public class StatisticsController extends BaseController {
            if (org.springframework.util.StringUtils.isEmpty(year)) {
                year = Constant.getNowYear();
            }
            //lowLevel不传默认是 level-1
            if (org.springframework.util.StringUtils.isEmpty(lowLevel)) {
                lowLevel = level - 1 + "";
            }
            String index = "";
            if (1 == level) {
                //团队的续签量
                index = "42";
            } else if (2 == level) {
                //社区的续签量
                index = "43";
            } else {
                //区和市的续签量
                index = "44";
            }
            result.put("index_"+index, statisticsAllService.getLevelTwoLowLevelTotalSignAndRenew(area, level, index, sort, lowLevel, year));