|
@@ -3,14 +3,7 @@ package com.diagbot.facade;
|
|
import com.alibaba.fastjson.JSONArray;
|
|
import com.alibaba.fastjson.JSONArray;
|
|
import com.diagbot.client.ChiefPresentSimilarityServiceClient;
|
|
import com.diagbot.client.ChiefPresentSimilarityServiceClient;
|
|
import com.diagbot.client.StandConvertServiceClient;
|
|
import com.diagbot.client.StandConvertServiceClient;
|
|
-import com.diagbot.dto.BillNeoDTO;
|
|
|
|
-import com.diagbot.dto.CriticalNeoDTO;
|
|
|
|
-import com.diagbot.dto.HighRiskNeoDTO;
|
|
|
|
-import com.diagbot.dto.NeoPushDTO;
|
|
|
|
-import com.diagbot.dto.PushDTO;
|
|
|
|
-import com.diagbot.dto.StandConvertCrfBatchDTO;
|
|
|
|
-import com.diagbot.dto.StandConvertCrfDTO;
|
|
|
|
-import com.diagbot.entity.node.Disease;
|
|
|
|
|
|
+import com.diagbot.dto.*;
|
|
import com.diagbot.entity.node.Medicine_Code;
|
|
import com.diagbot.entity.node.Medicine_Code;
|
|
import com.diagbot.entity.node.OralMedicine;
|
|
import com.diagbot.entity.node.OralMedicine;
|
|
import com.diagbot.entity.node.YiBaoDisease;
|
|
import com.diagbot.entity.node.YiBaoDisease;
|
|
@@ -29,13 +22,7 @@ import org.springframework.cache.annotation.Cacheable;
|
|
import org.springframework.stereotype.Component;
|
|
import org.springframework.stereotype.Component;
|
|
|
|
|
|
import java.math.BigDecimal;
|
|
import java.math.BigDecimal;
|
|
-import java.util.ArrayList;
|
|
|
|
-import java.util.Arrays;
|
|
|
|
-import java.util.HashMap;
|
|
|
|
-import java.util.Iterator;
|
|
|
|
-import java.util.LinkedHashMap;
|
|
|
|
-import java.util.List;
|
|
|
|
-import java.util.Map;
|
|
|
|
|
|
+import java.util.*;
|
|
|
|
|
|
/**
|
|
/**
|
|
* @Description: 图谱facade
|
|
* @Description: 图谱facade
|
|
@@ -117,7 +104,7 @@ public class NeoFacade {
|
|
List<String> diags = new ArrayList<>();
|
|
List<String> diags = new ArrayList<>();
|
|
// 如果有诊断名称,则通过诊断反推
|
|
// 如果有诊断名称,则通过诊断反推
|
|
// 如果没有诊断名称,则通过其它信息推送诊断
|
|
// 如果没有诊断名称,则通过其它信息推送诊断
|
|
- if (null!=pushVO.getDiagVo() && pushVO.getDiagVo().getDiags().size()==0) {
|
|
|
|
|
|
+ if (null!=pushVO.getDiagVo() && pushVO.getDiagVo().getDiags().size()>0) {
|
|
for (Diag diag : pushVO.getDiagVo().getDiags()) {
|
|
for (Diag diag : pushVO.getDiagVo().getDiags()) {
|
|
diags.add(diag.getName());
|
|
diags.add(diag.getName());
|
|
}
|
|
}
|