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

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

@@ -922,7 +922,7 @@ public class CurrentDayAllQuotaJob implements Job {
        String quotaId = "2";
        try {
            //找出今天的解约信息
            String sql = " select id,code,idcard,hospital,admin_team_code,expenses_status from wlyy_sign_family a where  a.type =2 and a.status in(-3,-4) and  a.apply_unsign_date< '" + tomorrow + "' and a.apply_unsign_date >'"+Constant.getStartTimeByDate(tomorrow)+Constant.quota_date_last+"' ";
            String sql = " select id,code,idcard,hospital,admin_team_code,expenses_status from wlyy_sign_family a where  a.type =2 and a.status in(-3) and  a.apply_unsign_date< '" + tomorrow + "' and a.apply_unsign_date >'"+Constant.getStartTimeByDate(tomorrow)+Constant.quota_date_last+"' ";
            //抽取數據
            List<SignFamily> signFamilies = SpringUtil.getBean(DBExtract.class).extract(SignFamily.class, sql);
            //清洗數據

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

@@ -90,7 +90,7 @@ public class UnSignJob implements Job {
            //找出今天的解约信息
            String sql=" select code,idcard,hospital,admin_team_code from wlyy_sign_family a where " +
                    " a.type =2 and" +
                    " a.status in(-3,-4) and " +
                    " a.status in(-3) and " +
                    " a.apply_unsign_date< '"+yesterday+ Constant.quota_date_last+"' and "+
                    "  a.sign_year ='"+Constant.getNowYearByDate(yesterday)+"' " ;
            //抽取數據