推理入参转换

src/main/java/com/diagbot/facade/AssembleFacade.java

@@ -56,7 +56,7 @@ public class AssembleFacade {
         if (ListUtil.isNotEmpty(searchData.getLis())) {
             lisHisNameList.addAll(searchData.getLis()
                     .stream()
-                    .filter(i -> StringUtil.isNotBlank(i.getName()))
+                    .filter(i -> StringUtil.isNotBlank(i.getName()) || StringUtil.isNotBlank(i.getUniqueName()))
                     .map(i -> i.getName())
                     .collect(Collectors.toList()));
         }
@@ -64,7 +64,7 @@ public class AssembleFacade {
         if (ListUtil.isNotEmpty(searchData.getLisOrder())) {
             lisHisNameList.addAll(searchData.getLisOrder()
                     .stream()
-                    .filter(i -> StringUtil.isNotBlank(i.getName()))
+                    .filter(i -> StringUtil.isNotBlank(i.getName()) || StringUtil.isNotBlank(i.getUniqueName()))
                     .map(i -> i.getName())
                     .collect(Collectors.toList()));
         }
@@ -92,7 +92,7 @@ public class AssembleFacade {
         if (ListUtil.isNotEmpty(searchData.getPacs())) {
             pacsHisNameList.addAll(searchData.getPacs()
                     .stream()
-                    .filter(i -> StringUtil.isNotBlank(i.getName()))
+                    .filter(i -> StringUtil.isNotBlank(i.getName()) || StringUtil.isNotBlank(i.getUniqueName()))
                     .map(i -> i.getName())
                     .collect(Collectors.toList()));
         }
@@ -100,7 +100,7 @@ public class AssembleFacade {
         if (ListUtil.isNotEmpty(searchData.getPacsOrder())) {
             pacsHisNameList.addAll(searchData.getPacsOrder()
                     .stream()
-                    .filter(i -> StringUtil.isNotBlank(i.getName()))
+                    .filter(i -> StringUtil.isNotBlank(i.getName()) || StringUtil.isNotBlank(i.getUniqueName()))
                     .map(i -> i.getName())
                     .collect(Collectors.toList()));
         }
@@ -128,7 +128,7 @@ public class AssembleFacade {
         if (ListUtil.isNotEmpty(searchData.getDiag())) {
             diagHisNameList.addAll(searchData.getDiag()
                     .stream()
-                    .filter(i -> StringUtil.isNotBlank(i.getName()))
+                    .filter(i -> StringUtil.isNotBlank(i.getName()) || StringUtil.isNotBlank(i.getUniqueName()))
                     .map(i -> i.getName())
                     .collect(Collectors.toList()));
         }
@@ -136,7 +136,7 @@ public class AssembleFacade {
         if (ListUtil.isNotEmpty(searchData.getDiagOrder())) {
             diagHisNameList.addAll(searchData.getDiagOrder()
                     .stream()
-                    .filter(i -> StringUtil.isNotBlank(i.getName()))
+                    .filter(i -> StringUtil.isNotBlank(i.getName()) || StringUtil.isNotBlank(i.getUniqueName()))
                     .map(i -> i.getName())
                     .collect(Collectors.toList()));
         }
@@ -164,7 +164,7 @@ public class AssembleFacade {
         if (ListUtil.isNotEmpty(searchData.getDrug())) {
             drugHisNameList.addAll(searchData.getDrug()
                     .stream()
-                    .filter(i -> StringUtil.isNotBlank(i.getName()))
+                    .filter(i -> StringUtil.isNotBlank(i.getName()) || StringUtil.isNotBlank(i.getUniqueName()))
                     .map(i -> i.getName())
                     .collect(Collectors.toList()));
         }
@@ -172,7 +172,7 @@ public class AssembleFacade {
         if (ListUtil.isNotEmpty(searchData.getDrugOrder())) {
             drugHisNameList.addAll(searchData.getDrugOrder()
                     .stream()
-                    .filter(i -> StringUtil.isNotBlank(i.getName()))
+                    .filter(i -> StringUtil.isNotBlank(i.getName()) || StringUtil.isNotBlank(i.getUniqueName()))
                     .map(i -> i.getName())
                     .collect(Collectors.toList()));
         }
@@ -200,7 +200,7 @@ public class AssembleFacade {
         if (ListUtil.isNotEmpty(searchData.getOperationOrder())) {
             operationHisNameList.addAll(searchData.getOperationOrder()
                     .stream()
-                    .filter(i -> StringUtil.isNotBlank(i.getName()))
+                    .filter(i -> StringUtil.isNotBlank(i.getName()) || StringUtil.isNotBlank(i.getUniqueName()))
                     .map(i -> i.getName())
                     .collect(Collectors.toList()));
         }
@@ -224,7 +224,7 @@ public class AssembleFacade {
         if (ListUtil.isNotEmpty(searchData.getDept())) {
             deptHisNameList.addAll(searchData.getDept()
                     .stream()
-                    .filter(i -> StringUtil.isNotBlank(i.getName()))
+                    .filter(i -> StringUtil.isNotBlank(i.getName()) || StringUtil.isNotBlank(i.getUniqueName()))
                     .map(i -> i.getName())
                     .collect(Collectors.toList()));
         }