Browse Source

Revert "指标名称显示最新"

This reverts commit 885ef4fb0b4514daebeddae024e309f5ae044389.
wangfeng 5 years ago
parent
commit
2252da69e8
1 changed files with 4 additions and 10 deletions
  1. 4 10
      aipt-service/src/main/java/com/diagbot/facade/IndexDataFacade.java

+ 4 - 10
aipt-service/src/main/java/com/diagbot/facade/IndexDataFacade.java

@@ -72,16 +72,10 @@ public class IndexDataFacade {
         // 根据公表名分组
         //Map<String, List<IndexDataDTO>> dataMap =datas.stream().collect(Collectors.groupingBy(IndexDataDTO::getIndexUnique));
         // 根据公表名分组
-        List<IndexConfigDTO> configdata = indexConfigFacade.getIndexConfig(indexDataFindVO.getDiseaseName());
-        Map<Long, List<IndexDataDTO>> dataMap = data.stream().collect(Collectors.groupingBy(IndexDataDTO::getUniqueId));
-        for (Long key : dataMap.keySet()) {
+        Map<String, List<IndexDataDTO>> dataMap = data.stream().collect(Collectors.groupingBy(IndexDataDTO::getIndexUnique));
+        for (String key : dataMap.keySet()) {
             IndexDTO itemIndexDTO = new IndexDTO();
-            for( IndexConfigDTO dateonfig :configdata){
-            	if(dateonfig.getUniqueId().equals(key)){
-            		itemIndexDTO.setItemName(dateonfig.getIndexUnique());
-            		break;
-            	}
-            }
+            itemIndexDTO.setItemName(key);
             
             List<String> indexUnits = new ArrayList<String>();
             List<String> indexValues = new ArrayList<String>();
@@ -104,7 +98,7 @@ public class IndexDataFacade {
 
         }
         IndexConfigAndDataDTO indexsData = new IndexConfigAndDataDTO();
-        indexsData.setIndexConfigData(configdata);
+        indexsData.setIndexConfigData(indexConfigFacade.getIndexConfig(indexDataFindVO.getDiseaseName()));
         indexsData.setIndexData(list);
         return indexsData;