Merge branch 'develop' into dev/mapping20210603

# Conflicts:
#	cdssman-service/src/main/java/com/diagbot/client/CdssCoreClient.java
#	cdssman-service/src/main/java/com/diagbot/client/hystrix/CdssCoreHystrix.java

cdssman-service/src/main/java/com/diagbot/client/CdssCoreClient.java

@@ -11,6 +11,7 @@ import com.diagbot.dto.KlDiagnoseInfoDTO;
 import com.diagbot.dto.KlDiagnoseTypeDTO;
 import com.diagbot.dto.KlRuleByIdParDTO;
 import com.diagbot.dto.KlRuleInfoDTO;
+import com.diagbot.dto.RegulationIndexDTO;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.dto.RetrievalDTO;
 import com.diagbot.dto.StaticKnowledgeDTO;
@@ -219,4 +220,8 @@ public interface CdssCoreClient {
 
     @PostMapping("/term/termMatching")
     public RespDTO<List<TermConceptDTO>> getTermMatching(@Valid @RequestBody TermMatchingVO termMatchingVO);
+
+    @PostMapping("/klRegulation/index")
+    public RespDTO<List<RegulationIndexDTO>> index(@RequestBody RegulationIndexVO regulationIndexVO);
+
 }

cdssman-service/src/main/java/com/diagbot/client/hystrix/CdssCoreHystrix.java

@@ -11,6 +11,7 @@ import com.diagbot.dto.KlDiagnoseInfoDTO;
 import com.diagbot.dto.KlDiagnoseTypeDTO;
 import com.diagbot.dto.KlRuleByIdParDTO;
 import com.diagbot.dto.KlRuleInfoDTO;
+import com.diagbot.dto.RegulationIndexDTO;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.dto.RetrievalDTO;
 import com.diagbot.dto.StaticKnowledgeDTO;
@@ -291,4 +292,10 @@ public class CdssCoreHystrix implements CdssCoreClient {
         log.error("【hystrix】调用{}异常", "getTermMatching");
         return null;
     }
+
+    @Override
+    public RespDTO<List<RegulationIndexDTO>> index(RegulationIndexVO regulationIndexVO) {
+        log.error("【hystrix】调用{}异常", "index");
+        return null;
+    }
 }

cdssman-service/src/main/java/com/diagbot/dto/KlConceptScaleDTO.java

@@ -0,0 +1,107 @@
+package com.diagbot.dto;
+
+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 resultType;
+    /**
+     * 选择类型(1单选2多选)
+     */
+    private Integer selectType;
+
+    /**
+     * 显示顺序
+     */
+    private Integer orderNo;
+
+    /**
+     * 1：显示，0：不显示，2隐藏
+     */
+    private Integer status;
+
+    /**
+     * 组别互斥（同组互斥）
+     */
+    private Integer groupNum;
+
+    /**
+     * 结果
+     */
+    private String result;
+
+    /**
+     * 推送信息
+     */
+    private String pushInfo;
+
+    private String remark;
+
+}

cdssman-service/src/main/java/com/diagbot/dto/KlConceptStaticDTO.java

@@ -60,4 +60,8 @@ public class KlConceptStaticDTO {
      * 明细
      */
     List<KlConceptDetailDTO> details;
+    /**
+     * 量表结构
+     */
+    private KlScaleByIdDTO scale;
 }

cdssman-service/src/main/java/com/diagbot/dto/KlScaleByIdDTO.java

@@ -0,0 +1,48 @@
+package com.diagbot.dto;
+
+import com.diagbot.entity.wrapper.KlScaleDetailWrapper;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @author wangfeng
+ * @Description:
+ * @date 2021-05-10 10:36
+ */
+@Setter
+@Getter
+public class KlScaleByIdDTO {
+
+    private Long id;
+    /**
+     * 记录修改时间,如果时间是1970年则表示纪录未修改
+     */
+    private Date gmtModified;
+
+    /**
+     * 修改人,如果为0则表示纪录未修改
+     */
+    private String modifier;
+
+    /**
+     * 术语概念id
+     */
+    private Long conceptId;
+
+    private String conceptName;
+
+
+    /**
+     * 状态
+     */
+    private Integer status;
+
+
+    /**
+     * 量表明细
+     */
+    private List<KlScaleDetailWrapper> klScaleDetail ;
+}

cdssman-service/src/main/java/com/diagbot/dto/RegulationIndexDTO.java

@@ -0,0 +1,27 @@
+package com.diagbot.dto;
+
+import lombok.Data;
+
+/**
+ * @Description:
+ * @Author:zhoutg
+ * @time: 2020/8/17 11:28
+ */
+@Data
+public class RegulationIndexDTO {
+
+    /**
+     * 规则名称
+     */
+    private String name;
+
+    /**
+     * 规则编码
+     */
+    private Long code;
+
+    /**
+     * 规则类型:(1:量表)
+     */
+    private Integer type;
+}

