lenovodn 2 лет назад
Родитель
Сommit
c8c05b612e

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

@@ -291,8 +291,8 @@ public class FactorEnchanceController extends JeecgController<FactorEnchance, IF
         if (list.size() > 0) {
             for (RuleFactorRela info : list) {
                 CommonResponse response = new CommonResponse();
-                response.setId(info.getFactorEnhanceId());
-                response.setName(info.getRuleEnchanceName());
+                response.setId(info.getId());
+                response.setName("("+info.getFactorEnhanceId()+")"+info.getRuleEnchanceName());
                 responses.add(response);
             }
         }

+ 1 - 1
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/medical/entity/RuleFactorRela.java

@@ -32,7 +32,7 @@ public class RuleFactorRela implements Serializable {
     private static final long serialVersionUID = 1L;
 
 	/**关联标识*/
-	@TableId(type = IdType.ASSIGN_ID)
+	@TableId(type = IdType.AUTO)
     @ApiModelProperty(value = "关联标识")
     private java.lang.Integer id;
 	/**归属规则ID*/

+ 1 - 1
jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/medical/mapper/xml/RuleFactorRelaMapper.xml

@@ -3,7 +3,7 @@
 <mapper namespace="org.jeecg.modules.medical.mapper.RuleFactorRelaMapper">
 
     <select id="list" resultType="org.jeecg.modules.medical.entity.RuleFactorRela">
-        select r.factor_enhance_id,e.rule_enchance_name From rule_factor_rela r LEFT JOIN factor_enchance e on r.factor_enhance_id=e.id
+        select r.id,r.factor_enhance_id,e.rule_enchance_name From rule_factor_rela r LEFT JOIN factor_enchance e on r.factor_enhance_id=e.id
                                                         where r.medical_ins_rule_info_id=#{medicalInsRuleInfoId} order by r.seq_num
 
     </select>