|
@@ -2,6 +2,7 @@ package com.diagbot.repository;
|
|
|
|
|
|
import com.diagbot.dto.BillNeoDTO;
|
|
import com.diagbot.dto.BillNeoDTO;
|
|
import com.diagbot.dto.PacsBillNeoDTO;
|
|
import com.diagbot.dto.PacsBillNeoDTO;
|
|
|
|
+import com.diagbot.dto.PacsInfoDTO;
|
|
import com.diagbot.entity.BaseNodeInfo;
|
|
import com.diagbot.entity.BaseNodeInfo;
|
|
import com.diagbot.entity.node.*;
|
|
import com.diagbot.entity.node.*;
|
|
import com.diagbot.entity.relationship.*;
|
|
import com.diagbot.entity.relationship.*;
|
|
@@ -33,6 +34,7 @@ import com.diagbot.entity.relationship.PacsNamePacsDescribe;
|
|
import com.diagbot.entity.relationship.PacsNameVital;
|
|
import com.diagbot.entity.relationship.PacsNameVital;
|
|
import com.diagbot.util.ListUtil;
|
|
import com.diagbot.util.ListUtil;
|
|
import com.diagbot.util.NeoUtil;
|
|
import com.diagbot.util.NeoUtil;
|
|
|
|
+import com.google.common.collect.Lists;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
import org.springframework.stereotype.Component;
|
|
import org.springframework.stereotype.Component;
|
|
|
|
|
|
@@ -335,7 +337,7 @@ public class PacsNameNode {
|
|
/**
|
|
/**
|
|
* 获取辅检名称列表
|
|
* 获取辅检名称列表
|
|
*/
|
|
*/
|
|
- public List<String> getPACSNameAndPACSSubNameList(String name, Integer size, PacsNameRepository pacsRepository) {
|
|
|
|
|
|
+ public List<PacsInfoDTO> getPACSNameAndPACSSubNameList(String name, Integer size, PacsNameRepository pacsRepository) {
|
|
|
|
|
|
List<String> pacslist = new ArrayList<>();
|
|
List<String> pacslist = new ArrayList<>();
|
|
if (null == size) {
|
|
if (null == size) {
|
|
@@ -347,16 +349,29 @@ public class PacsNameNode {
|
|
pacslt = pacslt.subList(0, size);
|
|
pacslt = pacslt.subList(0, size);
|
|
}
|
|
}
|
|
|
|
|
|
- pacslist = pacslt.stream().map(i -> i.getName()).collect(Collectors.toList());
|
|
|
|
|
|
+ List<PacsInfoDTO> retPacslt = Lists.newLinkedList();
|
|
|
|
+ for (BaseNodeInfo baseNodeInfo : pacslt) {
|
|
|
|
+ PacsInfoDTO pacsInfoDTO = new PacsInfoDTO();
|
|
|
|
+ pacsInfoDTO.setName(baseNodeInfo.getName());
|
|
|
|
+ if (baseNodeInfo.getLabels() != null && baseNodeInfo.getLabels().size() > 0) {
|
|
|
|
+ if (baseNodeInfo.getLabels().contains("辅助检查名称")) {
|
|
|
|
+ pacsInfoDTO.setType(3);
|
|
|
|
+ } else if (baseNodeInfo.getLabels().contains("辅助检查子项目名称")) {
|
|
|
|
+ pacsInfoDTO.setType(10);
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+ retPacslt.add(pacsInfoDTO);
|
|
|
|
+ }
|
|
|
|
+ //pacslist = pacslt.stream().map(i -> i.getName()).collect(Collectors.toList());
|
|
|
|
|
|
- return pacslist;
|
|
|
|
|
|
+ return retPacslt;
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
/**
|
|
/**
|
|
* 获取辅检及子项目名称列表
|
|
* 获取辅检及子项目名称列表
|
|
*/
|
|
*/
|
|
- public List<String> getPACSNameAndPACSSubNames(String name, Integer size, PacsNameRepository pacsRepository) {
|
|
|
|
|
|
+ public List<PacsInfoDTO> getPACSNameAndPACSSubNames(String name, Integer size, PacsNameRepository pacsRepository) {
|
|
|
|
|
|
List<String> pacslist;
|
|
List<String> pacslist;
|
|
if (null == size || size == 0) {
|
|
if (null == size || size == 0) {
|
|
@@ -365,7 +380,16 @@ public class PacsNameNode {
|
|
|
|
|
|
pacslist = pacsRepository.getPACSNames(size);
|
|
pacslist = pacsRepository.getPACSNames(size);
|
|
|
|
|
|
- return pacslist;
|
|
|
|
|
|
+ List<PacsInfoDTO> retList = Lists.newLinkedList();
|
|
|
|
+ if (ListUtil.isNotEmpty(pacslist)) {
|
|
|
|
+ for (String pacsStr : pacslist) {
|
|
|
|
+ PacsInfoDTO pacsInfoDTO = new PacsInfoDTO();
|
|
|
|
+ pacsInfoDTO.setName(pacsStr);
|
|
|
|
+ retList.add(pacsInfoDTO);
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ return retList;
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|