统计bug修改

patient-co-statistics/src/main/java/com/yihu/wlyy/statistics/controller/JobController.java

@@ -81,7 +81,25 @@ public class JobController extends BaseController {
            return invalidUserException(e, -1, "启动失败:" + e.getMessage());
        }
    }
    /**
     * 生成过去某一天到某一天的全部的数据
     *
     * @param start
     * @param end
     * @return
     */
    @ApiOperation(value = "生成过去某一天到某一天的全部的数据")
    @RequestMapping(value = "productDataByDayToDay", method = RequestMethod.GET)
    public String productDataByDayToDay( @ApiParam(name = "day", value = "yyyy-MM-dd")@RequestParam(value = "start", required = true)String start,
                                         @ApiParam(name = "day", value = "yyyy-MM-dd")@RequestParam(value = "end", required = true)String end) {
        try {
            jobService.productDataByDayToDay(start,end);
            return success("启动成功！");
        } catch (Exception e) {
            error(e);
            return invalidUserException(e, -1, "启动失败:" + e.getMessage());
        }
    }
    /**
     * 生成过去某一天的某一个指标的数据
     *

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

@@ -136,11 +136,11 @@ public class AllSignExpenseStatusJob implements Job{
        List<ETLModel> etlModels = new ArrayList<ETLModel>();
        List<SignFamily> signFamilys =null;
        while (true){
            String sql=" select id,code,idcard,hospital,admin_team_code,expenses_status from wlyy_sign_family a where  a.type =2 and a.status >= 1  and  a.apply_date<= '"+dateTemp+"' limit "+start+","+pageSize ;
            String sql=" select id,code,idcard,hospital,admin_team_code,expenses_status from wlyy_sign_family a where  a.type =2 and a.status >= 1  and  a.apply_date< '"+dateTemp+"' limit "+start+","+pageSize ;
            signFamilys = jdbcTemplate.query(sql,new BeanPropertyRowMapper(SignFamily .class));  // signFamilyDao.findByJiatingSignYesterday(dateTemp);
            int i=0;
            //数据过滤清洗出脏数据  -----------start
            for (SignFamily signFamily : signFamilys) {
            for (SignFamily signFamily:signFamilys) {
                allsize++;
                ETLModel etlModel = new ETLModel();
                String orgCode = signFamily.getHospital();
@@ -213,9 +213,10 @@ public class AllSignExpenseStatusJob implements Job{
                townCount++;
                orgCount++;
                adminCount++;
                i++;
            }
            if(signFamilys.size()!=pageSize){
                lastSize=signFamilys.size();
            lastSize=signFamilys.size();
            if(signFamilys.size()!=pageSize&&i==lastSize){
                signFamilys.clear();
                break;
            }else{
@@ -224,7 +225,6 @@ public class AllSignExpenseStatusJob implements Job{
                signFamilys.clear();
            }
        }
        List<WlyyQuotaResult> returnData=null;
        //数据过滤清洗出脏数据  -----------end
        try {
            //统计数据
@@ -259,7 +259,7 @@ public class AllSignExpenseStatusJob implements Job{
        string.append(",统计到团队的数据总数:" + qkCount);
        string.append("，是否统计成功:" + isAll);
        if (!isAll) {
           // string.append(",失败原因:" + errorContent);
            string.append(",失败原因:" + errorContent);
        }
        return string.toString();
    }

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

@@ -119,9 +119,10 @@ public class AllSignJob implements Job {
        List<ETLModel> etlModels = new ArrayList<ETLModel>();
        List<SignFamily> signFamilys =null;
        while (true){
            String sql=" select id,code,idcard,hospital,admin_team_code,expenses_status from wlyy_sign_family a where  a.type =2 and a.status >= 1  and expenses_status=1 and a.apply_date<= '"+dateTemp+"' limit "+start+","+pageSize ;
            String sql=" select id,code,idcard,hospital,admin_team_code,expenses_status from wlyy_sign_family a where  a.type =2 and a.status >= 1  and expenses_status=1 and a.apply_date< '"+dateTemp+"' limit "+start+","+pageSize ;
            signFamilys = jdbcTemplate.query(sql,new BeanPropertyRowMapper(SignFamily .class));  // signFamilyDao.findByJiatingSignYesterday(dateTemp);
            //数据过滤清洗出脏数据  -----------start
            int i=0;
            for (SignFamily signFamily : signFamilys) {
                allsize++;
                ETLModel etlModel = new ETLModel();
@@ -196,8 +197,8 @@ public class AllSignJob implements Job {
                orgCount++;
                adminCount++;
            }
            if(signFamilys.size()!=pageSize){
                lastSize=signFamilys.size();
            lastSize=signFamilys.size();
            if(signFamilys.size()!=pageSize&&i==lastSize){
                signFamilys.clear();
                break;
            }else{
@@ -238,7 +239,7 @@ public class AllSignJob implements Job {
        string.append(",统计到团队的数据总数:"+qkCount);
        string.append("，是否统计成功:"+isAll);
        if(!isAll){
          //  string.append(",失败原因:"+errorContent);
           string.append(",失败原因:"+errorContent);
        }
        return string.toString();
    }

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

@@ -53,14 +53,6 @@ public class CurrentDayAllQuotaJob implements Job {
    @Autowired
    private StringRedisTemplate redisTemplate;
    @Autowired
    private ConsultTeamDao consultTeamDao;
    @Autowired
    private PatientHealthGuidanceDao patientHealthGuidanceDao;
    @Autowired
    private DoctorPatientGroupInfoDao doctorPatientGroupInfoDao;
    @Autowired
    private PatientDao patientDao;
    @Autowired
    private QuartzJobLogDao quartzJobLogDao;//执行日志Dao
    @Autowired
    private DoctorAdminTeamDao doctorAdminTeamDao;
@@ -76,11 +68,12 @@ public class CurrentDayAllQuotaJob implements Job {
    private RedisStorage redisStorage;
    @Autowired
    private SignPatientLabelInfoDao signPatientLabelInfoDao;
    @Autowired
    private JdbcTemplate jdbcTemplate ;
    private org.apache.tomcat.jdbc.pool.DataSource fvdataSource = new org.apache.tomcat.jdbc.pool.DataSource();//随访数据源
    private JdbcTemplate jdbcTemplate = new JdbcTemplate();
    private JdbcTemplate fv_jdbcTemplate = new JdbcTemplate();
    List<Town> towns = null;//厦门市全部的区
    List<Hospital> hospitals = null;//系统全部的机构
@@ -113,7 +106,7 @@ public class CurrentDayAllQuotaJob implements Job {
            fvdataSource.setUsername(fv_jdbc_username);
            fvdataSource.setPassword(fv_jdbc_password);
            jdbcTemplate.setDataSource(fvdataSource);//初始化随访的数据源
            fv_jdbcTemplate.setDataSource(fvdataSource);//初始化随访的数据源
            towns = townDao.findByCityCode(Constant.city); //查找出厦门市全部的区
            hospitals = hospitalDao.findHospitalzxFWZ(); //查找出系统全部的机构
            adminTeams=doctorAdminTeamDao.findAllTeam();//查找出系统全部的全科医生
@@ -133,6 +126,7 @@ public class CurrentDayAllQuotaJob implements Job {
            //如果出錯立即重新執行
            JobExecutionException e2 =new JobExecutionException(e);
            e2.setRefireImmediately(true);
            e.printStackTrace();
        }
    }
@@ -1248,7 +1242,7 @@ public class CurrentDayAllQuotaJob implements Job {
         errorContent=new StringBuffer();
        String quotaId="5";
        String sql="SELECT a FROM wlyy_patient_health_guidance a WHERE a.czrq>='"+now+"' and a.czrq< '"+tomorrow+"'";
        String sql="SELECT * FROM wlyy_patient_health_guidance a WHERE a.czrq>='"+now+"' and a.czrq< '"+tomorrow+"'";
        List<PatientHealthGuidance> patientHealthGuidances = jdbcTemplate.query(sql,new BeanPropertyRowMapper(PatientHealthGuidance .class));
        Long cityCount = new Long(0L); //统计到市的数目
        Long townCount = new Long(0L); //统计到所有区的数目
@@ -1939,7 +1933,7 @@ public class CurrentDayAllQuotaJob implements Job {
    public List<Map<String,Object>> getFvYesterday() {
        String sql=" select * from fv_plan a where unix_timestamp(a.update_time)>=unix_timestamp('"+now+"') and unix_timestamp(a.update_time)< unix_timestamp('"+tomorrow+"')  ";
        return jdbcTemplate.queryForList(sql);
        return fv_jdbcTemplate.queryForList(sql);
    }
    /**

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

@@ -320,4 +320,8 @@ public class JobService {
            quartzHelper.removeJob(CheckSignJob.jobKey);
        }
    }
    public void productDataByDayToDay(String start, String end) {
    }
}