Merge branch 'dev_20200908_PEP_Statistics' into dev

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

@@ -124,12 +124,20 @@ public class ScheduleTrackServiceImpl implements ScheduleTrackService {
         }
         }
         // 检查时间段是否冲突
         // 检查时间段是否冲突
         boolean isConflict = false;
         boolean isConflict = false;
+        String staskTimeFrom;
+        String staskTimeEnd;
+        Long spractitionerId;
+        Long smdDropOptionId;
         for (ScheduleTrack schedule: showList) {
         for (ScheduleTrack schedule: showList) {
-            if (taskTimeFrom.equals(schedule.getTaskTimeFrom())
-                    && taskTimeEnd.equals(schedule.getTaskTimeEnd())
-                    && trackTime.equals(CommonUtil.dateParseString(schedule.getTrackTime(), "yyyy-MM-dd"))
-                    && practitionerId.equals(schedule.getPractitionerId())
-                    && mdDropOptionId.equals(schedule.getMdDropOptionId())
+
+            staskTimeFrom = schedule.getTaskTimeFrom();
+            staskTimeEnd = schedule.getTaskTimeEnd();
+            spractitionerId = schedule.getPractitionerId();
+            smdDropOptionId = schedule.getMdDropOptionId();
+            if (taskTimeFrom.equals(staskTimeFrom)
+                    && taskTimeEnd.equals(staskTimeEnd)
+                    && practitionerId.equals(spractitionerId)
+                    && mdDropOptionId.equals(smdDropOptionId)
             ) {
             ) {
                 isConflict = true;
                 isConflict = true;
             }
             }