Merge remote-tracking branch 'origin/dev/triage20200818_nali' into develop

triage-service/src/main/java/com/diagbot/facade/AIV2Facade.java

@@ -316,16 +316,19 @@ public class AIV2Facade {
                 }
             }
 
-            //返回前两个科室，如果科室相同则去重
+            //返回所有诊断-科室
             if (ListUtil.isNotEmpty(featureRateList)) {
                 for (SYFFeatureDTO syfFeatureDTO : featureRateList) {
-                    if (items.size() == 0
-                            || (items.size() == 1 && !items.get(0).getExtraProperty().equals(syfFeatureDTO.getDeptName()))) {
-                        FeatureRateDTO featureRateDTO = new FeatureRateDTO();
-                        featureRateDTO.setExtraProperty(syfFeatureDTO.getDeptName());
-                        featureRateDTO.setHospitalDepts(syfFeatureDTO.getHospitalDepts());
-                        items.add(featureRateDTO);
+                    FeatureRateDTO featureRateDTO = new FeatureRateDTO();
+                    featureRateDTO.setExtraProperty(syfFeatureDTO.getDeptName());
+                    featureRateDTO.setHospitalDepts(syfFeatureDTO.getHospitalDepts());
+                    if (ListUtil.isNotEmpty(items)) {
+                        Map<String, List<FeatureRateDTO>> itemMap = EntityUtil.makeEntityListMap(items, "extraProperty");
+                        if (itemMap.containsKey(syfFeatureDTO.getDeptName())) {
+                            continue;
+                        }
                     }
+                    items.add(featureRateDTO);
                 }
             }
         }