云平台转调

src/main/java/com/diagbot/aggregate/AssembleAggregate.java

@@ -402,7 +402,7 @@ public class AssembleAggregate {
 
                 String hisDetailName = "";
                 if(type.equals(ConceptTypeEnum.LisPack.getKey())) {
-                    hisDetailName = item.getClass().getMethod("getHisDetailName").invoke(item).toString();
+                    hisDetailName = item.getClass().getMethod("getDetailName").invoke(item).toString();
                     if (StringUtil.isBlank(hisDetailName)) {
                         hisDetailName = "";
                     }

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

@@ -48,6 +48,7 @@ public class ResourceServerConfigurer extends ResourceServerConfigurerAdapter {
                 .antMatchers("/tran/mappingConfig/precDataMatch_remote").permitAll()
                 .antMatchers("/tran/mappingConfig/importExcel").permitAll()
                 .antMatchers("/tran/mappingConfig/exportExcel").permitAll()
+                .antMatchers("/tran/mappingConfig/exportExcel_remote").permitAll()
                 .antMatchers("/tran/mappingConfig/getPage").permitAll()
                 .antMatchers("/tran/mappingConfig/getRecord").permitAll()
                 .antMatchers("/tran/mappingConfig/getRelatedMapping").permitAll()

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

@@ -91,6 +91,7 @@ public class UrlAccessDecisionManager implements AccessDecisionManager {
                 || matchers("/tran/mappingConfig/precDataMatch_remote", request)
                 || matchers("/tran/mappingConfig/importExcel", request)
                 || matchers("/tran/mappingConfig/exportExcel", request)
+                || matchers("/tran/mappingConfig/exportExcel_remote", request)
                 || matchers("/tran/mappingConfig/getPage", request)
                 || matchers("/tran/mappingConfig/getRecord", request)
                 || matchers("/tran/mappingConfig/getRelatedMapping", request)

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

@@ -266,6 +266,25 @@ public class MappingConfigFacade extends MappingConfigServiceImpl {
         exportExcel(response, page.getRecords(), mappingConfigPageVO.getType(), "映射");
     }
 
+    /**
+     * 导出关联关系
+     *
+     * @param mappingConfigPageVO
+     * @return
+     */
+    public List<MappingConfigWrapper> exportExcel_remote(MappingConfigPageVO mappingConfigPageVO) {
+        if (mappingConfigPageVO.getHospitalId() == null) {
+            mappingConfigPageVO.setHospitalId(Long.valueOf(SysUserUtils.getCurrentHospitalID()));
+        }
+        mappingConfigPageVO.setHisName("");
+        mappingConfigPageVO.setHisDetailName("");
+        mappingConfigPageVO.setUniqueName("");
+        mappingConfigPageVO.setSize(-1L);
+
+        IPage<MappingConfigWrapper> page = this.getPage(mappingConfigPageVO);
+        return page.getRecords();
+    }
+
     /**
      * 读取导入数据
      *
@@ -345,6 +364,7 @@ public class MappingConfigFacade extends MappingConfigServiceImpl {
 
     /**
      * 远程调用预匹配接口
+     *
      * @param file
      * @param type
      * @return

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

@@ -93,6 +93,16 @@ public class MappingConfigController {
         mappingConfigFacade.exportExcel(response, mappingConfigPageVO);
     }
 
+    @ApiOperation(value = "数据导出_远程调用[by:zhaops]",
+            notes = "")
+    @PostMapping("/exportExcel_remote")
+    @SysLogger("exportExcel_remote")
+    @ApiIgnore
+    public RespDTO<List<MappingConfigWrapper>> exportExcel_remote(@RequestBody @Valid MappingConfigPageVO mappingConfigPageVO) {
+        List<MappingConfigWrapper> data = mappingConfigFacade.exportExcel_remote(mappingConfigPageVO);
+        return RespDTO.onSuc(data);
+    }
+
     @ApiOperation(value = "分页查询[by:zhaops]", notes = "")
     @PostMapping("/getPage")
     @SysLogger("getPage")