量表接口增加参数

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

@@ -70,7 +70,10 @@ public class KlConceptScaleDTO {
      * 11表格;12文本;21标题;31算分;32显示选择结果
      */
     private Integer textType;
-
+    /**
+     * 结果类型（1算分;2显示选择结果）
+     */
+    private Integer resultType;
     /**
      * 选择类型(1单选2多选)
      */

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

@@ -13,7 +13,7 @@ import java.util.Date;
  * </p>
  *
  * @author wangfeng
- * @since 2021-05-24
+ * @since 2021-05-25
  */
 public class KlConceptScale implements Serializable {
 
@@ -86,10 +86,15 @@ public class KlConceptScale implements Serializable {
     private BigDecimal constant;
 
     /**
-     * 11表格;12文本;21标题;31算分;32显示选择结果
+     * 11问题选项;12文本;13得分结果（隐藏）
      */
     private Integer textType;
 
+    /**
+     * 结果类型（1算分;2显示选择结果）
+     */
+    private Integer resultType;
+
     /**
      * 选择类型(1单选2多选)
      */
@@ -220,6 +225,13 @@ public class KlConceptScale implements Serializable {
     public void setTextType(Integer textType) {
         this.textType = textType;
     }
+    public Integer getResultType() {
+        return resultType;
+    }
+
+    public void setResultType(Integer resultType) {
+        this.resultType = resultType;
+    }
     public Integer getSelectType() {
         return selectType;
     }
@@ -287,6 +299,7 @@ public class KlConceptScale implements Serializable {
             ", factor=" + factor +
             ", constant=" + constant +
             ", textType=" + textType +
+            ", resultType=" + resultType +
             ", selectType=" + selectType +
             ", orderNo=" + orderNo +
             ", status=" + status +

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

@@ -3,7 +3,6 @@ package com.diagbot.facade;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.diagbot.dto.KlDiagnoseByIdDTO;
 import com.diagbot.dto.KlScaleByIdDTO;
 import com.diagbot.dto.KlScaleInfoDTO;
 import com.diagbot.entity.KlConceptScale;
@@ -29,7 +28,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.Date;
 import java.util.List;
 import java.util.Map;
@@ -127,29 +125,31 @@ public class KlScaleFacade {
                     klConceptScale.setConceptId(klScaleSaveUpVO.getConceptId());
                     res = klConceptScaleFacade.save(klConceptScale);
                     List<KlScaleSaveGroupVO> klScaleSaveGroup = data.getKlScaleSaveGroup();
-                    for (KlScaleSaveGroupVO groupData : klScaleSaveGroup) {//组别
-                        baseGroup = baseGroup + 1;
-                        List<KlScaleSaveUpDetailVO> klScaleSub = groupData.getKlScaleSub();
-                        if (ListUtil.isNotEmpty(klScaleSub)) {
-                            for (KlScaleSaveUpDetailVO data1 : klScaleSub) {//问题
-                                KlConceptScale klConceptScaleSub = new KlConceptScale();
-                                BeanUtil.copyProperties(data1, klConceptScaleSub);
-                                klConceptScaleSub.setGmtModified(now);
-                                klConceptScaleSub.setGroupNum(baseGroup);
-                                klConceptScaleSub.setModifier(klScaleSaveUpVO.getModifier());
-                                klConceptScaleSub.setParentId(klConceptScale.getId());
-                                klConceptScaleSub.setConceptId(klScaleSaveUpVO.getConceptId());
-                                res = klConceptScaleFacade.save(klConceptScaleSub);
-                                List<KlScaleSubDetailVO> klScaleDetail = data1.getKlScaleDetail();
-                                if (ListUtil.isNotEmpty(klScaleDetail)) {
-                                    for (KlScaleSubDetailVO data2 : klScaleDetail) {//答案
-                                        KlConceptScale klConceptScaleDetail = new KlConceptScale();
-                                        BeanUtil.copyProperties(data2, klConceptScaleDetail);
-                                        klConceptScaleDetail.setGmtModified(now);
-                                        klConceptScaleDetail.setModifier(klScaleSaveUpVO.getModifier());
-                                        klConceptScaleDetail.setParentId(klConceptScaleSub.getId());
-                                        klConceptScaleDetail.setConceptId(klScaleSaveUpVO.getConceptId());
-                                        res = klConceptScaleFacade.save(klConceptScaleDetail);
+                    if (ListUtil.isNotEmpty(klScaleSaveGroup)) {
+                        for (KlScaleSaveGroupVO groupData : klScaleSaveGroup) {//组别
+                            baseGroup = baseGroup + 1;
+                            List<KlScaleSaveUpDetailVO> klScaleSub = groupData.getKlScaleSub();
+                            if (ListUtil.isNotEmpty(klScaleSub)) {
+                                for (KlScaleSaveUpDetailVO data1 : klScaleSub) {//问题
+                                    KlConceptScale klConceptScaleSub = new KlConceptScale();
+                                    BeanUtil.copyProperties(data1, klConceptScaleSub);
+                                    klConceptScaleSub.setGmtModified(now);
+                                    klConceptScaleSub.setGroupNum(baseGroup);
+                                    klConceptScaleSub.setModifier(klScaleSaveUpVO.getModifier());
+                                    klConceptScaleSub.setParentId(klConceptScale.getId());
+                                    klConceptScaleSub.setConceptId(klScaleSaveUpVO.getConceptId());
+                                    res = klConceptScaleFacade.save(klConceptScaleSub);
+                                    List<KlScaleSubDetailVO> klScaleDetail = data1.getKlScaleDetail();
+                                    if (ListUtil.isNotEmpty(klScaleDetail)) {
+                                        for (KlScaleSubDetailVO data2 : klScaleDetail) {//答案
+                                            KlConceptScale klConceptScaleDetail = new KlConceptScale();
+                                            BeanUtil.copyProperties(data2, klConceptScaleDetail);
+                                            klConceptScaleDetail.setGmtModified(now);
+                                            klConceptScaleDetail.setModifier(klScaleSaveUpVO.getModifier());
+                                            klConceptScaleDetail.setParentId(klConceptScaleSub.getId());
+                                            klConceptScaleDetail.setConceptId(klScaleSaveUpVO.getConceptId());
+                                            res = klConceptScaleFacade.save(klConceptScaleDetail);
+                                        }
                                     }
                                 }
                             }

src/main/java/com/diagbot/vo/KlScaleSaveUpDetailVO.java

@@ -60,5 +60,6 @@ public class KlScaleSaveUpDetailVO {
 
 
     private String remark;
+
     List<KlScaleSubDetailVO> KlScaleDetail;
 }

src/main/java/com/diagbot/vo/KlScaleSaveUpParentVO.java

@@ -41,12 +41,13 @@ public class KlScaleSaveUpParentVO {
     private BigDecimal constant;
 
     /**
-     * 11表格;12文本;21标题;31算分;32显示选择结果
+     * 11问题选项;12文本;13得分结果（隐藏）
      */
     private Integer textType;
-
-
-
+    /**
+     * 结果类型（1算分;2显示选择结果）
+     */
+    private Integer resultType;
     /**
      * 显示顺序
      */

src/main/java/com/diagbot/vo/KlScaleSaveUpVO.java

@@ -15,19 +15,12 @@ import java.util.List;
 @Getter
 public class KlScaleSaveUpVO {
     private Long Id;
-
     /**
      * 术语概念id
      */
     private Long conceptId;
 
-    private String conceptName;
     private String modifier;
-   /* *//**
-     * 量表描述
-     *//*
-    private String description;
-*/
     /**
      * 状态
      */

src/main/resources/mapper/KlConceptScaleMapper.xml

@@ -18,6 +18,7 @@
         <result column="factor" property="factor" />
         <result column="constant" property="constant" />
         <result column="text_type" property="textType" />
+        <result column="result_type" property="resultType" />
         <result column="select_type" property="selectType" />
         <result column="order_no" property="orderNo" />
         <result column="status" property="status" />