chName,enName合并展示

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

@@ -27,6 +27,7 @@ import org.jeecg.common.util.oConvertUtils;
 import org.jeecg.modules.medical.Constant;
 import org.jeecg.modules.medical.EnchanceTypeEnum;
 import org.jeecg.modules.medical.entity.*;
+import org.jeecg.modules.medical.ruleengine.OperaterEnum;
 import org.jeecg.modules.medical.ruleengine.PluginInterface;
 import org.jeecg.modules.medical.service.*;
 
@@ -340,7 +341,7 @@ public class FactorEnchanceController extends JeecgController<FactorEnchance, IF
             EventAttr byId = eventAttrService.getById(factorEnchance.getEventAttrId());
             List<String> name = new ArrayList<>();
             if(byId!=null){
-                name.add(byId.getChName());
+                name.add(byId.getChName()+"("+byId.getChName()+")");
             }
             factorEnchance.setOutParamNameList(name);
         }
@@ -410,9 +411,9 @@ public class FactorEnchanceController extends JeecgController<FactorEnchance, IF
                         String string = "";
                         String type = "";
                         String text = "";
-                        String operator = "";
+//                        String operator = "";
                         if (one != null) {
-                            operator = dictService.queryDictTextByKey("operator", it.getOperator().toString());
+//                            operator = dictService.queryDictTextByKey("operator", it.getOperator().toString());
                             if (it.getRefAttrType() == 1) {
 //                                type = "扩展属性:";
                                 text = it.getExtAttr1();
@@ -423,7 +424,7 @@ public class FactorEnchanceController extends JeecgController<FactorEnchance, IF
                             }
                         }
                         String concat = string.concat(one.getChName() + "(" + one.getEnName() + ")")
-                                .concat(operator).concat(type).concat(text);
+                                .concat(OperaterEnum.getType(it.getOperator()).getOperaterStr()).concat(type).concat(text);
                         str.add(concat);
                     });
                     logical4.setValue(str);

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/medical/entity/ChEnDto.java

@@ -0,0 +1,27 @@
+package org.jeecg.modules.medical.entity;
+
+import com.baomidou.mybatisplus.annotation.*;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.jeecg.common.aspect.annotation.Dict;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.util.Date;
+
+@Data
+public class ChEnDto implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+
+    @ApiModelProperty(value = "中文名称")
+    private String chName;
+    @ApiModelProperty(value = "英文名称")
+    private String enName;
+
+}

jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/medical/mapper/xml/EventAttrMapper.xml

@@ -4,14 +4,14 @@
 
     <select id="getInById" resultType="java.lang.String">
 
-        select ch_name
+        select CONCAT(ch_name, '(', en_name, ')')
         From event_attr
         where id in (select event_attr_id From factor_attr_rela r where r.factor_enhance_id = #{id} and r.io_type = 1 order by  r.seq_num )
 
     </select>
     <select id="getOutById" resultType="java.lang.String">
 
-        select ch_name
+        select CONCAT(ch_name, '(', en_name, ')')
         From event_attr
         where id in (select event_attr_id From factor_attr_rela r where r.factor_enhance_id = #{id} and r.io_type = 2 order by  r.seq_num )