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

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

@@ -238,7 +238,7 @@ public class CurrentDayAllQuotaJob implements Job {
            etlModel.setHospital(orgCodeTemp);
            etlModel.setTown(hospital.getTown());
            etlModel.setCity(Constant.city);
            etlModel.setSignExpensesStatus(signFamily.getExpensesStatus());
            etlModel.setLevel2Key(signFamily.getExpensesStatus());
            etlModel.setIdcard(signFamily.getIdcard());
            etlModels.add(etlModel);
            //统计数目+1
@@ -443,7 +443,7 @@ public class CurrentDayAllQuotaJob implements Job {
            etlModel.setHospital(orgCodeTemp);
            etlModel.setTown(hospital.getTown());
            etlModel.setCity(Constant.city);
            etlModel.setSignExpensesStatus(signFamily.getExpensesStatus());
            etlModel.setLevel2Key(signFamily.getExpensesStatus());
            etlModel.setIdcard(signFamily.getIdcard());
            etlModels.add(etlModel);
            //统计数目+1

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

@@ -331,7 +331,7 @@ public class JobService {
        }
        int day=daysBetween(startDate,endDate);
        for(int i=0;i<day;i++){
            productDataByOneDay(getYesterday(i,new Date()));
            productDataByOneDay(getYesterday(i,startDate));
        }
    }
    public static String getYesterday(Integer day,Date startDate) {
@@ -357,6 +357,7 @@ public class JobService {
    }
    public static void main(String[] args) {
        System.out.println(getYesterday(0,new Date()));
    }
    public void productDataByDayToDayAndId(String start, String end, String id) {