Merge branch 'dev_20200908_PEP_Statistics' into dev

yd-api/src/main/java/com/yd/api/practitioner/service/impl/ScheduleTrackServiceImpl.java

@@ -542,22 +542,22 @@ public class ScheduleTrackServiceImpl implements ScheduleTrackService {
         if (Integer.valueOf(1).equals(s.getTaskRoutineAtweek1())) {
             count += CommonUtil.weekDayCount(firstDay, lastDay, 1);
         }
-        if (Integer.valueOf(2).equals(s.getTaskRoutineAtweek1())) {
+        if (Integer.valueOf(1).equals(s.getTaskRoutineAtweek2())) {
             count += CommonUtil.weekDayCount(firstDay, lastDay, 2);
         }
-        if (Integer.valueOf(3).equals(s.getTaskRoutineAtweek1())) {
+        if (Integer.valueOf(1).equals(s.getTaskRoutineAtweek3())) {
             count += CommonUtil.weekDayCount(firstDay, lastDay, 3);
         }
-        if (Integer.valueOf(4).equals(s.getTaskRoutineAtweek1())) {
+        if (Integer.valueOf(1).equals(s.getTaskRoutineAtweek4())) {
             count += CommonUtil.weekDayCount(firstDay, lastDay, 4);
         }
-        if (Integer.valueOf(5).equals(s.getTaskRoutineAtweek1())) {
+        if (Integer.valueOf(1).equals(s.getTaskRoutineAtweek5())) {
             count += CommonUtil.weekDayCount(firstDay, lastDay, 5);
         }
-        if (Integer.valueOf(6).equals(s.getTaskRoutineAtweek1())) {
+        if (Integer.valueOf(1).equals(s.getTaskRoutineAtweek6())) {
             count += CommonUtil.weekDayCount(firstDay, lastDay, 6);
         }
-        if (Integer.valueOf(7).equals(s.getTaskRoutineAtweek1())) {
+        if (Integer.valueOf(1).equals(s.getTaskRoutineAtweek7())) {
             count += CommonUtil.weekDayCount(firstDay, lastDay, 7);
         }
         // 判断trackTime是否在时间范围内