Merge branch 'develop' into dev/tcm_20210512

src/main/java/com/diagbot/enums/DiagnoseTypeEnum.java

@@ -16,7 +16,8 @@ public enum DiagnoseTypeEnum implements KeyedNamed {
     vigilant(4, "警惕"),
 
     bigDataPush(99, "大数据推送诊断"),
-    possibleUnion(100, "可能诊断");
+    possibleUnion(100, "可能诊断"),
+    pastDisease(101, "既往诊断");
 
     @Setter
     private int key;

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

@@ -11,6 +11,7 @@ import com.diagbot.enums.DiseasePushTypeEnum;
 import com.diagbot.enums.RedisEnum;
 import com.diagbot.exception.CommonErrorCode;
 import com.diagbot.exception.CommonException;
+import com.diagbot.model.entity.Diag;
 import com.diagbot.process.PushProcess;
 import com.diagbot.util.CoreUtil;
 import com.diagbot.util.ListUtil;
@@ -24,6 +25,7 @@ import com.diagbot.vo.StandConvert;
 import com.google.common.collect.Lists;
 import io.github.lvyahui8.spring.facade.DataFacade;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 
 import java.util.HashMap;
@@ -54,6 +56,8 @@ public class PushFacade {
     PushNewServiceClient pushNewServiceClient;
     @Autowired
     RedisUtil redisUtil;
+    @Value("${PushNew.url}")
+    String pushUrl;
 
     /**
      * 推送fac(兼容新版和5.0)
@@ -122,6 +126,7 @@ public class PushFacade {
     public PushDTO pushNewFac(PushVO pushVo) {
         PushDTO pushDTO = new PushDTO();
         Map<String, Object> debug = new LinkedHashMap<>();
+        debug.put("大数据推送地址", pushUrl);
 
         // 模型处理数据
         long start = System.currentTimeMillis();
@@ -162,6 +167,24 @@ public class PushFacade {
         CoreUtil.getDebugStr(start, "总计耗时", debug);
         CoreUtil.getDebugObject("数据", debug, wordCrfDTO);
         pushDTO.getDebug().putAll(debug);
+
+        // 添加既往诊断，不参与业务
+        List<Diag> diagList = wordCrfDTO.getPastLabel().getDiags();
+        List<String> pastDiagList = Lists.newArrayList();
+        if (ListUtil.isNotEmpty(diagList)) {
+            List<PushBaseDTO> pushBaseDTOList = Lists.newArrayList();
+            for (Diag diag : diagList) {
+                String diagName = diag.getName();
+                if (diag.getNegative() == null && !pastDiagList.contains(diagName)) {
+                    PushBaseDTO pushBaseDTO = new PushBaseDTO();
+                    pushBaseDTO.setName(diagName);
+                    pushBaseDTOList.add(pushBaseDTO);
+                    pastDiagList.add(diagName);
+                }
+            }
+            pushDTO.getDis().put(DiagnoseTypeEnum.pastDisease.getName(), pushBaseDTOList);
+        }
+
         return pushDTO;
     }