Merge branch 'test'

family-doctor-server/src/main/java/com/ebaiyihui/family/doctor/server/service/impl/PatientServiceImpl.java

@@ -33,10 +33,7 @@ import org.springframework.util.CollectionUtils;
 import org.springframework.util.ObjectUtils;
 import org.springframework.util.StringUtils;
 
-import java.util.Date;
-import java.util.List;
-import java.util.Objects;
-import java.util.Random;
+import java.util.*;
 import java.util.stream.Collectors;
 
 /**
@@ -322,10 +319,10 @@ public class PatientServiceImpl implements PatientService {
         }
         // 查询排班医生信息
         List<ScheduleRecordEntity> scheduleRecordEntities = scheduleRecordMapper.selectByDate(String.valueOf(CommonConstants.ORGAN_CODE), 5, date, 1, hourAndSecond);
-        log.info("当前排班医生:{}", JSON.toJSONString(scheduleRecordEntities));
+        log.info("当前排班医生:{},传进来过滤的医生id={}", JSON.toJSONString(scheduleRecordEntities), doctorId);
 
         if (!CollectionUtils.isEmpty(scheduleRecordEntities)) {
-            scheduleRecordEntities.stream().filter(scheduleRecordEntity -> scheduleRecordEntity.getDoctorId().equals(doctorId)).collect(Collectors.toList());
+            scheduleRecordEntities = scheduleRecordEntities.stream().filter(scheduleRecordEntity -> !scheduleRecordEntity.getDoctorId().equals(String.valueOf(doctorId))).collect(Collectors.toList());
         }
 
         log.info("过滤之后的医生:{}", JSON.toJSONString(scheduleRecordEntities));
@@ -369,24 +366,4 @@ public class PatientServiceImpl implements PatientService {
         List<PatientSignEntity> patientSignEntities = patientSignMapper.selectList(psWrapper);
         return patientSignEntities;
     }
-
-    public static void main(String[] args) {
-        Date curDate = new Date();
-        Date signEndTime = DateUtils.getAfterDay(curDate, CommonConstants.DAY);
-        Date signStartTime = new Date();
-        try {
-
-            signEndTime = DateUtils.parseDate("2024-04-19 23:59:59", DateUtils.FULL_FORMAT);
-            signStartTime = DateUtils.parseDate("2024-03-19 10:29:47", DateUtils.FULL_FORMAT);
-
-            Date signCreateTime = DateUtils.parseDate("2024-04-01 17:48:32", DateUtils.FULL_FORMAT);
-            if (signCreateTime.after(signStartTime) && signCreateTime.before(signEndTime)) {
-                System.out.println("xxxxx");
-            }
-            System.out.println("wwwww");
-        } catch (Exception e) {
-
-        }
-
-    }
 }