新疆新需求

health-emergency/health-emergency-api/src/main/java/com/renkang/emergency/entity/EmergencySchedulesItem.java

@@ -31,4 +31,7 @@ public class EmergencySchedulesItem {
 
     @Schema(title = "人员姓名")
     private String userName;
+
+    @Schema(title = "排序")
+    private Integer sort;
 }

health-emergency/health-emergency-api/src/main/java/com/renkang/emergency/entity/vo/WeekDataVO.java

@@ -7,6 +7,7 @@ import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import org.springframework.format.annotation.DateTimeFormat;
 
+import java.util.Comparator;
 import java.util.Date;
 import java.util.List;
 import java.util.stream.Collectors;
@@ -29,10 +30,16 @@ public class WeekDataVO {
     private List<EmergencySchedulesItem> professionalUserList;
 
     public List<EmergencySchedulesItem> getOperationUserList(List<EmergencySchedulesItem> itemList) {
-        return itemList.stream().filter(item -> "0".equals(item.getUserType())).collect(Collectors.toList());
+        return itemList.stream()
+                .filter(item -> "0".equals(item.getUserType()))
+                .sorted(Comparator.comparing(EmergencySchedulesItem::getSort)) // 根据 sort 字段升序排序
+                .collect(Collectors.toList());
     }
 
     public List<EmergencySchedulesItem> getProfessionalUserList(List<EmergencySchedulesItem> itemList) {
-        return itemList.stream().filter(item -> "1".equals(item.getUserType())).collect(Collectors.toList());
+        return itemList.stream()
+                .filter(item -> "1".equals(item.getUserType()))
+                .sorted(Comparator.comparing(EmergencySchedulesItem::getSort)) // 根据 sort 字段升序排序
+                .collect(Collectors.toList());
     }
 }