diff --git a/virtual-patient-model/src/main/java/com/supervision/model/ConfigAncillaryItem.java b/virtual-patient-model/src/main/java/com/supervision/model/ConfigAncillaryItem.java index 730c9041..4f3089c9 100644 --- a/virtual-patient-model/src/main/java/com/supervision/model/ConfigAncillaryItem.java +++ b/virtual-patient-model/src/main/java/com/supervision/model/ConfigAncillaryItem.java @@ -80,6 +80,13 @@ public class ConfigAncillaryItem implements Serializable { @TableField(typeHandler = StringListTypeHandler.class) private List callOutQuestion; + @ApiModelProperty("检查类型排序") + private Integer typePriority; + + @ApiModelProperty("item排序") + private Integer itemPriority; + + /** * 创建人ID */ diff --git a/virtual-patient-model/src/main/java/com/supervision/service/impl/ConfigAncillaryItemServiceImpl.java b/virtual-patient-model/src/main/java/com/supervision/service/impl/ConfigAncillaryItemServiceImpl.java index fceadbe4..3ad3f609 100644 --- a/virtual-patient-model/src/main/java/com/supervision/service/impl/ConfigAncillaryItemServiceImpl.java +++ b/virtual-patient-model/src/main/java/com/supervision/service/impl/ConfigAncillaryItemServiceImpl.java @@ -16,10 +16,7 @@ import com.supervision.vo.result.ConfigAncillaryItemVo; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; +import java.util.*; import java.util.stream.Collectors; /** @@ -62,7 +59,9 @@ public class ConfigAncillaryItemServiceImpl extends ServiceImpl list = this.queryVoList(ancillaryItemReqVo); return list.stream().collect(Collectors.groupingBy(ConfigAncillaryItem::getType)).entrySet().stream(). - map(ConfigAncillaryItemServiceImpl::getConfigAncillaryItemResVO).collect(Collectors.toList()); + map(ConfigAncillaryItemServiceImpl::getConfigAncillaryItemResVO) + .sorted(Comparator.comparingInt(ConfigAncillaryItemResVO::getPriority)) + .collect(Collectors.toList()); } private static ConfigAncillaryItemResVO getConfigAncillaryItemResVO(Map.Entry> e) { @@ -72,9 +71,17 @@ public class ConfigAncillaryItemServiceImpl extends ServiceImpl itemVoListSorted = item.getItemList().stream().peek(itemVo -> { + if (null == itemVo.getItemPriority()) { + itemVo.setItemPriority(9999); + } + itemVo.setItemIdPath(CollUtil.newArrayList(item.getId(),itemVo.getId())); + }) + .sorted(Comparator.comparingInt(ConfigAncillaryItem::getItemPriority)).collect(Collectors.toList()); + item.setItemList(itemVoListSorted); } return item; } diff --git a/virtual-patient-model/src/main/java/com/supervision/vo/ask/ConfigAncillaryItemResVO.java b/virtual-patient-model/src/main/java/com/supervision/vo/ask/ConfigAncillaryItemResVO.java index 3dee8c80..2c6f7e34 100644 --- a/virtual-patient-model/src/main/java/com/supervision/vo/ask/ConfigAncillaryItemResVO.java +++ b/virtual-patient-model/src/main/java/com/supervision/vo/ask/ConfigAncillaryItemResVO.java @@ -20,6 +20,8 @@ public class ConfigAncillaryItemResVO { @ApiModelProperty("标识 true:已选择 false:未选择") private boolean flag; + private int priority; + private List itemList; @ApiModelProperty("检查项id路径") diff --git a/virtual-patient-model/src/main/resources/mapper/ConfigAncillaryItemMapper.xml b/virtual-patient-model/src/main/resources/mapper/ConfigAncillaryItemMapper.xml index 6ed491c4..5c109270 100644 --- a/virtual-patient-model/src/main/resources/mapper/ConfigAncillaryItemMapper.xml +++ b/virtual-patient-model/src/main/resources/mapper/ConfigAncillaryItemMapper.xml @@ -14,6 +14,8 @@ + + @@ -23,7 +25,7 @@ id ,type,item_class,item_name,location_name, - info,create_user_id,create_time, + info,call_out_question,type_priority,item_priority,create_user_id,create_time, update_user_id,update_time