签约

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

@@ -1842,7 +1842,7 @@ public class StatisticsService extends BaseService {
            sql = "SELECT left(f.apply_date,10) as applyDate,count(1) as signCount " +
                    " FROM wlyy_sign_family f " +
                    " where f.apply_date >='" + startDate + " 00:00:00' " +
                    " AND f.apply_date<='" + endDate + " 00:00:00' " +
                    " AND f.apply_date<='" + endDate + " 23:59:59' " +
                    " AND f.status >0 " +
                    " AND f.expenses_status='1' " +
                    " AND f.admin_team_code=" + id +
@@ -1852,7 +1852,7 @@ public class StatisticsService extends BaseService {
            sql = "SELECT (DATE_FORMAT(f.apply_date,'%v')-DATE_FORMAT('" + DateUtil.getFristDayOfMonth() + "','%v')+1) as weekOfMonth,count(1) as signCount " +
                    " FROM wlyy_sign_family f " +
                    " where f.apply_date >='" + startDate + " 00:00:00' " +
                    " AND f.apply_date<='" + endDate + " 00:00:00' " +
                    " AND f.apply_date<='" + endDate + " 23:59:59' " +
                    " AND f.status >0 " +
                    " AND f.expenses_status='1' " +
                    " AND f.admin_team_code=" + id +
@@ -1883,24 +1883,30 @@ public class StatisticsService extends BaseService {
        String sql;
        //按周
        if ("0".equals(type)) {
            sql = "SELECT left(f.apply_date,10) as applyDate,count(1) as signCount " +
                    " FROM wlyy_sign_family_renew f " +
                    " where f.apply_date >='" + startDate + " 00:00:00' " +
                    " AND f.apply_date<='" + endDate + " 23:59:59' " +
                    " AND f.status >0 " +
                    " AND f.expenses_status='1' " +
                    " AND f.admin_team_code=" + id +
                    " GROUP BY left(f.apply_date,10)";
            sql = "SELECT " +
                    " LEFT (f.apply_date, 10) AS applyDate, " +
                    " count(1) AS signCount " +
                    " FROM " +
                    " wlyy_sign_family_renew_log f " +
                    " WHERE " +
                    " f.apply_date >= '"+startDate+"' " +
                    " AND f.apply_date <= '"+endDate+"' " +
                    " AND f.admin_team_id = " +id+
                    " GROUP BY " +
                    " LEFT (f.apply_date, 10)";
            //按月
        } else {
            sql = "SELECT (DATE_FORMAT(f.apply_date,'%v')-DATE_FORMAT('" + startDate + "','%v')+1) as weekOfMonth,count(1) as signCount " +
                    " FROM wlyy_sign_family_renew f " +
                    " where f.apply_date >='" + startDate + " 00:00:00' " +
                    " AND f.apply_date<='" + endDate + " 23:59:59' " +
                    " AND f.status >0 " +
                    " AND f.expenses_status='1' " +
                    " AND f.admin_team_code=" + id +
                    " GROUP BY DATE_FORMAT(f.apply_date,'%m %v')";
            sql = "SELECT " +
                    " (DATE_FORMAT(f.apply_date,'%v')-DATE_FORMAT('"+startDate+"','%v')+1) AS weekOfMonth, " +
                    " count(1) AS signCount " +
                    " FROM " +
                    " wlyy_sign_family_renew_log f " +
                    " WHERE " +
                    " f.apply_date >= '"+startDate+"' " +
                    " AND f.apply_date <= '"+endDate+"' " +
                    " AND f.admin_team_id = " +id+
                    " GROUP BY " +
                    " DATE_FORMAT(f.apply_date, '%m %v')";
        }
        List<Map<String, Object>> rs = jdbcTemplate.queryForList(sql);
@@ -2477,7 +2483,7 @@ public class StatisticsService extends BaseService {
                    " AND t. STATUS <> 10 " +
                    " AND t.`reply` = 0 " +
                    " AND p.session_id = t.session_id " +
                    " AND d.id ="+doctor +
                    " AND d.id ='"+doctor +"'"+
                    " AND c.admin_team_code = " +teamCode+
                    " AND t.create_time >= '"+startDate+"' " +
                    " AND t.create_time <= '"+endDate+"' " +
@@ -2496,7 +2502,7 @@ public class StatisticsService extends BaseService {
                    " AND c.consult = t.id " +
                    " AND c.patient = s.id " +
                    " AND p.session_id = t.session_id " +
                    " AND d.id ="+doctor +
                    " AND d.id ='"+doctor +"'"+
                    " AND c.admin_team_code = " +teamCode+
                    " AND t.create_time >= '"+startDate+"' " +
                    " AND t.create_time <= '"+endDate+"' " +
@@ -2518,7 +2524,7 @@ public class StatisticsService extends BaseService {
                    "  AND c.patient = s.id " +
                    "  AND p.session_id = t.session_id " +
                    "  AND c.admin_team_code = " +teamCode+
                    "  AND d.id ="+doctor +
                    "  AND d.id ='"+doctor +"'"+
                    "  AND t. STATUS <> 10  " +
                    "  AND t.`reply` = 0  " +
                    "  AND t.create_time >= '"+startDate+"' " +
@@ -2538,7 +2544,7 @@ public class StatisticsService extends BaseService {
                    "  AND c.consult = t.id " +
                    "  AND c.patient = s.id " +
                    "  AND p.session_id = t.session_id " +
                    "  AND d.id ="+doctor +
                    "  AND d.id ='"+doctor +"'"+
                    "  AND c.admin_team_code = " +teamCode+
                    "  AND t.create_time >= '"+startDate+"' " +
                    "  AND t.create_time <= '"+endDate+"' " +
@@ -2808,7 +2814,6 @@ public class StatisticsService extends BaseService {
                " AND c.consult = t.id " +
                " AND c.patient = s.id " +
                " AND p.session_id = t.session_id " +
                " AND s.business_type=2  " +
                " AND t.`reply`=1 " +
                " AND c.admin_team_code ="+teamCode+
                " AND d.id='"+doctor+"'" +