This reverts commit 565e3ba2

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

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

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

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

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

@@ -20,9 +20,6 @@ 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;
@@ -49,8 +46,6 @@ public class KlConceptStaticFacade {
     private ConceptInfoFacade conceptInfoFacade;
     @Autowired
     private SysUserFacade sysUserFacade;
-    @Autowired
-    private MrFacade mrFacade;
 
 
     /**
@@ -81,13 +76,7 @@ public class KlConceptStaticFacade {
      * @return
      */
     public StaticKnowledgeDTO getStaticKnowledge(StaticKnowledgeVO staticKnowledgeVO) {
-        PushJoinVO mr = mrFacade.getMr(staticKnowledgeVO.getMrId());
-        ScaleVO scaleVO = new ScaleVO();
-        BeanUtil.copyProperties(mr, scaleVO);
-        ScaleStaticAllVO scaleStaticAllVO = new ScaleStaticAllVO();
-        scaleStaticAllVO.setScaleVO(scaleVO);
-        scaleStaticAllVO.setStaticKnowledgeVO(staticKnowledgeVO);
-        RespDTO<StaticKnowledgeDTO> respDTO = cdssCoreClient.getStaticKnowledge(scaleStaticAllVO);
+        RespDTO<StaticKnowledgeDTO> respDTO = cdssCoreClient.getStaticKnowledge(staticKnowledgeVO);
         if (RespDTOUtil.respIsOK(respDTO)) {
             StaticKnowledgeDTO staticKnowledgeDTO = respDTO.data;
             return staticKnowledgeDTO;

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

@@ -1,16 +0,0 @@
-package com.diagbot.vo;
-
-import lombok.Getter;
-import lombok.Setter;
-
-/**
- * @author wangfeng
- * @Description:
- * @date 2021-06-18 10:16
- */
-@Setter
-@Getter
-public class ScaleStaticAllVO {
-    private StaticKnowledgeVO staticKnowledgeVO;
-    private ScaleVO scaleVO;
-}

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

@@ -1,18 +0,0 @@
-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

@@ -3,6 +3,7 @@ package com.diagbot.vo;
 import lombok.Getter;
 import lombok.Setter;
 
+import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 import java.util.List;
 
@@ -27,6 +28,4 @@ public class StaticKnowledgeVO {
      * 内容类型：1-化验、辅检、手术和操作、诊断、药品静态信息，2-注意事项，3-临床路径，4-治疗方案
      */
     private List<Integer> contentTypes;
-
-    private String mrId;
 }