经典病例搜索功能增加

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

@@ -143,13 +143,13 @@ public interface CdssCoreClient {
     RespDTO<StaticKnowledgeDTO> getStaticKnowledge(@Valid @RequestBody ScaleStaticAllVO scaleStaticAllVO);
 
     /**
-     * 根据名称和类型获取静态知识内容
+     * 根据名称和类型获取经典病历内容
      *
      * @param scaleStaticAllVO
      * @return
      */
     @PostMapping("/kl/conceptStatic/getClassicCaseInfo")
-    RespDTO<ClassicCaseDTO> getClassicCaseInfo(@Valid @RequestBody ScaleStaticAllVO scaleStaticAllVO);
+    RespDTO<StaticKnowledgeDTO> getClassicCaseInfo(@Valid @RequestBody ScaleStaticAllVO scaleStaticAllVO);
 
     /**
      * 分页查询

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

@@ -193,7 +193,7 @@ public class CdssCoreHystrix implements CdssCoreClient {
      * @return
      */
     @Override
-    public RespDTO<ClassicCaseDTO> getClassicCaseInfo(@Valid @RequestBody ScaleStaticAllVO scaleStaticAllVO) {
+    public RespDTO<StaticKnowledgeDTO> getClassicCaseInfo(@Valid @RequestBody ScaleStaticAllVO scaleStaticAllVO) {
         log.error("【hystrix】调用{}异常", "getClassicCaseInfo");
         return null;
     }

src/main/java/com/diagbot/config/ResourceServerConfigurer.java

@@ -54,7 +54,6 @@ public class ResourceServerConfigurer extends ResourceServerConfigurerAdapter {
                 .antMatchers("/tran/mappingConfig/exportExcel").permitAll()
                 .antMatchers("/tran/mappingConfig/exportExcel_remote").permitAll()
                 .antMatchers("/tran/mappingConfig/getPage").permitAll()
-                .antMatchers("/tran/mappingConfig/getClassicCase").permitAll()
                 .antMatchers("/tran/mappingConfig/getRecord").permitAll()
                 .antMatchers("/tran/mappingConfig/getRelatedMapping").permitAll()
                 .antMatchers("/tran/mappingConfig/isExistRecord").permitAll()
@@ -145,6 +144,7 @@ public class ResourceServerConfigurer extends ResourceServerConfigurerAdapter {
                 .antMatchers("/dataPage/docking/getDataService").permitAll()
                 .antMatchers("/dataPage/docking/sendPacsInfos").permitAll()
                 .antMatchers("/dataPage/docking/getStaticKnowledge").permitAll()
+                .antMatchers("/dataPage/docking/getClassicCaseInfo").permitAll()
                 .antMatchers("/dataPage/docking/getDataEngine").permitAll()
                 .antMatchers("/dataPage/docking/addUserAndRole").permitAll()
                 .antMatchers("/**").authenticated();

src/main/java/com/diagbot/config/security/UrlAccessDecisionManager.java

@@ -97,7 +97,6 @@ public class UrlAccessDecisionManager implements AccessDecisionManager {
                 || matchers("/tran/mappingConfig/exportExcel", request)
                 || matchers("/tran/mappingConfig/exportExcel_remote", request)
                 || matchers("/tran/mappingConfig/getPage", request)
-                || matchers("/tran/mappingConfig/getClassicCase", request)
                 || matchers("/tran/mappingConfig/getRecord", request)
                 || matchers("/tran/mappingConfig/getRelatedMapping", request)
                 || matchers("/tran/mappingConfig/isExistRecord", request)
@@ -144,6 +143,7 @@ public class UrlAccessDecisionManager implements AccessDecisionManager {
                 || matchers("/kl/conceptInfo/classicCaseIndex", request)
                 || matchers("/kl/conceptInfo/staticKnowledgeIndexWithoutInfo", request)
                 || matchers("/kl/conceptInfo/getStaticKnowledge", request)
+                || matchers("/kl/conceptInfo/getClassicCaseInfo", request)
                 || matchers("/kl/conceptInfo/getStaticKnowledgeForHIS", request)
                 || matchers("/kl/conceptInfo/isExistForHIS", request)
                 || matchers("/kl/conceptInfo/getPage", request)

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

@@ -117,7 +117,11 @@ public class KlConceptStaticFacade {
             scaleStaticAllVO.setHospitalId(-1L);
         }
         BeanUtil.copyProperties(staticKnowledgeVO, scaleStaticAllVO);
-        RespDTO<StaticKnowledgeDTO> respDTO = cdssCoreClient.getStaticKnowledge(scaleStaticAllVO);
+        RespDTO<StaticKnowledgeDTO> respDTO;
+        if (staticKnowledgeVO.getType().equals(11))
+            respDTO = cdssCoreClient.getClassicCaseInfo(scaleStaticAllVO);
+        else
+            respDTO = cdssCoreClient.getStaticKnowledge(scaleStaticAllVO);
         if (RespDTOUtil.respIsOK(respDTO)) {
             StaticKnowledgeDTO staticKnowledgeDTO = respDTO.data;
             return staticKnowledgeDTO;
@@ -126,38 +130,6 @@ public class KlConceptStaticFacade {
         }
     }
 
-    /**
-     * 获取经典病例
-     *
-     * @param staticKnowledgeVO
-     * @return
-     */
-    public ClassicCaseDTO getClassicCaseInfo(StaticKnowledgeVO staticKnowledgeVO) {
-        ScaleStaticAllVO scaleStaticAllVO = new ScaleStaticAllVO();
-        if (staticKnowledgeVO.getType() == 8) {
-            PushJoinVO mr = mrFacade.getMr(staticKnowledgeVO.getMrId());
-            if (null != mr) {
-                SearchData searchData = new SearchData();
-                BeanUtil.copyProperties(mr, searchData);
-                //入参映射
-                searchData = assembleFacade.assembleData(searchData);
-                BeanUtil.copyProperties(searchData, scaleStaticAllVO);
-            } else {
-                scaleStaticAllVO.setHospitalId(-1L);
-            }
-        } else {
-            scaleStaticAllVO.setHospitalId(-1L);
-        }
-        BeanUtil.copyProperties(staticKnowledgeVO, scaleStaticAllVO);
-        RespDTO<ClassicCaseDTO> respDTO = cdssCoreClient.getClassicCaseInfo(scaleStaticAllVO);
-        if (RespDTOUtil.respIsOK(respDTO)) {
-            ClassicCaseDTO classicCaseDTO = respDTO.data;
-            return classicCaseDTO;
-        } else {
-            throw new CommonException(CommonErrorCode.SERVER_IS_ERROR, respDTO.msg);
-        }
-    }
-
     /**
      * 医院端获取静态知识（对接）
      *

src/main/java/com/diagbot/web/ConceptInfoController.java

@@ -81,17 +81,6 @@ public class ConceptInfoController {
         return RespDTO.onSuc(data);
     }
 
-    @ApiOperation(value = "页面获取经典病例",
-            notes = "type： 类型：11-经典病例 <br>" +
-                    "contentTypes： ：1-经典病例<br>" +
-                    "name： 标准术语名称<br>")
-    @PostMapping("/getClassicCaseInfo")
-    @SysLogger("getClassicCaseInfo")
-    public RespDTO<ClassicCaseDTO> getClassicCaseInfo(@Valid @RequestBody StaticKnowledgeVO staticKnowledgeVO) {
-        ClassicCaseDTO data = klConceptStaticFacade.getClassicCaseInfo(staticKnowledgeVO);
-        return RespDTO.onSuc(data);
-    }
-
     @ApiOperation(value = "对接获取静态知识[zhaops]",
             notes = "type： 类型：1-诊断、2-药品、3-检验套餐、4-检验细项、5-检查、7-手术和操作、8-量表、9-护理、10-政策法规 <br>" +
                     "contentTypes： 内容类型（多选）：1-静态信息、2-注意事项、3-临床路径、4-治疗方案、5-诊疗指南 <br>" +