|
@@ -97,9 +97,10 @@ public class FactorEnchanceController extends JeecgController<FactorEnchance, IF
|
|
|
pageList.getRecords().forEach(it -> {
|
|
pageList.getRecords().forEach(it -> {
|
|
|
Optional<MedicalInsRuleInfo> first = ruleInfoList.stream().filter(o ->
|
|
Optional<MedicalInsRuleInfo> first = ruleInfoList.stream().filter(o ->
|
|
|
ObjectUtils.nullSafeEquals(o.getId(), it.getFactorCatalog())).findFirst();
|
|
ObjectUtils.nullSafeEquals(o.getId(), it.getFactorCatalog())).findFirst();
|
|
|
- if(first.isPresent()){
|
|
|
|
|
- it.setFactorCatalogStr(first.get().getRuleName());
|
|
|
|
|
- }
|
|
|
|
|
|
|
+ if (first.isPresent()) {
|
|
|
|
|
+ it.setFactorCatalogStr(first.get().getRuleName());
|
|
|
|
|
+ }
|
|
|
|
|
+ it.setFactorCatalogId(it.getFactorCatalog());
|
|
|
if (it.getEnhanceType() == 1) {
|
|
if (it.getEnhanceType() == 1) {
|
|
|
List<FactorAttrRela> inList = factorAttrRelaService.lambdaQuery().eq(FactorAttrRela::getIoType, Constant.INPUT).eq(FactorAttrRela::getFactorEnhanceId, it.getId()).list();
|
|
List<FactorAttrRela> inList = factorAttrRelaService.lambdaQuery().eq(FactorAttrRela::getIoType, Constant.INPUT).eq(FactorAttrRela::getFactorEnhanceId, it.getId()).list();
|
|
|
if (inList.size() > 0) {
|
|
if (inList.size() > 0) {
|
|
@@ -301,7 +302,7 @@ public class FactorEnchanceController extends JeecgController<FactorEnchance, IF
|
|
|
for (RuleFactorRela info : list) {
|
|
for (RuleFactorRela info : list) {
|
|
|
CommonResponse response = new CommonResponse();
|
|
CommonResponse response = new CommonResponse();
|
|
|
response.setId(info.getId());
|
|
response.setId(info.getId());
|
|
|
- response.setName("("+info.getFactorEnhanceId()+")"+info.getRuleEnchanceName());
|
|
|
|
|
|
|
+ response.setName("(" + info.getFactorEnhanceId() + ")" + info.getRuleEnchanceName());
|
|
|
responses.add(response);
|
|
responses.add(response);
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|