Merge remote-tracking branch 'origin/dev/triage20201011' into debug

config-server/src/main/resources/shared/aipt-service-local.yml

@@ -97,6 +97,8 @@ mybatis-plus:
 
 io.github.lvyahui8.spring.base-packages: com.diagbot.aggregate
 
+hystrix.command.AINeoServiceClient#push(SearchData).execution.isolation.thread.timeoutInMilliseconds: 360000
+
 ai:
   server:
     address: http://192.168.2.234:5008

config-server/src/main/resources/shared/triage-service-local.yml

@@ -20,3 +20,5 @@ spring:
     password: guest
     publisher-confirms: true
     virtual-host: /
+
+hystrix.command.AiptServiceClient#pushWithExplainV2(SearchVO).execution.isolation.thread.timeoutInMilliseconds: 1800000

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

@@ -81,21 +81,25 @@ public class MRTestFacade {
                             .stream()
                             .filter(i -> StringUtil.isNotBlank(i.getDiseaseName()))
                             .map(i -> i.getDiseaseName())
+                            .distinct()
                             .collect(Collectors.joining("、")));
                     mrTestDTO.setInnerDeptName(diseaseDetails
                             .stream()
                             .filter(i -> StringUtil.isNotBlank(i.getInnerDeptName()))
                             .map(i -> i.getInnerDeptName())
+                            .distinct()
                             .collect(Collectors.joining("、")));
                     mrTestDTO.setOutDeptName(diseaseDetails
                             .stream()
                             .filter(i -> StringUtil.isNotBlank(i.getOutDeptName()))
                             .map(i -> i.getOutDeptName())
+                            .distinct()
                             .collect(Collectors.joining("、")));
                     mrTestDTO.setOutSubDeptName(diseaseDetails
                             .stream()
                             .filter(i -> StringUtil.isNotBlank(i.getOutSubDeptName()))
                             .map(i -> i.getOutSubDeptName())
+                            .distinct()
                             .collect(Collectors.joining("、")));
 
                 }
@@ -118,9 +122,13 @@ public class MRTestFacade {
         if (StringUtil.isBlank(aivo.getHospitalCode())) {
             throw new CommonException(CommonErrorCode.PARAM_IS_NULL, "请输入医院编码");
         }
-        RespDTO<ResponseDataWithExplainV2> res
-                = aiptServiceClient.pushWithExplainV2(assembleFacade.assembleData(aivo, type));
-        RespDTOUtil.respNGDealCover(res, "中间层没有结果返回");
+        RespDTO<ResponseDataWithExplainV2> res = null;
+        int count = 0;
+        do {
+            res = aiptServiceClient.pushWithExplainV2(assembleFacade.assembleData(aivo, type));
+            count++;
+        } while ((res == null || RespDTOUtil.respIsNG(res)||ListUtil.isEmpty(res.data.getDis())) && count <= 5);
+
         List<FeatureRateV2> dis = res.data.getDis();
         if (ListUtil.isNotEmpty(dis)) {
             for (FeatureRateV2 featureRate : dis) {