cdssman-service/src/main/java/com/diagbot/entity/wrapper/KlScaleDetailWrapper.java

@@ -0,0 +1,19 @@
+package com.diagbot.entity.wrapper;
+
+import com.diagbot.dto.KlConceptScaleDTO;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @author wangfeng
+ * @Description:
+ * @date 2021-05-10 11:32
+ */
+@Setter
+@Getter
+public class KlScaleDetailWrapper extends KlConceptScaleDTO {
+    private List<KlScaleDetailWrapper> subMenuList = new ArrayList<>();
+}

cdssman-service/src/main/java/com/diagbot/facade/KlRegulationFacade.java

@@ -0,0 +1,29 @@
+package com.diagbot.facade;
+
+import com.diagbot.client.CdssCoreClient;
+import com.diagbot.dto.RegulationIndexDTO;
+import com.diagbot.dto.RespDTO;
+import com.diagbot.util.RespDTOUtil;
+import com.diagbot.vo.RegulationIndexVO;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+/**
+ * @Description:
+ * @author: zhoutg
+ * @time: 2021/3/15 10:58
+ */
+@Component
+public class KlRegulationFacade {
+
+    @Autowired
+    CdssCoreClient cdssCoreClient;
+
+    public RespDTO<List<RegulationIndexDTO>> index(RegulationIndexVO regulationIndexVO) {
+        RespDTO<List<RegulationIndexDTO>> respDTO = cdssCoreClient.index(regulationIndexVO);
+        RespDTOUtil.respNGDealCover(respDTO, "远程调用【cdss-core】，检索规则编码失败");
+        return respDTO;
+    }
+}

cdssman-service/src/main/java/com/diagbot/vo/KlConceptStaticVO.java

@@ -48,4 +48,14 @@ public class KlConceptStaticVO {
      */
     @ApiModelProperty(hidden = true)
     private Long userId;
+
+    /**
+     * 量表结构
+     */
+    private KlScaleSaveUpVO scale;
+
+    /**
+     * 数据来源：0-医院端、1-云平台，默认0
+     */
+    private Integer source = 0;
 }

cdssman-service/src/main/java/com/diagbot/vo/KlScaleSaveGroupVO.java

@@ -0,0 +1,18 @@
+package com.diagbot.vo;
+
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.List;
+
+/**
+ * @author wangfeng
+ * @Description: 组
+ * @date 2021-05-25 9:20
+ */
+@Setter
+@Getter
+public class KlScaleSaveGroupVO {
+    private Integer groupNum;
+    private List<KlScaleSaveUpDetailVO> klScaleSub;
+}

cdssman-service/src/main/java/com/diagbot/vo/KlScaleSaveUpDetailVO.java

@@ -0,0 +1,70 @@
+package com.diagbot.vo;
+
+import lombok.Getter;
+import lombok.Setter;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+/**
+ * @author wangfeng
+ * @Description: 问题 第二层
+ * @date 2021-05-10 14:11
+ */
+@Setter
+@Getter
+public class KlScaleSaveUpDetailVO {
+    /**
+     * 内容
+     */
+    private String content;
+    /**
+     * 编码
+     */
+    private String ruleCode;
+
+    /**
+     * 扣分
+     */
+    private BigDecimal score;
+
+    /**
+     * 系数
+     */
+    private BigDecimal factor;
+
+    /**
+     * 常数
+     */
+    private BigDecimal constant;
+
+    /**
+     * 11问题选项;12文本;13得分结果（隐藏）21问题，31答案'
+     */
+    private Integer textType;
+    /**
+     * 结果类型（1算分;2显示选择结果）
+     */
+    private Integer resultType;
+
+
+    /**
+     * 选择类型(21单选22多选)
+     */
+    private Integer selectType;
+
+    /**
+     * 显示顺序
+     */
+    private Integer orderNo;
+
+    /**
+     * 1：显示，0：不显示，2隐藏
+     */
+    private Integer status;
+
+
+    private String remark;
+
+    List<KlScaleSubDetailVO> KlScaleDetail;
+}

cdssman-service/src/main/java/com/diagbot/vo/KlScaleSaveUpParentVO.java

@@ -0,0 +1,66 @@
+package com.diagbot.vo;
+
+import lombok.Getter;
+import lombok.Setter;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+/**
+ * @author wangfeng
+ * @Description: 第一层
+ * @date 2021-05-10 14:13
+ */
+@Setter
+@Getter
+public class KlScaleSaveUpParentVO {
+
+    /**
+     * 内容
+     */
+    private String content;
+
+    /**
+     * 编码
+     */
+    private String ruleCode;
+
+    /**
+     * 扣分
+     */
+    private BigDecimal score;
+
+    /**
+     * 系数
+     */
+    private BigDecimal factor;
+
+    /**
+     * 常数
+     */
+    private BigDecimal constant;
+
+    /**
+     * 11问题选项;12文本;13得分结果（隐藏）
+     */
+    private Integer textType;
+    /**
+     * 结果类型（1算分;2显示选择结果）
+     */
+    private Integer resultType;
+    /**
+     * 显示顺序
+     */
+    private Integer orderNo;
+
+    /**
+     * 1：显示，0：不显示，2隐藏
+     */
+    private Integer status;
+
+
+    private String remark;
+
+    private List<KlScaleSaveGroupVO> klScaleSaveGroup;
+
+}

