量表字段更新4

src/main/java/com/diagbot/dto/KlConceptScaleDTO.java

@@ -0,0 +1,106 @@
+package com.diagbot.dto;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * @author wangfeng
+ * @Description:
+ * @date 2021-05-25 10:00
+ */
+@Setter
+@Getter
+public class KlConceptScaleDTO {
+
+    private Long id;
+
+
+    /**
+     * 记录修改时间,如果时间是1970年则表示纪录未修改
+     */
+    private Date gmtModified;
+
+
+    /**
+     * 修改人,如果为0则表示纪录未修改
+     */
+    private String modifier;
+
+    /**
+     * 术语概念id
+     */
+    private Long conceptId;
+
+    /**
+     * -1：表示顶级,其他值表示上级菜单的id
+     */
+    private Long parentId;
+
+    /**
+     * 内容
+     */
+    private String content;
+
+    /**
+     * 编码
+     */
+    private String ruleCode;
+
+    /**
+     * 扣分
+     */
+    private BigDecimal score;
+
+    /**
+     * 系数
+     */
+    private BigDecimal factor;
+
+    /**
+     * 常数
+     */
+    private BigDecimal constant;
+
+    /**
+     * 11表格;12文本;21标题;31算分;32显示选择结果
+     */
+    private Integer textType;
+
+    /**
+     * 选择类型(1单选2多选)
+     */
+    private Integer selectType;
+
+    /**
+     * 显示顺序
+     */
+    private Integer orderNo;
+
+    /**
+     * 1：显示，0：不显示，2隐藏
+     */
+    private Integer status;
+
+    /**
+     * 组别互斥（同组互斥）
+     */
+    private Integer group;
+
+    /**
+     * 结果
+     */
+    private String result;
+
+    /**
+     * 推送信息
+     */
+    private String pushInfo;
+
+    private String remark;
+
+}

src/main/java/com/diagbot/entity/KlConceptScale.java

@@ -108,7 +108,7 @@ public class KlConceptScale implements Serializable {
     /**
      * 组别互斥（同组互斥）
      */
-    private Integer group;
+    private Integer groupNum;
 
     /**
      * 结果
@@ -241,12 +241,12 @@ public class KlConceptScale implements Serializable {
     public void setStatus(Integer status) {
         this.status = status;
     }
-    public Integer getGroup() {
-        return group;
+    public Integer getGroupNum() {
+        return groupNum;
     }
 
-    public void setGroup(Integer group) {
-        this.group = group;
+    public void setGroupNum(Integer groupNum) {
+        this.groupNum = groupNum;
     }
     public String getResult() {
         return result;
@@ -290,7 +290,7 @@ public class KlConceptScale implements Serializable {
             ", selectType=" + selectType +
             ", orderNo=" + orderNo +
             ", status=" + status +
-            ", group=" + group +
+            ", groupNum=" + groupNum +
             ", result=" + result +
             ", pushInfo=" + pushInfo +
             ", remark=" + remark +

src/main/java/com/diagbot/facade/KlScaleFacade.java

@@ -132,7 +132,7 @@ public class KlScaleFacade {
                                 KlConceptScale klConceptScaleSub = new KlConceptScale();
                                 BeanUtil.copyProperties(data1, klConceptScaleSub);
                                 klConceptScaleSub.setGmtModified(now);
-                                klConceptScaleSub.setGroup(baseGroup);
+                                klConceptScaleSub.setGroupNum(baseGroup);
                                 klConceptScaleSub.setModifier(klScaleSaveUpVO.getModifier());
                                 klConceptScaleSub.setParentId(klConceptScale.getId());
                                 klConceptScaleSub.setConceptId(klScaleSaveUpVO.getConceptId());

src/main/resources/mapper/KlConceptScaleMapper.xml

@@ -21,7 +21,7 @@
         <result column="select_type" property="selectType" />
         <result column="order_no" property="orderNo" />
         <result column="status" property="status" />
-        <result column="group" property="group" />
+        <result column="group_num" property="groupNum" />
         <result column="result" property="result" />
         <result column="push_info" property="pushInfo" />
         <result column="remark" property="remark" />