|
|
@@ -30,6 +30,7 @@ import org.springframework.stereotype.Component;
|
|
|
import java.util.ArrayList;
|
|
|
import java.util.List;
|
|
|
import java.util.Set;
|
|
|
+import java.util.TreeSet;
|
|
|
import java.util.stream.Collectors;
|
|
|
|
|
|
/**
|
|
|
@@ -163,7 +164,11 @@ public class ConceptFacade {
|
|
|
LisName lisName = lisNameList.get(0);
|
|
|
Set<LisNameLisSet> lisNameLisSetSet = lisName.getLisNamelissets();
|
|
|
if (lisNameLisSetSet != null && lisNameLisSetSet.size() > 0) {
|
|
|
- for (LisNameLisSet lisNameLisSet : lisNameLisSetSet) {
|
|
|
+ //升序排序
|
|
|
+ Set<LisNameLisSet> sortLisNameLisSetSet
|
|
|
+ = new TreeSet<LisNameLisSet>((o1, o2) -> o1.getLisSet().getName().compareTo(o2.getLisSet().getName()));
|
|
|
+ sortLisNameLisSetSet.addAll(lisNameLisSetSet);
|
|
|
+ for (LisNameLisSet lisNameLisSet : sortLisNameLisSetSet) {
|
|
|
if (lisNameLisSet.getLisSet().getIs_kl().equals(1)) {
|
|
|
retName.setName(lisNameLisSet.getLisSet().getName());
|
|
|
retName.setType(3);
|
|
|
@@ -179,7 +184,11 @@ public class ConceptFacade {
|
|
|
PacsSubName pacsSubName = pacsSubNameList.get(0);
|
|
|
Set<PacsNamePacsSubName> pacsNamePacsSubNameSet = pacsSubName.getPacsNamePacsSubNames();
|
|
|
if (pacsNamePacsSubNameSet != null && pacsNamePacsSubNameSet.size() > 0) {
|
|
|
- for (PacsNamePacsSubName pacsNamePacsSubName : pacsNamePacsSubNameSet) {
|
|
|
+ //升序排序
|
|
|
+ Set<PacsNamePacsSubName> sortPacsNamePacsSubNameSet
|
|
|
+ = new TreeSet<PacsNamePacsSubName>((o1, o2) -> o1.getPacsName().getName().compareTo(o2.getPacsName().getName()));
|
|
|
+ sortPacsNamePacsSubNameSet.addAll(pacsNamePacsSubNameSet);
|
|
|
+ for (PacsNamePacsSubName pacsNamePacsSubName : sortPacsNamePacsSubNameSet) {
|
|
|
if (pacsNamePacsSubName.getPacsName().getIs_kl().equals(1)) {
|
|
|
retName.setName(pacsNamePacsSubName.getPacsName().getName());
|
|
|
retName.setType(5);
|
zhaops