lenovodn 2 年 前
コミット
1280035c03

+ 5 - 4
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/medical/controller/FactorEnchanceController.java

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

+ 3 - 0
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/medical/entity/FactorEnchance.java

@@ -149,4 +149,7 @@ public class FactorEnchance implements Serializable {
     private String enhanceTypeStr;
     @TableField(exist = false)
     private String factorCatalogStr;
+
+    @TableField(exist = false)
+    private Integer factorCatalogId;
 }