日程列表查询

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

@@ -24,6 +24,7 @@ import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
 
 
+import javax.xml.crypto.Data;
 import java.math.BigDecimal;
 import java.math.BigDecimal;
 import java.util.*;
 import java.util.*;
 
 
@@ -556,8 +557,12 @@ public class ScheduleTrackServiceImpl implements ScheduleTrackService {
             count += CommonUtil.weekDayCount(firstDay, lastDay, 7);
             count += CommonUtil.weekDayCount(firstDay, lastDay, 7);
         }
         }
         // 判断trackTime是否在时间范围内
         // 判断trackTime是否在时间范围内
-        Date trackTime= s.getTrackTime();
-        if (trackTime.compareTo(firstDay)>=0 && trackTime.compareTo(lastDay)<=0) {
+        Date trackTime = s.getTrackTime();
+        String trackTimeStr = CommonUtil.dateParseString(trackTime,"yyyy-MM-dd");
+        String firstDayStr = CommonUtil.dateParseString(firstDay,"yyyy-MM-dd");
+        String lastDayStr = CommonUtil.dateParseString(lastDay,"yyyy-MM-dd");
+
+        if (trackTimeStr.compareTo(firstDayStr)>=0 && trackTimeStr.compareTo(lastDayStr)<=0) {
             String week = CommonUtil.getWeekOfDate(trackTime);
             String week = CommonUtil.getWeekOfDate(trackTime);
             Integer flag = 0;
             Integer flag = 0;
             switch (week) {
             switch (week) {