Merge branch 'dev' of http://192.168.1.220:10080/Amoy/patient-co-management into dev

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

@@ -306,9 +306,19 @@ public class Constant {
        String startDateString = (1900 + today.getYear()) + "-07-01";
        Date startDate = simpleDateFormat.parse(startDateString);
        if (simpleDateFormat.parse(todayString).after(startDate)) {
            return (1900 + today.getYear()) + "-06-30";
            Integer year = (1900 + today.getYear());
            if (year == 2016) {
                return "2015-06-30";
            } else {
                return year+ "-06-30";
            }
        } else {
            return (1900 + today.getYear() - 1) + "-06-30";
            Integer year =  (1900 + today.getYear() - 1);
            if (year == 2016) {
                return "2015-06-30";
            } else {
                return year+ "-06-30";
            }
        }
    }
@@ -321,9 +331,19 @@ public class Constant {
        String startDateString = (1900 + today.getYear()) + "-07-01";
        Date startDate = simpleDateFormat.parse(startDateString);
        if (simpleDateFormat.parse(todayString).after(startDate)) {
            return (1900 + today.getYear()) + "";
            Integer year = (1900 + today.getYear());
            if (year == 2016) {
                return "2015-06-30";
            } else {
                return year+ "-06-30";
            }
        } else {
            return (1900 + today.getYear() - 1) + "";
            Integer year =  (1900 + today.getYear() - 1);
            if (year == 2016) {
                return "2015-06-30";
            } else {
                return year+ "-06-30";
            }
        }
    }

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

@@ -564,8 +564,7 @@ public class CurrentDayAllQuotaJob implements Job {
                    " AND sf.type = 2 " +
                    " AND sf. STATUS IN (1, 2) " +
                    " AND p.openid is not null  " +
                    " AND p.openid_time <'" + tomorrow + "' " +
                    " AND p.openid_time >'" + Constant.getStartTime() + "' ";
                    " AND p.openid_time <'" + tomorrow + "' " ;
            //抽取數據
            List<SignFamily> signFamilies = SpringUtil.getBean(DBExtract.class).extract(SignFamily.class, sql);
            //清洗數據
@@ -597,8 +596,7 @@ public class CurrentDayAllQuotaJob implements Job {
                    " AND sf.type = 2 " +
                    " AND pd.del=0 " +
                    " AND sf. STATUS IN (1, 2) " +
                    " AND pd.czrq <' " + tomorrow + "'" +
                    " AND pd.czrq >'"+Constant.getStartTime()+"' ";
                    " AND pd.czrq <' " + tomorrow + "'" ;
            //抽取數據
            List<SignFamily> signFamilies = SpringUtil.getBean(DBExtract.class).extract(SignFamily.class, sql);
            //清洗數據

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

@@ -98,8 +98,7 @@ public class PatientDeviceJob implements Job {
                    " AND sf.type = 2 " +
                    " AND pd.del=0 " +
                    " AND sf. STATUS IN (1, 2) " +
                    " AND pd.czrq <' "+yesterday+ Constant.quota_date_last+"'" +
                    " AND pd.czrq >'"+Constant.getStartTime()+"' ";
                    " AND pd.czrq <' "+yesterday+ Constant.quota_date_last+"'" ;
            //抽取數據
             List<SignFamily> signFamilies= dbExtract.extract(SignFamily.class,sql);
            //清洗數據

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

@@ -97,8 +97,7 @@ public class WechatCountJob implements Job {
                    " AND sf.type = 2 " +
                    " AND sf. STATUS IN (1, 2) " +
                    " AND p.openid is not null  " +
                    " AND p.openid_time <'" +yesterday+ Constant.quota_date_last+"'" +
                    " AND a.openid_time >'"+Constant.getStartTime()+"' ";
                    " AND p.openid_time <'" +yesterday+ Constant.quota_date_last+"'" ;
            //抽取數據
            List<SignFamily> signFamilies= dbExtract.extract(SignFamily.class,sql);