cdssman-service/src/main/java/com/diagbot/vo/KlScaleSaveUpVO.java

@@ -0,0 +1,24 @@
+package com.diagbot.vo;
+
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.List;
+
+/**
+ * @author wangfeng
+ * @Description: 总
+ * @date 2021-05-10 14:08
+ */
+@Setter
+@Getter
+public class KlScaleSaveUpVO {
+    /**
+     * 术语概念id
+     */
+    private Long conceptId;
+
+    private String modifier;
+
+    private List<KlScaleSaveUpParentVO> KlScaleParent;
+}

cdssman-service/src/main/java/com/diagbot/vo/KlScaleSubDetailVO.java

@@ -0,0 +1,59 @@
+package com.diagbot.vo;
+
+import lombok.Getter;
+import lombok.Setter;
+
+import java.math.BigDecimal;
+
+/**
+ * @author wangfeng
+ * @Description: 选项 第三层
+ * @date 2021-05-10 14:15
+ */
+@Setter
+@Getter
+public class KlScaleSubDetailVO {
+    /**
+     * 内容
+     */
+    private String content;
+
+    /**
+     * 编码
+     */
+    private String ruleCode;
+
+    /**
+     * 扣分
+     */
+    private BigDecimal score;
+
+    /**
+     * 11表格;12文本;21标题;31算分;32显示选择结果
+     */
+    private Integer textType;
+
+    /**
+     * 显示顺序
+     */
+    private Integer orderNo;
+
+    /**
+     * 1：显示，0：不显示，2隐藏
+     */
+    private Integer status;
+
+
+    /**
+     * 结果
+     */
+    private String result;
+
+    /**
+     * 推送信息
+     */
+    private String pushInfo;
+
+    private String remark;
+
+}

cdssman-service/src/main/java/com/diagbot/vo/RegulationIndexVO.java

@@ -0,0 +1,21 @@
+package com.diagbot.vo;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @Description: 规则搜索
+ * @Author:zhoutg
+ * @time: 2020/7/29 15:34
+ */
+@Data
+public class RegulationIndexVO {
+
+    // 内容
+    private String name;
+    // 规则类型:(1:量表)
+    private Integer type;
+    // 过滤编码
+    private List<String> notCodeList;
+}

cdssman-service/src/main/java/com/diagbot/web/ConceptInfoController.java

@@ -66,10 +66,12 @@ public class ConceptInfoController {
     @ApiOperation(value = "保存静态知识-新增或修改[zhaops]",
             notes = "id： id <br>" +
                     "name： 术语名称 <br>" +
-                    "type： 类型：1-诊断、2-药品、3-检验套餐、4-检验明细、5-检查、6-手术和操作、8-量表、9-护理 <br>" +
+                    "type： 类型：1-诊断、2-药品、3-检验套餐、4-检验细项、5-检查、6-检查子项、7-手术和操作、8-量表、9-护理  <br>" +
                     "clinicalPathwayName： 临床路径名称<br>" +
                     "noticeName： 注意事项名称<br>" +
-                    "details： 明细<br>")
+                    "source：数据来源：0-医院端、1-云平台，默认0 <br>" +
+                    "details： 明细<br>" +
+                    "scale：评估量表<br>")
     @PostMapping("/saveOrUpdateRecord")
     @SysLogger("saveOrUpdateRecord")
     @Transactional

cdssman-service/src/main/java/com/diagbot/web/KlRegulationController.java

@@ -0,0 +1,43 @@
+package com.diagbot.web;
+
+
+import com.diagbot.dto.RegulationIndexDTO;
+import com.diagbot.dto.RespDTO;
+import com.diagbot.facade.KlRegulationFacade;
+import com.diagbot.vo.RegulationIndexVO;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 通用规则表 前端控制器
+ * </p>
+ *
+ * @author zhoutg
+ * @since 2021-06-15
+ */
+@RestController
+@RequestMapping("/klRegulation")
+@Api(value = "其他规则API", tags = { "其他规则API" })
+public class KlRegulationController {
+
+    @Autowired
+    KlRegulationFacade klRegulationFacade;
+
+    @ApiOperation(value = "规则搜索[zhoutg]", notes =
+            "name：内容\n" +
+            "type：规则类型:(1:量表)\n" +
+            "notCodeList：过滤编码")
+    @PostMapping("/index")
+    public RespDTO<List<RegulationIndexDTO>> index(@RequestBody RegulationIndexVO regulationIndexVO) {
+        RespDTO<List<RegulationIndexDTO>> res = klRegulationFacade.index(regulationIndexVO);
+        return res;
+    }
+}