|
@@ -145,7 +145,7 @@ public class CommonFacade {
|
|
|
|
|
|
//所有化验(结构化数据)
|
|
|
List<String> allLis = new ArrayList<>();
|
|
|
- //普通化验
|
|
|
+ //普通化验——取明细
|
|
|
List<Lis> lis = wordCrfDTO.getLis();
|
|
|
if (ListUtil.isNotEmpty(lis)) {
|
|
|
List<String> lis_unique = lis.stream().filter(x -> StringUtils.isBlank(x.getUniqueName()))
|
|
@@ -153,11 +153,11 @@ public class CommonFacade {
|
|
|
.map(x ->x.getDetailName()).collect(Collectors.toList());
|
|
|
allLis.addAll(lis_unique);
|
|
|
}
|
|
|
- //开单化验
|
|
|
+ //开单化验——取套餐
|
|
|
List<Lis> lisOrder = wordCrfDTO.getLisOrder();
|
|
|
if (ListUtil.isNotEmpty(lisOrder)) {
|
|
|
List<String> lis_unique = lisOrder.stream().filter(x -> StringUtils.isBlank(x.getUniqueName()))
|
|
|
- .map(x -> x.getName() + x.getDetailName()).collect(Collectors.toList());
|
|
|
+ .map(x -> x.getName()).collect(Collectors.toList());
|
|
|
allLis.addAll(lis_unique);
|
|
|
}
|
|
|
standConvert.setLisList(allLis);
|