|
@@ -618,7 +618,7 @@ public class WmScorePackageServiceImpl extends ServiceImpl<WmScorePackageMapper,
|
|
|
|
|
|
String[] drugtable = wmScorePackage1.getDrugtable();
|
|
|
|
|
|
- if (ArrayUtil.isNotEmpty(drugtable)){
|
|
|
+ if (ArrayUtil.isNotEmpty(drugtable)) {
|
|
|
List<WmDaDrugEntDrugtable> entDrugtables = drugEntDrugtableService.listByIds(Arrays.asList(drugtable));
|
|
|
String[] array = entDrugtables.stream().map(WmDaDrugEntDrugtable::getDrugnameTy).toArray(String[]::new);
|
|
|
wmScorePackage1.setDrugtableName(array);
|
|
@@ -2895,10 +2895,18 @@ public class WmScorePackageServiceImpl extends ServiceImpl<WmScorePackageMapper,
|
|
|
List<WmScorePackage> relationRelationScoreIdList = wmScorePackageMapper.selectList(Wrappers.<WmScorePackage>lambdaQuery()
|
|
|
.in(WmScorePackage::getRelationScoreId, relationScoreIdSet));
|
|
|
Set<String> relationRelationScoreIdSet = relationRelationScoreIdList.stream()
|
|
|
- .map(WmScorePackage::getScoreId)
|
|
|
+ .map(WmScorePackage::getId)
|
|
|
.collect(Collectors.toSet());
|
|
|
if (CollUtil.isNotEmpty(relationRelationScoreIdSet)) {
|
|
|
scorePackageIdSet.addAll(relationRelationScoreIdSet);
|
|
|
+ List<WmScorePackage> relationRelationScoreIdList1 = wmScorePackageMapper.selectList(Wrappers.<WmScorePackage>lambdaQuery()
|
|
|
+ .in(WmScorePackage::getRelationScoreId, relationRelationScoreIdSet));
|
|
|
+ Set<String> relationRelationScoreIdSet1 = relationRelationScoreIdList1.stream()
|
|
|
+ .map(WmScorePackage::getId)
|
|
|
+ .collect(Collectors.toSet());
|
|
|
+ if (CollUtil.isNotEmpty(relationRelationScoreIdSet1)) {
|
|
|
+ scorePackageIdSet.addAll(relationRelationScoreIdSet1);
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
|