bug修改

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

@@ -199,8 +199,8 @@ public class CurrentDayAllQuotaJob implements Job {
        //computequota_45(); //统计社区转签 没用指标
        //computequota_46(); //统计区转签  没用指标
        computequota_30(); //统计团队续签原因
//        computequota_47(); //统计社区续签原因 没用指标
//        computequota_48(); //统计区续签原因 没用指标
        computequota_47(); //统计社区续签原因
        computequota_48(); //统计区续签原因
        quartzJobLog.setJobContent(allContent.toString());

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

@@ -1,114 +1,114 @@
//package com.yihu.wlyy.statistics.job.business;
//
//import com.yihu.wlyy.statistics.dao.QuartzJobLogDao;
//import com.yihu.wlyy.statistics.etl.dataFilter.RenewSignDataFilter;
//import com.yihu.wlyy.statistics.etl.extract.DBExtract;
//import com.yihu.wlyy.statistics.etl.model.ETLModel;
//import com.yihu.wlyy.statistics.etl.model.FilterModel;
//import com.yihu.wlyy.statistics.etl.role.Level1Role;
//import com.yihu.wlyy.statistics.etl.role.Level2Role;
//import com.yihu.wlyy.statistics.etl.storage.DBStorage;
//import com.yihu.wlyy.statistics.model.job.QuartzJobLog;
//import com.yihu.wlyy.statistics.model.signfamily.SignFamilyRenew;
//import com.yihu.wlyy.statistics.util.JsonUtil;
//import com.yihu.wlyy.statistics.vo.WlyyJobConfigVO;
//import com.yihu.wlyy.statistics.vo.WlyyQuotaVO;
//import org.quartz.*;
//import org.springframework.beans.factory.annotation.Autowired;
//import org.springframework.context.annotation.Scope;
//import org.springframework.jdbc.core.JdbcTemplate;
//import org.springframework.stereotype.Component;
//import org.springframework.transaction.annotation.Transactional;
//import org.springframework.util.StringUtils;
//import org.springframework.web.context.support.SpringBeanAutowiringSupport;
//
//import java.util.Date;
//import java.util.List;
//import java.util.Map;
//
///**
// * 续签签约原因的指标执行类
// */
//@Component
//@Scope("prototype")
//@DisallowConcurrentExecution//防止到了执行时间点前一任务还在执行中，但是这时有空闲的线程，那么马上又会执行，这样一来就会存在同一job被并行执行
//public class RenewSignOrgReasonJob implements Job {
//    private WlyyQuotaVO wlyyQuota;//指标对象
//    private WlyyJobConfigVO wlyyJobConfig;//配置对象
//    @Autowired
//    private QuartzJobLogDao quartzJobLogDao;//执行日志Dao
//    @Autowired
//    private JdbcTemplate jdbcTemplate;
//    @Autowired
//    private Level1Role levelRole;
//    @Autowired
//    private Level2Role level2Role;
//    @Autowired
//    private DBStorage dbStorage;
//    @Autowired
//    private DBExtract dbExtract;
//    @Autowired
//    private RenewSignDataFilter signDataFilter;
//
//    String yesterday;
//    String daybefore;
//    @Override
//    public void execute(JobExecutionContext context)
//            throws JobExecutionException {
//        try{
//            SpringBeanAutowiringSupport.processInjectionBasedOnCurrentContext(this);
//            //初始化参数
//            JobDataMap map = context.getJobDetail().getJobDataMap();
//            wlyyQuota = (WlyyQuotaVO) map.get("quota");
//            wlyyJobConfig = (WlyyJobConfigVO) map.get("jobConfig");
//            daybefore= StringUtils.isEmpty(map.get("daybefore"))?SignJob.getDayString(-2):map.get("daybefore").toString();
//            yesterday= StringUtils.isEmpty(map.get("yesterday"))?SignJob.getDayString(-1):map.get("yesterday").toString();
//            //计算指标
//            computequota();
//        }catch (Exception e){
//            //如果出錯立即重新執行
//            JobExecutionException e2 =new JobExecutionException(e);
//            e2.setRefireImmediately(true);
//        }
//    }
//
//    /**
//     * 计算指标
//     */
//    @Transactional
//    private void computequota() {
//        try{
//            jdbcTemplate.execute("delete from wlyy_quota_result where quota_date='"+yesterday+"' and quato_code='"+47+"'");
//
//            //新建任务日志对象
//            QuartzJobLog quartzJobLog = new QuartzJobLog();
//            quartzJobLog.setJobStartTime(new Date());
//            quartzJobLog.setJobId(wlyyJobConfig.getId());
//            quartzJobLog.setJobName(wlyyJobConfig.getJobName());
//
//            String sql="select fr.sign_code code,fr.hospital,fr.admin_team_id,fr.renew_change_reason from wlyy_sign_family_renew_log fr where" +
//                    "   and fr.hospital!=fr.old_hospital " +
//                    "   and fr.apply_date<'"+yesterday+Constant.quota_date_last+"' " +
//                    "   and fr.sign_year ='"+Constant.getNowYearByDate(yesterday)+"'";
//            //抽取數據
//            List<SignFamilyRenew> signFamilies= dbExtract.extract(SignFamilyRenew.class,sql);
//            //清洗數據
//            FilterModel etlModels= signDataFilter.filter(signFamilies,"1",null,sql,yesterday);
//            //统计数据
//            List<Map<String, List<ETLModel>>>  returnDatas= levelRole.elt(etlModels.getEtlModelList());
//            //统计数据 二级维度
//            List<Map<String, Map<String, List<ETLModel>>>> level2Data= level2Role.elt(returnDatas);
//            //数据转换
//            dbStorage.saveByLevel2(level2Data,yesterday,wlyyQuota,6,9,1);
//            //保存日志
//            quartzJobLog.setJobEndTime(new Date());
//            quartzJobLog.setJobContent(JsonUtil.objToStr(etlModels.getLogModel()));
//            quartzJobLog.setJobType(etlModels.getError()?"1":"0");
//            quartzJobLogDao.save(quartzJobLog);
//        }catch (Exception e){
//            e.printStackTrace();
//        }
//    }
//
//
//}
package com.yihu.wlyy.statistics.job.business;
import com.yihu.wlyy.statistics.dao.QuartzJobLogDao;
import com.yihu.wlyy.statistics.etl.dataFilter.RenewSignDataFilter;
import com.yihu.wlyy.statistics.etl.extract.DBExtract;
import com.yihu.wlyy.statistics.etl.model.ETLModel;
import com.yihu.wlyy.statistics.etl.model.FilterModel;
import com.yihu.wlyy.statistics.etl.role.Level1Role;
import com.yihu.wlyy.statistics.etl.role.Level2Role;
import com.yihu.wlyy.statistics.etl.storage.DBStorage;
import com.yihu.wlyy.statistics.model.job.QuartzJobLog;
import com.yihu.wlyy.statistics.model.signfamily.SignFamilyRenew;
import com.yihu.wlyy.statistics.util.JsonUtil;
import com.yihu.wlyy.statistics.vo.WlyyJobConfigVO;
import com.yihu.wlyy.statistics.vo.WlyyQuotaVO;
import org.quartz.*;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Scope;
import org.springframework.jdbc.core.JdbcTemplate;
import org.springframework.stereotype.Component;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.StringUtils;
import org.springframework.web.context.support.SpringBeanAutowiringSupport;
import java.util.Date;
import java.util.List;
import java.util.Map;
/**
 * 续签签约原因的指标执行类
 */
@Component
@Scope("prototype")
@DisallowConcurrentExecution//防止到了执行时间点前一任务还在执行中，但是这时有空闲的线程，那么马上又会执行，这样一来就会存在同一job被并行执行
public class RenewSignOrgReasonJob implements Job {
    private WlyyQuotaVO wlyyQuota;//指标对象
    private WlyyJobConfigVO wlyyJobConfig;//配置对象
    @Autowired
    private QuartzJobLogDao quartzJobLogDao;//执行日志Dao
    @Autowired
    private JdbcTemplate jdbcTemplate;
    @Autowired
    private Level1Role levelRole;
    @Autowired
    private Level2Role level2Role;
    @Autowired
    private DBStorage dbStorage;
    @Autowired
    private DBExtract dbExtract;
    @Autowired
    private RenewSignDataFilter signDataFilter;
    String yesterday;
    String daybefore;
    @Override
    public void execute(JobExecutionContext context)
            throws JobExecutionException {
        try{
            SpringBeanAutowiringSupport.processInjectionBasedOnCurrentContext(this);
            //初始化参数
            JobDataMap map = context.getJobDetail().getJobDataMap();
            wlyyQuota = (WlyyQuotaVO) map.get("quota");
            wlyyJobConfig = (WlyyJobConfigVO) map.get("jobConfig");
            daybefore= StringUtils.isEmpty(map.get("daybefore"))?SignJob.getDayString(-2):map.get("daybefore").toString();
            yesterday= StringUtils.isEmpty(map.get("yesterday"))?SignJob.getDayString(-1):map.get("yesterday").toString();
            //计算指标
            computequota();
        }catch (Exception e){
            //如果出錯立即重新執行
            JobExecutionException e2 =new JobExecutionException(e);
            e2.setRefireImmediately(true);
        }
    }
    /**
     * 计算指标
     */
    @Transactional
    private void computequota() {
        try{
            jdbcTemplate.execute("delete from wlyy_quota_result where quota_date='"+yesterday+"' and quato_code='"+47+"'");
            //新建任务日志对象
            QuartzJobLog quartzJobLog = new QuartzJobLog();
            quartzJobLog.setJobStartTime(new Date());
            quartzJobLog.setJobId(wlyyJobConfig.getId());
            quartzJobLog.setJobName(wlyyJobConfig.getJobName());
            String sql="select fr.sign_code code,fr.hospital,fr.admin_team_id,fr.renew_change_reason from wlyy_sign_family_renew_log fr where" +
                    "   and fr.hospital!=fr.old_hospital " +
                    "   and fr.apply_date<'"+yesterday+Constant.quota_date_last+"' " +
                    "   and fr.sign_year ='"+Constant.getNowYearByDate(yesterday)+"'";
            //抽取數據
            List<SignFamilyRenew> signFamilies= dbExtract.extract(SignFamilyRenew.class,sql);
            //清洗數據
            FilterModel etlModels= signDataFilter.filter(signFamilies,"1",null,sql,yesterday);
            //统计数据
            List<Map<String, List<ETLModel>>>  returnDatas= levelRole.elt(etlModels.getEtlModelList());
            //统计数据 二级维度
            List<Map<String, Map<String, List<ETLModel>>>> level2Data= level2Role.elt(returnDatas);
            //数据转换
            dbStorage.saveByLevel2(level2Data,yesterday,wlyyQuota,6,9,1);
            //保存日志
            quartzJobLog.setJobEndTime(new Date());
            quartzJobLog.setJobContent(JsonUtil.objToStr(etlModels.getLogModel()));
            quartzJobLog.setJobType(etlModels.getError()?"1":"0");
            quartzJobLogDao.save(quartzJobLog);
        }catch (Exception e){
            e.printStackTrace();
        }
    }
}

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

@@ -1,116 +1,116 @@
//package com.yihu.wlyy.statistics.job.business;
//
//import com.yihu.wlyy.statistics.dao.QuartzJobLogDao;
//import com.yihu.wlyy.statistics.etl.dataFilter.RenewSignDataFilter;
//import com.yihu.wlyy.statistics.etl.extract.DBExtract;
//import com.yihu.wlyy.statistics.etl.model.ETLModel;
//import com.yihu.wlyy.statistics.etl.model.FilterModel;
//import com.yihu.wlyy.statistics.etl.role.Level1Role;
//import com.yihu.wlyy.statistics.etl.role.Level2Role;
//import com.yihu.wlyy.statistics.etl.storage.DBStorage;
//import com.yihu.wlyy.statistics.model.job.QuartzJobLog;
//import com.yihu.wlyy.statistics.model.signfamily.SignFamilyRenew;
//import com.yihu.wlyy.statistics.util.JsonUtil;
//import com.yihu.wlyy.statistics.vo.WlyyJobConfigVO;
//import com.yihu.wlyy.statistics.vo.WlyyQuotaVO;
//import org.quartz.*;
//import org.springframework.beans.factory.annotation.Autowired;
//import org.springframework.context.annotation.Scope;
//import org.springframework.jdbc.core.JdbcTemplate;
//import org.springframework.stereotype.Component;
//import org.springframework.transaction.annotation.Transactional;
//import org.springframework.util.StringUtils;
//import org.springframework.web.context.support.SpringBeanAutowiringSupport;
//
//import java.util.Date;
//import java.util.List;
//import java.util.Map;
//
///**
// * 续签区签约原因的指标执行类
// */
//@Component
//@Scope("prototype")
//@DisallowConcurrentExecution//防止到了执行时间点前一任务还在执行中，但是这时有空闲的线程，那么马上又会执行，这样一来就会存在同一job被并行执行
//public class RenewSignTownReasonJob implements Job {
//    private WlyyQuotaVO wlyyQuota;//指标对象
//    private WlyyJobConfigVO wlyyJobConfig;//配置对象
//    @Autowired
//    private QuartzJobLogDao quartzJobLogDao;//执行日志Dao
//    @Autowired
//    private JdbcTemplate jdbcTemplate;
//    @Autowired
//    private Level1Role levelRole;
//    @Autowired
//    private Level2Role level2Role;
//    @Autowired
//    private DBStorage dbStorage;
//    @Autowired
//    private DBExtract dbExtract;
//    @Autowired
//    private RenewSignDataFilter signDataFilter;
//
//    String yesterday;
//    String daybefore;
//    @Override
//    public void execute(JobExecutionContext context)
//            throws JobExecutionException {
//        try{
//            SpringBeanAutowiringSupport.processInjectionBasedOnCurrentContext(this);
//            //初始化参数
//            JobDataMap map = context.getJobDetail().getJobDataMap();
//            wlyyQuota = (WlyyQuotaVO) map.get("quota");
//            wlyyJobConfig = (WlyyJobConfigVO) map.get("jobConfig");
//            daybefore= StringUtils.isEmpty(map.get("daybefore"))?SignJob.getDayString(-2):map.get("daybefore").toString();
//            yesterday= StringUtils.isEmpty(map.get("yesterday"))?SignJob.getDayString(-1):map.get("yesterday").toString();
//            //计算指标
//            computequota();
//        }catch (Exception e){
//            //如果出錯立即重新執行
//            JobExecutionException e2 =new JobExecutionException(e);
//            e2.setRefireImmediately(true);
//        }
//    }
//
//    /**
//     * 计算指标
//     */
//    @Transactional
//    private void computequota() {
//        try{
//            jdbcTemplate.execute("delete from wlyy_quota_result where quota_date='"+yesterday+"' and quato_code='"+48+"'");
//
//            //新建任务日志对象
//            QuartzJobLog quartzJobLog = new QuartzJobLog();
//            quartzJobLog.setJobStartTime(new Date());
//            quartzJobLog.setJobId(wlyyJobConfig.getId());
//            quartzJobLog.setJobName(wlyyJobConfig.getJobName());
//
//            String sql="select fr.sign_code code,fr.hospital,fr.admin_team_id,fr.renew_change_reason from wlyy_sign_family_renew_log fr where" +
//                    "  LEFT(fr.hospital,6)!=LEFT(fr.old_hospital,6) " +
//                    "  and fr.apply_date<'"+yesterday+Constant.quota_date_last+"' " +
//                    "  and fr.sign_year ='"+Constant.getNowYearByDate(yesterday)+"'"+
//                    "  and LENGTH(fr.hospital)=10 " +
//                    "  and LENGTH(fr.old_hospital)=10 ";
//            //抽取數據
//            List<SignFamilyRenew> signFamilies= dbExtract.extract(SignFamilyRenew.class,sql);
//            //清洗數據
//            FilterModel etlModels= signDataFilter.filter(signFamilies,"1",null,sql,yesterday);
//            //统计数据
//            List<Map<String, List<ETLModel>>>  returnDatas= levelRole.elt(etlModels.getEtlModelList());
//            //统计数据 二级维度
//            List<Map<String, Map<String, List<ETLModel>>>> level2Data= level2Role.elt(returnDatas);
//            //数据转换
//            dbStorage.saveByLevel2(level2Data,yesterday,wlyyQuota,6,9,1);
//            //保存日志
//            quartzJobLog.setJobEndTime(new Date());
//            quartzJobLog.setJobContent(JsonUtil.objToStr(etlModels.getLogModel()));
//            quartzJobLog.setJobType(etlModels.getError()?"1":"0");
//            quartzJobLogDao.save(quartzJobLog);
//        }catch (Exception e){
//            e.printStackTrace();
//        }
//    }
//
//
//}
package com.yihu.wlyy.statistics.job.business;
import com.yihu.wlyy.statistics.dao.QuartzJobLogDao;
import com.yihu.wlyy.statistics.etl.dataFilter.RenewSignDataFilter;
import com.yihu.wlyy.statistics.etl.extract.DBExtract;
import com.yihu.wlyy.statistics.etl.model.ETLModel;
import com.yihu.wlyy.statistics.etl.model.FilterModel;
import com.yihu.wlyy.statistics.etl.role.Level1Role;
import com.yihu.wlyy.statistics.etl.role.Level2Role;
import com.yihu.wlyy.statistics.etl.storage.DBStorage;
import com.yihu.wlyy.statistics.model.job.QuartzJobLog;
import com.yihu.wlyy.statistics.model.signfamily.SignFamilyRenew;
import com.yihu.wlyy.statistics.util.JsonUtil;
import com.yihu.wlyy.statistics.vo.WlyyJobConfigVO;
import com.yihu.wlyy.statistics.vo.WlyyQuotaVO;
import org.quartz.*;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Scope;
import org.springframework.jdbc.core.JdbcTemplate;
import org.springframework.stereotype.Component;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.StringUtils;
import org.springframework.web.context.support.SpringBeanAutowiringSupport;
import java.util.Date;
import java.util.List;
import java.util.Map;
/**
 * 续签区签约原因的指标执行类
 */
@Component
@Scope("prototype")
@DisallowConcurrentExecution//防止到了执行时间点前一任务还在执行中，但是这时有空闲的线程，那么马上又会执行，这样一来就会存在同一job被并行执行
public class RenewSignTownReasonJob implements Job {
    private WlyyQuotaVO wlyyQuota;//指标对象
    private WlyyJobConfigVO wlyyJobConfig;//配置对象
    @Autowired
    private QuartzJobLogDao quartzJobLogDao;//执行日志Dao
    @Autowired
    private JdbcTemplate jdbcTemplate;
    @Autowired
    private Level1Role levelRole;
    @Autowired
    private Level2Role level2Role;
    @Autowired
    private DBStorage dbStorage;
    @Autowired
    private DBExtract dbExtract;
    @Autowired
    private RenewSignDataFilter signDataFilter;
    String yesterday;
    String daybefore;
    @Override
    public void execute(JobExecutionContext context)
            throws JobExecutionException {
        try{
            SpringBeanAutowiringSupport.processInjectionBasedOnCurrentContext(this);
            //初始化参数
            JobDataMap map = context.getJobDetail().getJobDataMap();
            wlyyQuota = (WlyyQuotaVO) map.get("quota");
            wlyyJobConfig = (WlyyJobConfigVO) map.get("jobConfig");
            daybefore= StringUtils.isEmpty(map.get("daybefore"))?SignJob.getDayString(-2):map.get("daybefore").toString();
            yesterday= StringUtils.isEmpty(map.get("yesterday"))?SignJob.getDayString(-1):map.get("yesterday").toString();
            //计算指标
            computequota();
        }catch (Exception e){
            //如果出錯立即重新執行
            JobExecutionException e2 =new JobExecutionException(e);
            e2.setRefireImmediately(true);
        }
    }
    /**
     * 计算指标
     */
    @Transactional
    private void computequota() {
        try{
            jdbcTemplate.execute("delete from wlyy_quota_result where quota_date='"+yesterday+"' and quato_code='"+48+"'");
            //新建任务日志对象
            QuartzJobLog quartzJobLog = new QuartzJobLog();
            quartzJobLog.setJobStartTime(new Date());
            quartzJobLog.setJobId(wlyyJobConfig.getId());
            quartzJobLog.setJobName(wlyyJobConfig.getJobName());
            String sql="select fr.sign_code code,fr.hospital,fr.admin_team_id,fr.renew_change_reason from wlyy_sign_family_renew_log fr where" +
                    "  LEFT(fr.hospital,6)!=LEFT(fr.old_hospital,6) " +
                    "  and fr.apply_date<'"+yesterday+Constant.quota_date_last+"' " +
                    "  and fr.sign_year ='"+Constant.getNowYearByDate(yesterday)+"'"+
                    "  and LENGTH(fr.hospital)=10 " +
                    "  and LENGTH(fr.old_hospital)=10 ";
            //抽取數據
            List<SignFamilyRenew> signFamilies= dbExtract.extract(SignFamilyRenew.class,sql);
            //清洗數據
            FilterModel etlModels= signDataFilter.filter(signFamilies,"1",null,sql,yesterday);
            //统计数据
            List<Map<String, List<ETLModel>>>  returnDatas= levelRole.elt(etlModels.getEtlModelList());
            //统计数据 二级维度
            List<Map<String, Map<String, List<ETLModel>>>> level2Data= level2Role.elt(returnDatas);
            //数据转换
            dbStorage.saveByLevel2(level2Data,yesterday,wlyyQuota,6,9,1);
            //保存日志
            quartzJobLog.setJobEndTime(new Date());
            quartzJobLog.setJobContent(JsonUtil.objToStr(etlModels.getLogModel()));
            quartzJobLog.setJobType(etlModels.getError()?"1":"0");
            quartzJobLogDao.save(quartzJobLog);
        }catch (Exception e){
            e.printStackTrace();
        }
    }
}

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

@@ -2514,7 +2514,7 @@ public class StatisticsAllService extends BaseService {
                map.put("weChatAmount0", expenseStatus0amountNum);//微信关注未交费数
                map.put("weChatAmount1", expenseStatus1amountNum);//微信关注已交费数
                map.put("signAccount", expenseStatus1SigjnNum);//签约已缴费的数目
                map.put("bindDoubleRate", getRangeDouuble(expenseStatus1amountNum, expenseStatus1SigjnNum, 2));//微信关注率
                map.put("bindRate", getRangeDouuble(expenseStatus1amountNum, expenseStatus1SigjnNum, 2));//微信关注率
            }
@@ -2525,9 +2525,9 @@ public class StatisticsAllService extends BaseService {
            resultList.sort(new Comparator<Map<String, Object>>() {
                @Override
                public int compare(Map<String, Object> o1, Map<String, Object> o2) {
                    if ((double) o1.get("bindDoubleRate") >= (double) o2.get("bindDoubleRate")) {
                    if ((double) o1.get("bindRate") >= (double) o2.get("bindRate")) {
                        return -1;
                    } else if ((double) o1.get("bindDoubleRate") < (double) o2.get("bindDoubleRate")) {
                    } else if ((double) o1.get("bindRate") < (double) o2.get("bindRate")) {
                        return 1;
                    } else {
                        return 0;

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

@@ -4092,15 +4092,16 @@ public class StatisticsService extends BaseService {
        int changeTeam = getLevel1NumForRedis("31", level, code, timeKey);//夸团队的数目
        int changeHospital = getLevel1NumForRedis("32", level, code, timeKey);//夸社区的数目
        int changeTown = getLevel1NumForRedis("33", level, code, timeKey);//夸社区的数目
        int allChangeCount=changeTeam+changeHospital+changeTown; //跨团队，跨社区 跨区的分母
        jo.put("inNum", inNum);//今年的签入量
        jo.put("outNum", outNum);//今年的签出量
        jo.put("thisYearSwithch", switchNum);//今年的转签量
        jo.put("switchHealth", switchJO);//今年的服务分布
        String changeTeamNum=getRangeNoLast(changeTeam, switchNum, 2);//跨团队转签率
        String changeHospNum=getRangeNoLast(changeHospital, switchNum, 2);//跨社区转签率
        String changeTeamNum=getRangeNoLast(changeTeam, allChangeCount, 2);//跨团队转签率
        String changeHospNum=getRangeNoLast(changeHospital, allChangeCount, 2);//跨社区转签率
        String changeTownNum="";
        if(changeTown==0){
            changeTownNum="0";
        }else{

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

@@ -1443,7 +1443,7 @@ public class StatisticsController extends BaseController {
                //社区的转签人数
                switchIndex = "35";
                //社区的转签原因
                switchIndexReson = "30";
                switchIndexReson = "47";
                //社区的签入
                signIn = "38";
                //社区的签出
@@ -1452,7 +1452,7 @@ public class StatisticsController extends BaseController {
                //区和市的转签人数
                switchIndex = "35";
                //区和市的转签原因
                switchIndexReson = "30";
                switchIndexReson = "48";
                //区和市的签入
                signIn = "40";
                //区和市的签出