Merge remote-tracking branch 'origin/push-dev' into push-dev-similar

algorithm/src/main/java/org/algorithm/core/neural/dataset/NNDataSet.java

@@ -27,7 +27,7 @@ public abstract class NNDataSet {
 
     // 再分词和疾病过滤相关容器
     protected final Map<String, String> RE_SPLIT_WORD_DICT = new HashMap<>();  // 在分词表
-    protected final List<String> FEATURE_NAME_STORE = new ArrayList<>();  // 特征保存
+    protected List<String> FEATURE_NAME_STORE = new ArrayList<>();  // 特征保存
     protected final Map<String, Map<String, Integer>> RELATED_DIAGNOSIS_DICT = new HashMap<>();  // 特征与疾病相关表
     private boolean doFilterDiagnosis = false;  // 是否做疾病过滤
 
@@ -352,8 +352,9 @@ public abstract class NNDataSet {
      * @param features
      */
     public void storeFeatureNames(Map<String, Map<String, String>> features) {
-        this.FEATURE_NAME_STORE.size();  // this.FEATURE_NAME_STORE.clear() 未知原因会出现数据越界异常，加了这个则没有了
-        this.FEATURE_NAME_STORE.clear();
+//        this.FEATURE_NAME_STORE.size();  // this.FEATURE_NAME_STORE.clear() 未知原因会出现数据越界异常，加了这个则没有了
+//        this.FEATURE_NAME_STORE.clear();
+        this.FEATURE_NAME_STORE = new ArrayList<>();
         this.FEATURE_NAME_STORE.addAll(features.keySet());
     }
 

bigdata-web/src/main/java/org/diagbot/bigdata/work/ResultDataProxy.java

@@ -151,13 +151,13 @@ public class ResultDataProxy {
      * @return
      */
     public ResponseData resultSexAgeFilter(HttpServletRequest request, ResponseData responseData, SearchData searchData) {
-        if (responseData.getLabs().size() > 0) {//化验
+        if (responseData.getLabs() != null && responseData.getLabs().size() > 0) {//化验
             responseData.setLabs(sexFilter(request, responseData.getLabs(), searchData, Constants.feature_type_lis));
         }
-        if (responseData.getPacs().size() > 0) {//辅检
+        if (responseData.getPacs() != null && responseData.getPacs().size() > 0) {//辅检
             responseData.setPacs(sexFilter(request, responseData.getPacs(), searchData, Constants.feature_type_pacs));
         }
-        if (responseData.getVitals().size() > 0) {//查体
+        if (responseData.getVitals() != null && responseData.getVitals().size() > 0) {//查体
             responseData.setVitals(sexFilter(request, responseData.getVitals(), searchData, Constants.feature_type_vital));
         }
         return responseData;

push-web/src/main/java/org/diagbot/push/controller/AlgorithmController.java

@@ -153,6 +153,9 @@ public class AlgorithmController extends BaseController {
 //        searchData.setLength(6);    //模型推送最多6个比较合理
         AlgorithmCore core = new AlgorithmCore();
         ResponseData bigDataResponseData = core.algorithm(request, searchData, responseData);
+        bigDataResponseData.setVitals(new ArrayList<>());
+        bigDataResponseData.setLabs(new ArrayList<>());
+        bigDataResponseData.setPacs(new ArrayList<>());
 
         GraphCalculate graphCalculate = new GraphCalculate();
         ResponseData graphResponseData = graphCalculate.calculate(request, searchData);