|
@@ -148,10 +148,10 @@ public class PushFacade {
|
|
if (ListUtil.isNotEmpty(lis)) {
|
|
if (ListUtil.isNotEmpty(lis)) {
|
|
List<String> nameList = lis.stream().map(featureRate -> featureRate.getFeatureName()).collect(Collectors.toList());
|
|
List<String> nameList = lis.stream().map(featureRate -> featureRate.getFeatureName()).collect(Collectors.toList());
|
|
if (ListUtil.isNotEmpty(nameList)) {
|
|
if (ListUtil.isNotEmpty(nameList)) {
|
|
- List<ConceptPushDTO> lisDTO = getConceptDTOList(nameList, LexiconTypeEnum.LIS_TABLES.getKey());
|
|
|
|
|
|
+ List<ConceptPushDTO> lisDTO = getConceptDTOList(nameList, LexiconTypeEnum.LIS_PACKAGE.getKey());
|
|
if (isConnect) {
|
|
if (isConnect) {
|
|
lisDTO = addClientName(lisDTO, searchVo.getHosCode(), ConceptTypeEnum.Lis.getKey());
|
|
lisDTO = addClientName(lisDTO, searchVo.getHosCode(), ConceptTypeEnum.Lis.getKey());
|
|
- lisDTO = removeLisDetail(lisDTO);
|
|
|
|
|
|
+ //lisDTO = removeLisDetail(lisDTO);
|
|
}
|
|
}
|
|
pushDTO.setLab(lisDTO);
|
|
pushDTO.setLab(lisDTO);
|
|
}
|
|
}
|
|
@@ -413,7 +413,7 @@ public class PushFacade {
|
|
for (ConceptPushDTO concept : concepts) {
|
|
for (ConceptPushDTO concept : concepts) {
|
|
List<String> clientNames = lisMappingByUniqueName.get(concept.getName());
|
|
List<String> clientNames = lisMappingByUniqueName.get(concept.getName());
|
|
if (ListUtil.isNotEmpty(clientNames)) {
|
|
if (ListUtil.isNotEmpty(clientNames)) {
|
|
- concept.setClientName(clientNames.get(0));
|
|
|
|
|
|
+ concept.setClientNames(clientNames);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
@@ -424,7 +424,7 @@ public class PushFacade {
|
|
for (ConceptPushDTO concept : concepts) {
|
|
for (ConceptPushDTO concept : concepts) {
|
|
List<String> clientNames = pacsConfigMapByUniqueName.get(concept.getName());
|
|
List<String> clientNames = pacsConfigMapByUniqueName.get(concept.getName());
|
|
if (ListUtil.isNotEmpty(clientNames)) {
|
|
if (ListUtil.isNotEmpty(clientNames)) {
|
|
- concept.setClientName(clientNames.get(0));
|
|
|
|
|
|
+ concept.setClientNames(clientNames);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
@@ -435,7 +435,9 @@ public class PushFacade {
|
|
for (ConceptPushDTO concept : concepts) {
|
|
for (ConceptPushDTO concept : concepts) {
|
|
String clientName = disMap.get(concept.getName());
|
|
String clientName = disMap.get(concept.getName());
|
|
if (StringUtil.isNotBlank(clientName)) {
|
|
if (StringUtil.isNotBlank(clientName)) {
|
|
- concept.setClientName(disMap.get(concept.getName()));
|
|
|
|
|
|
+ List<String> clientNames = Lists.newLinkedList();
|
|
|
|
+ clientNames.add(clientName);
|
|
|
|
+ concept.setClientNames(clientNames);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
@@ -449,7 +451,7 @@ public class PushFacade {
|
|
* @param lisDTO
|
|
* @param lisDTO
|
|
* @return
|
|
* @return
|
|
*/
|
|
*/
|
|
- public List<ConceptPushDTO> removeLisDetail(List<ConceptPushDTO> lisDTO) {
|
|
|
|
|
|
+ /*public List<ConceptPushDTO> removeLisDetail(List<ConceptPushDTO> lisDTO) {
|
|
List<ConceptPushDTO> retLisDTO = Lists.newLinkedList();
|
|
List<ConceptPushDTO> retLisDTO = Lists.newLinkedList();
|
|
if (ListUtil.isEmpty(lisDTO)) {
|
|
if (ListUtil.isEmpty(lisDTO)) {
|
|
return retLisDTO;
|
|
return retLisDTO;
|
|
@@ -473,5 +475,5 @@ public class PushFacade {
|
|
}
|
|
}
|
|
}
|
|
}
|
|
return retLisDTO;
|
|
return retLisDTO;
|
|
- }
|
|
|
|
|
|
+ }*/
|
|
}
|
|
}
|