代码修改

svr/svr-basic/src/main/java/com/yihu/jw/basic/agadmin/controller/resource/ResourceIntegratedController.java

@@ -436,10 +436,16 @@ public class ResourceIntegratedController extends EnvelopRestEndpoint {
            @RequestParam(value = "resourcesCode", required = true) String resourcesCode,
            @ApiParam(name = "metaData", value = "数据元")
            @RequestParam(value = "metaData", required = true) String metaData,
            @ApiParam(name = "type", value = "类型 1全部 2当前页（默认全部）", required = false)
            @RequestParam(value = "type", required = false) String type,
            @ApiParam(name = "searchParams", value = "查询条件")
            @RequestParam(value = "searchParams", required = false) String searchParams, HttpServletResponse response) {
        try {
            Page<Map<String, Object>> result = resourceBrowseService.getCustomizeDataMysql(resourcesCode,metaData,searchParams,1, 99999);
            int size = 99999;
            if("2".equals(type)){
                size = 50;
            }
            Page<Map<String, Object>> result = resourceBrowseService.getCustomizeDataMysql(resourcesCode,metaData,searchParams,1, size);
            List<Map<String, Object>> listMap = result.toList();
            //导出
            String fileName = "档案数据导出";

svr/svr-basic/src/main/java/com/yihu/jw/basic/resource/dao/ResourceBrowseMetadataDao.java

@@ -35,7 +35,7 @@ public class ResourceBrowseMetadataDao {
     * 获取某资源所有数据元
     */
    public List<Map<String,Object>> getAllMetadata(String resourcesCode) throws Exception {
        String sql = "SELECT m.EHR_ID,m.name,m.DICT_CODE ,d.name dictName " +
        String sql = "SELECT m.EHR_ID,m.name,m.DICT_CODE ,d.name dictName,m.COLUMN_TYPE columnType  " +
                "FROM rs_resource_metadata a, rs_resource b, rs_metadata m LEFT JOIN rs_dictionary d on m.dict_code=d.code " +
                "WHERE a.resources_id = b.id " +
                "AND a.metadata_id = m.ehr_id " +

svr/svr-basic/src/main/java/com/yihu/jw/basic/resource/service/ResourceBrowseService.java

@@ -523,9 +523,9 @@ public class ResourceBrowseService extends BaseJpaService {
            if(dataSource==0){
                dataSource = rsResources.getDataSource();
            }
//            if(rsResources.getDataSource()==2&&codeList.size()>1){
//                throw new ApiException("指标统计，只能选择单个指标");
//            }
            if(rsResources.getDataSource()==2&&codeList.size()>1){
                throw new ApiException("指标统计，只能选择单个指标");
            }
            List<RsResourceMetadata> resourceMetadataList = resourceBrowseMetadataDao.findResourceMetadata(code);
            for (RsResourceMetadata metadata:resourceMetadataList){
                filedMap.put(metadata.getMetadataId(),code);

svr/svr-basic/src/main/java/com/yihu/jw/basic/resource/service/ResourceIntegratedService.java

@@ -409,6 +409,7 @@ public class ResourceIntegratedService extends BaseJpaService {
                        metadataMap.put("level", "3");
                        metadataMap.put("code", rsMetadata.get("EHR_ID"));
                        metadataMap.put("name", rsMetadata.get("name"));
                        metadataMap.put("columnType", rsMetadata.get("columnType"));
                        metadataMap.put("id", UUID.randomUUID().toString());
                        metadataMap.put("dictCode", rsMetadata.get("DICT_CODE"));
                        metadataMap.put("dictName", rsMetadata.get("dictName"));