Merge branch 'dev/scaleRule20210617' into dev/scale_preserve20210511

src/main/java/com/diagbot/client/CdssCoreClient.java

@@ -116,11 +116,11 @@ public interface CdssCoreClient {
     /**
      * 根据名称和类型获取静态知识内容
      *
-     * @param staticKnowledgeVO
+     * @param scaleStaticAllVO
      * @return
      */
     @PostMapping("/kl/conceptStatic/getStaticKnowledge")
-    RespDTO<StaticKnowledgeDTO> getStaticKnowledge(@Valid @RequestBody StaticKnowledgeVO staticKnowledgeVO);
+    RespDTO<StaticKnowledgeDTO> getStaticKnowledge(@Valid @RequestBody ScaleStaticAllVO scaleStaticAllVO);
 
     /**
      * 分页查询

src/main/java/com/diagbot/client/hystrix/CdssCoreHystrix.java

@@ -146,11 +146,11 @@ public class CdssCoreHystrix implements CdssCoreClient {
     /**
      * 根据名称和类型获取静态知识内容
      *
-     * @param staticKnowledgeVO
+     * @param scaleStaticAllVO
      * @return
      */
     @Override
-    public RespDTO<StaticKnowledgeDTO> getStaticKnowledge(@Valid @RequestBody StaticKnowledgeVO staticKnowledgeVO) {
+    public RespDTO<StaticKnowledgeDTO> getStaticKnowledge(@Valid @RequestBody ScaleStaticAllVO scaleStaticAllVO) {
         log.error("【hystrix】调用{}异常", "getStaticKnowledge");
         return null;
     }

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

@@ -97,4 +97,6 @@ public class ConceptScaleDetailDTO {
      * 推送信息
      */
     private String pushInfo;
+
+    private Integer match ;
 }

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

@@ -20,6 +20,9 @@ import com.diagbot.vo.ChangeStatusVO;
 import com.diagbot.vo.IdVO;
 import com.diagbot.vo.KlConceptStaticPageVO;
 import com.diagbot.vo.KlConceptStaticVO;
+import com.diagbot.vo.PushJoinVO;
+import com.diagbot.vo.ScaleStaticAllVO;
+import com.diagbot.vo.ScaleVO;
 import com.diagbot.vo.StaticKnowledgeHISVO;
 import com.diagbot.vo.StaticKnowledgeIndexPageVO;
 import com.diagbot.vo.StaticKnowledgeIndexVO;
@@ -46,6 +49,8 @@ public class KlConceptStaticFacade {
     private ConceptInfoFacade conceptInfoFacade;
     @Autowired
     private SysUserFacade sysUserFacade;
+    @Autowired
+    MrFacade mrFacade;
 
 
     /**
@@ -76,7 +81,15 @@ public class KlConceptStaticFacade {
      * @return
      */
     public StaticKnowledgeDTO getStaticKnowledge(StaticKnowledgeVO staticKnowledgeVO) {
-        RespDTO<StaticKnowledgeDTO> respDTO = cdssCoreClient.getStaticKnowledge(staticKnowledgeVO);
+        ScaleStaticAllVO scaleStaticAllVO = new ScaleStaticAllVO();
+        if (staticKnowledgeVO.getType() == 8) {
+            PushJoinVO mr = mrFacade.getMr(staticKnowledgeVO.getMrId());
+            if (null != mr) {
+                BeanUtil.copyProperties(mr, scaleStaticAllVO);
+            }
+        }
+        BeanUtil.copyProperties(staticKnowledgeVO, scaleStaticAllVO);
+        RespDTO<StaticKnowledgeDTO> respDTO = cdssCoreClient.getStaticKnowledge(scaleStaticAllVO);
         if (RespDTOUtil.respIsOK(respDTO)) {
             StaticKnowledgeDTO staticKnowledgeDTO = respDTO.data;
             return staticKnowledgeDTO;

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

@@ -0,0 +1,32 @@
+package com.diagbot.vo;
+
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.validation.constraints.NotNull;
+import java.util.List;
+
+/**
+ * @author wangfeng
+ * @Description:
+ * @date 2021-06-18 10:58
+ */
+@Setter
+@Getter
+public class ScaleStaticAllVO extends ScaleVO{
+    /**
+     * 标准术语名称
+     */
+    private String name;
+    /**
+     * 术语类型
+     */
+    @NotNull(message = "请输入术语类型：1-诊断、2-药品、3-检验套餐、4-检验细项、5-检查、6-检查子项、7-手术和操作")
+    private Integer type;
+    /**
+     * 内容类型：1-化验、辅检、手术和操作、诊断、药品静态信息，2-注意事项，3-临床路径，4-治疗方案
+     */
+    private List<Integer> contentTypes;
+
+    private String mrId;
+}

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

@@ -0,0 +1,18 @@
+package com.diagbot.vo;
+
+import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @Description:量表规则入参
+ * @Author:zhoutg
+ * @time: 2020/7/29 15:34
+ */
+@Data
+public class ScaleVO extends SearchData {
+
+    // 量表规则列表
+    private List<String> codeList = new ArrayList<>();
+}

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

@@ -28,4 +28,6 @@ public class StaticKnowledgeVO {
      * 内容类型：1-化验、辅检、手术和操作、诊断、药品静态信息，2-注意事项，3-临床路径，4-治疗方案
      */
     private List<Integer> contentTypes;
+
+    private String mrId;
 }