Browse Source

Merge remote-tracking branch 'remotes/origin/master' into his/chuangye

# Conflicts:
#	graph-web/src/main/resources/url.properties
#	graphdb/src/main/resources/application.yml
lipc 6 years ago
parent
commit
55eb4c7ecf
81 changed files with 3578 additions and 412474 deletions
  1. 1 1
      algorithm/src/main/resources/algorithm.properties
  2. 189 110
      bigdata-web/src/main/java/org/diagbot/bigdata/common/ApplicationCacheUtil.java
  3. 1 1
      bigdata-web/src/main/java/org/diagbot/bigdata/controller/AlgorithmController.java
  4. 1 0
      bigdata-web/src/main/java/org/diagbot/bigdata/util/BigDataConstants.java
  5. 4 2
      bigdata-web/src/main/java/org/diagbot/bigdata/work/AlgorithmCore.java
  6. 185 53
      bigdata-web/src/main/java/org/diagbot/bigdata/work/ParamsDataProxy.java
  7. 18 24
      bigdata-web/src/main/java/org/diagbot/bigdata/work/ResultDataProxy.java
  8. 1 1
      bigdata-web/src/main/resources/application.yml
  9. 0 899
      bigdata-web/src/main/resources/doc_result_mapping_diag.dict
  10. 0 24253
      bigdata-web/src/main/resources/doc_result_mapping_filter.dict
  11. 0 921
      bigdata-web/src/main/resources/doc_result_mapping_vital.dict
  12. 0 79
      bigdata-web/src/main/resources/kl_result_mapping_standword.dict
  13. 45 8
      bigdata-web/src/test/java/org/diagbot/AddStandWordTest.java
  14. 1 1
      bigdata-web/src/test/java/org/diagbot/CacheFileManagerTest.java
  15. 36 0
      common-push/pom.xml
  16. 11 0
      common-push/src/main/java/org/diagbot/common/push/Test.java
  17. 426 0
      common-push/src/main/java/org/diagbot/common/push/cache/CacheFileManager.java
  18. 524 0
      common-push/src/main/java/org/diagbot/common/push/filter/ClassifyDiag.java
  19. 79 0
      common-push/src/main/java/org/diagbot/common/push/filter/PreResult.java
  20. 45 0
      common-push/src/main/java/org/diagbot/common/push/filter/PretreatmentFilter.java
  21. 88 0
      common-push/src/main/java/org/diagbot/common/push/filter/pretreat/Pretreatment.java
  22. 41 0
      common-push/src/main/java/org/diagbot/common/push/filter/pretreat/PretreatmentLis.java
  23. 17 0
      common-push/src/main/java/org/diagbot/common/push/filter/pretreat/PretreatmentSymptom.java
  24. 17 0
      common-push/src/main/java/org/diagbot/common/push/filter/pretreat/PretreatmentVital.java
  25. 8 0
      common-service/src/main/java/org/diagbot/common/javabean/MedicalIndication.java
  26. 1 1
      common-service/src/main/java/org/diagbot/common/javabean/MedicalIndicationDetail.java
  27. 59 0
      common-service/src/main/java/org/diagbot/common/javabean/Rule.java
  28. 9 0
      common-service/src/main/java/org/diagbot/common/work/FeatureRate.java
  29. 19 0
      common-service/src/main/java/org/diagbot/common/work/ResponseData.java
  30. 30 0
      common-service/src/main/java/org/diagbot/common/work/SearchData.java
  31. 5 2
      graph-web/src/main/java/org/diagbot/graphWeb/controller/GraphController.java
  32. 7 4
      graph-web/src/main/java/org/diagbot/graphWeb/work/DiseaseCalculate.java
  33. 76 0
      graph-web/src/main/java/org/diagbot/graphWeb/work/FilterSortDiag.java
  34. 79 10
      graph-web/src/main/java/org/diagbot/graphWeb/work/GraphCalculate.java
  35. 13 1
      graph-web/src/main/java/org/diagbot/graphWeb/work/LisPacsCalculate.java
  36. 19 19
      graph-web/src/main/resources/application.yml
  37. 1 1
      graph/src/main/java/org/diagbot/graph/jdbc/DriverManager.java
  38. 276 24
      graph/src/main/java/org/diagbot/graph/jdbc/Neo4jAPI.java
  39. 154 25
      graph/src/main/java/org/diagbot/graph/util/CacheUtil.java
  40. 4 8
      graph/src/main/resources/bolt.properties
  41. 0 70
      graph/src/main/resources/lexicon.dict
  42. 0 21296
      graph/src/main/resources/sexAge.dict
  43. 148 1
      graph/src/test/java/org/diagbot/graph/CacheFile.java
  44. 55 0
      graph/src/test/java/org/diagbot/graph/DemoTest.java
  45. 4 1
      graphdb/src/main/java/org/diagbot/repository/BaseNodeRepository.java
  46. 66 11
      graphdb/src/main/java/org/diagbot/service/impl/KnowledgeServiceImpl.java
  47. 1 0
      graphdb/src/main/java/org/diagbot/vo/domain/FeatureRate.java
  48. 2 0
      graphdb/src/main/java/org/diagbot/web/KnowledgeController.java
  49. 5 1
      nlp-web/src/main/java/org/diagbot/nlp/controller/FeatureController.java
  50. 1 1
      nlp-web/src/main/resources/application.yml
  51. 4 0
      nlp/src/main/java/org/diagbot/nlp/feature/FeatureAnalyze.java
  52. 7 1
      nlp/src/main/java/org/diagbot/nlp/feature/FeatureType.java
  53. 8 10
      nlp/src/main/java/org/diagbot/nlp/feature/extract/CaseToken.java
  54. 6 0
      nlp/src/main/java/org/diagbot/nlp/feature/extract/CaseTokenFactory.java
  55. 111 0
      nlp/src/main/java/org/diagbot/nlp/feature/extract/CaseTokenTime.java
  56. 13 0
      nlp/src/main/java/org/diagbot/nlp/participle/cfg/DefaultConfig.java
  57. 4 2
      nlp/src/main/java/org/diagbot/nlp/util/Constants.java
  58. 1 1
      nlp/src/main/java/org/diagbot/nlp/util/DictUtil.java
  59. 3 2
      nlp/src/main/java/org/diagbot/nlp/util/NlpCache.java
  60. 40 1
      nlp/src/main/java/org/diagbot/nlp/util/NlpUtil.java
  61. 0 1
      nlp/src/main/resources/chronic.dict
  62. 0 0
      nlp/src/main/resources/classify.dict
  63. 3 0
      nlp/src/main/resources/nlp.properties
  64. 0 2630
      nlp/src/main/resources/push-tc.dict
  65. 0 79
      nlp/src/main/resources/relation.dict
  66. 0 16344
      nlp/src/main/resources/synonym.dict
  67. 0 345541
      nlp/src/main/resources/tc.dict
  68. 7 1
      nlp/src/test/java/org/diagbot/nlp/test/ConceptTest.java
  69. 8 0
      pom.xml
  70. 12 2
      public/src/main/java/org/diagbot/pub/jdbc/MysqlJdbc.java
  71. 6 0
      push-web/pom.xml
  72. 5 0
      push-web/src/main/java/org/diagbot/push/config/InterceptorConfig.java
  73. 56 12
      push-web/src/main/java/org/diagbot/push/controller/AlgorithmController.java
  74. 49 0
      push-web/src/main/java/org/diagbot/push/controller/CacheFileManagerController.java
  75. 16 0
      push-web/src/main/java/org/diagbot/push/controller/ParticipleController.java
  76. 19 0
      push-web/src/main/java/org/diagbot/push/controller/RelationController.java
  77. 375 0
      push-web/src/main/java/org/diagbot/push/convert/PreProcess.java
  78. 1 1
      push-web/src/main/resources/application.yml
  79. 49 14
      push-web/src/main/resources/static/pages/algorithm/list.html
  80. 1 1
      push-web/src/main/resources/static/pages/extract/feature.html
  81. 2 2
      push-web/src/main/resources/static/pages/relation/sample.html

+ 1 - 1
algorithm/src/main/resources/algorithm.properties

@@ -18,4 +18,4 @@ diagnosisToVital.version=diagnosis_to_vital_1
 
 ############################ relation extraction ######################################
 relationExtraction=relation_extraction
-relationExtractionUrl=http://192.168.3.40:54321/api/re/predict
+relationExtractionUrl=http://192.168.3.40:54321/api/re/predict

+ 189 - 110
bigdata-web/src/main/java/org/diagbot/bigdata/common/ApplicationCacheUtil.java

@@ -2,6 +2,7 @@ package org.diagbot.bigdata.common;
 
 import org.diagbot.bigdata.dao.model.ResultMappingFilter;
 import org.diagbot.bigdata.util.BigDataConstants;
+import org.diagbot.common.javabean.Rule;
 import org.diagbot.nlp.participle.ParticipleUtil;
 import org.diagbot.nlp.participle.cfg.Configuration;
 import org.diagbot.nlp.participle.cfg.DefaultConfig;
@@ -22,14 +23,18 @@ public class ApplicationCacheUtil {
     public static Map<String, String> standard_info_classify_map = null;
     //树形结构存储大小类
     public static Map<String, NlpCache.Node> standard_info_type_tree_map = null;
-    //体征衍射
-    public static Map<String, String> doc_result_mapping_vital_map = null;
+//    体征衍射
+//    public static Map<String, String> doc_result_mapping_vital_map = null;
     //诊断科室衍射
     public static Map<String, String> doc_result_mapping_diag_map = null;
     //特征性别 年龄过滤等
     public static Map<String, Map<String, ResultMappingFilter>> doc_result_mapping_filter_map = null;
     //诊断依据标准词
     public static Map<String, List<Map<String, String>>> kl_result_mapping_standword_map = null;
+    // 规则
+    public static Map<String, List<Rule>> rule_filter_map = null;
+    public static Map<String, List<Rule>> kl_rule_filter_map = null;
+
 
     public static Map<String, Map<String, String>> getStandard_info_synonym_map() {
         if (standard_info_synonym_map == null) {
@@ -52,145 +57,215 @@ public class ApplicationCacheUtil {
         return standard_info_type_tree_map;
     }
 
-    public static Map<String, String> getDoc_result_mapping_vital_map() {
-        if (doc_result_mapping_vital_map == null) {
-            Configuration configuration = new DefaultConfig();
-            doc_result_mapping_vital_map = configuration.loadMapDict("doc_result_mapping_vital.dict");
-        }
-        return doc_result_mapping_vital_map;
-    }
+//    /**
+//     * 現已無用
+//     * @return
+//     */
+//    public static Map<String, String> getDoc_result_mapping_vital_map() {
+//        if (doc_result_mapping_vital_map == null) {
+//            Configuration configuration = new DefaultConfig();
+//            doc_result_mapping_vital_map = configuration.loadMapDict("doc_result_mapping_vital.dict");
+//        }
+//        return doc_result_mapping_vital_map;
+//    }
 
     public static Map<String, String> getDoc_result_mapping_diag_map() {
         if (doc_result_mapping_diag_map == null) {
-            Configuration configuration = new DefaultConfig();
-            doc_result_mapping_diag_map = configuration.loadMapDict("doc_result_mapping_diag.dict");
+            createDoc_result_mapping_diag_map();
         }
         return doc_result_mapping_diag_map;
     }
 
-    public static Map<String, Map<String, ResultMappingFilter>> getDoc_result_mapping_filter_map() {
+    public static Map<String, String> createDoc_result_mapping_diag_map() {
         Configuration configuration = new DefaultConfig();
+        doc_result_mapping_diag_map = configuration.loadMapDict("bigdata_diag_2_dept.dict");
+        return doc_result_mapping_diag_map;
+    }
+
+    public static Map<String, Map<String, ResultMappingFilter>> getDoc_result_mapping_filter_map() {
         if (doc_result_mapping_filter_map == null) {
-            List<String> fileContents = configuration.readFileContents("doc_result_mapping_filter.dict");
-            String[] line_string;
-            List<ResultMappingFilter> resultMappingFilters = new ArrayList<>();
-            try {
-                for (int i = 0; i < fileContents.size(); i++) {
-                    line_string = org.apache.commons.lang3.StringUtils.split(fileContents.get(i), "\\|");
-                    if (line_string.length == 5) {
-                        ResultMappingFilter resultMappingFilter = new ResultMappingFilter();
-                        resultMappingFilter.setFeatureName(line_string[0]);
-                        resultMappingFilter.setFeatureType(line_string[1]);
-                        resultMappingFilter.setSex(line_string[2]);
-                        resultMappingFilter.setAgeStart(Integer.parseInt(line_string[3]));
-                        resultMappingFilter.setAgeEnd(Integer.parseInt(line_string[4]));
-                        resultMappingFilters.add(resultMappingFilter);
-                    }
+            createDoc_result_mapping_filter_map();
+        }
+        return doc_result_mapping_filter_map;
+    }
+
+    public static Map<String, Map<String, ResultMappingFilter>> createDoc_result_mapping_filter_map() {
+        Configuration configuration = new DefaultConfig();
+        List<String> fileContents = configuration.readFileContents("bigdata_sex_age_filter.dict");
+        String[] line_string;
+        List<ResultMappingFilter> resultMappingFilters = new ArrayList<>();
+        try {
+            for (int i = 0; i < fileContents.size(); i++) {
+                line_string = org.apache.commons.lang3.StringUtils.split(fileContents.get(i), "\\|");
+                if (line_string.length == 5) {
+                    ResultMappingFilter resultMappingFilter = new ResultMappingFilter();
+                    resultMappingFilter.setFeatureName(line_string[0]);
+                    resultMappingFilter.setFeatureType(line_string[1]);
+                    resultMappingFilter.setSex(line_string[2]);
+                    resultMappingFilter.setAgeStart(Integer.parseInt(line_string[3]));
+                    resultMappingFilter.setAgeEnd(Integer.parseInt(line_string[4]));
+                    resultMappingFilters.add(resultMappingFilter);
                 }
-            } catch (Exception e) {
-                e.printStackTrace();
             }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
 
-            doc_result_mapping_filter_map = new HashMap<>();
-            Map<String, ResultMappingFilter> filterMap = null;
-            for (ResultMappingFilter resultMappingFilter : resultMappingFilters) {
-                filterMap = doc_result_mapping_filter_map.get(resultMappingFilter.getFeatureType());
-                if (filterMap == null) {
-                    filterMap = new HashMap<>();
-                }
-                filterMap.put(resultMappingFilter.getFeatureName(), resultMappingFilter);
-                doc_result_mapping_filter_map.put(resultMappingFilter.getFeatureType(), filterMap);
+        doc_result_mapping_filter_map = new HashMap<>();
+        Map<String, ResultMappingFilter> filterMap = null;
+        for (ResultMappingFilter resultMappingFilter : resultMappingFilters) {
+            filterMap = doc_result_mapping_filter_map.get(resultMappingFilter.getFeatureType());
+            if (filterMap == null) {
+                filterMap = new HashMap<>();
             }
+            filterMap.put(resultMappingFilter.getFeatureName(), resultMappingFilter);
+            doc_result_mapping_filter_map.put(resultMappingFilter.getFeatureType(), filterMap);
         }
         return doc_result_mapping_filter_map;
     }
 
     public static Map<String, List<Map<String, String>>> getKl_result_mapping_standword_map() {
         if (kl_result_mapping_standword_map == null) {
-            kl_result_mapping_standword_map = new HashMap<>();
-            Configuration configuration = new DefaultConfig();
-            List<String> fileContents = configuration.readFileContents("kl_result_mapping_standword.dict");
-            List<Map<String, String>> standWordObjValList = null;
-            Map<String, String> standWordObjVal = null;
-            String operation = ">=|≥|>|大于|>|超过|<=|≤|<|小于|<|少于";
-            try {
-                for (String fileContent : fileContents) {
-                    LexemePath<Lexeme> lexemes = null;
-                    String op = "";
-                    String[] fileContentSplit = null;
-                    //每一个标准词根据大于小于符号切开,不然进行分词时还是会得到原本的标准词
-                    if (fileContent.contains(">") || fileContent.contains("大于")
-                            || fileContent.contains(">") || fileContent.contains("超过")) {
-                        op = ">";
-                        fileContentSplit = fileContent.split(operation);
-                    } else if (fileContent.contains("<") || fileContent.contains("小于")
-                            || fileContent.contains("<") || fileContent.contains("少于")) {
-                        op = "<";
-                        fileContentSplit = fileContent.split(operation);
-                    } else if (fileContent.contains(">=") || fileContent.contains("≥")){
-                        op = ">=";
-                        fileContentSplit = fileContent.split(operation);
-                    } else if (fileContent.contains("<=") || fileContent.contains("≤")) {
-                        op = "<=";
-                        fileContentSplit = fileContent.split(operation);
-                    } else {
-                        continue;
-                    }
-                    LexemePath<Lexeme> lexemeWord = null;
-                    //每一个标准词切开后进行分词
-                    for (String fileContentWords : fileContentSplit) {
-                        lexemeWord = ParticipleUtil.participle(fileContentWords);
-                        if (lexemeWord != null) {
-                            if (null == lexemes) {
-                                lexemes = lexemeWord;
-                            } else {
-                                for (Lexeme lexeme : lexemeWord) {
-                                    lexemes.add(lexeme);
-                                }
+            createKl_result_mapping_standword_map();
+        }
+        return kl_result_mapping_standword_map;
+    }
+
+    public static Map<String, List<Map<String, String>>> createKl_result_mapping_standword_map() {
+        kl_result_mapping_standword_map = new HashMap<>();
+        Configuration configuration = new DefaultConfig();
+        List<String> fileContents = configuration.readFileContents("bigdata_value_analyze.dict");
+        List<Map<String, String>> standWordObjValList = null;
+        Map<String, String> standWordObjVal = null;
+        String operation = ">=|≥|>|大于|>|超过|<=|≤|<|小于|<|少于";
+        try {
+            for (String fileContent : fileContents) {
+                LexemePath<Lexeme> lexemes = null;
+                String op = "";
+                String[] fileContentSplit = null;
+                //每一个标准词根据大于小于符号切开,不然进行分词时还是会得到原本的标准词
+                if (fileContent.contains(">") || fileContent.contains("大于")
+                        || fileContent.contains(">") || fileContent.contains("超过")) {
+                    op = ">";
+                    fileContentSplit = fileContent.split(operation);
+                } else if (fileContent.contains("<") || fileContent.contains("小于")
+                        || fileContent.contains("<") || fileContent.contains("少于")) {
+                    op = "<";
+                    fileContentSplit = fileContent.split(operation);
+                } else if (fileContent.contains(">=") || fileContent.contains("≥")){
+                    op = ">=";
+                    fileContentSplit = fileContent.split(operation);
+                } else if (fileContent.contains("<=") || fileContent.contains("≤")) {
+                    op = "<=";
+                    fileContentSplit = fileContent.split(operation);
+                } else {
+                    continue;
+                }
+                LexemePath<Lexeme> lexemeWord = null;
+                //每一个标准词切开后进行分词
+                for (String fileContentWords : fileContentSplit) {
+                    lexemeWord = ParticipleUtil.participle(fileContentWords);
+                    if (lexemeWord != null) {
+                        if (null == lexemes) {
+                            lexemes = lexemeWord;
+                        } else {
+                            for (Lexeme lexeme : lexemeWord) {
+                                lexemes.add(lexeme);
                             }
                         }
                     }
-                    String standWordObjKey = "";
-                    standWordObjValList = new ArrayList<>();
-                    standWordObjVal = new HashMap<>();
-                    int i = 0;
-                    for (Lexeme lexeme : lexemes) {
-                        i++;
-                        if (lexeme.getProperty().contains(",")) {
-                            setProterty(lexeme); //如果分词后词性有多个,只选一个(暂时只处理症状,体征)
-                        }
-                        NegativeEnum lexemeNegativeEnum = NegativeEnum.parseOfValue(lexeme.getProperty());
-                        if (lexemeNegativeEnum == NegativeEnum.SYMPTOM || lexemeNegativeEnum == NegativeEnum.CAUSE
-                                || lexemeNegativeEnum == NegativeEnum.VITAL_INDEX) {
-                            if (!kl_result_mapping_standword_map.containsKey(lexeme.getText())) {
-                                kl_result_mapping_standword_map.put(lexeme.getText(), standWordObjValList);
-                            } else {
-                                standWordObjKey = lexeme.getText();
-                            }
-                        } else if (lexemeNegativeEnum == NegativeEnum.DIGITS) {
-                            standWordObjVal.put("value", lexeme.getText());
-                        } else if (lexemeNegativeEnum == NegativeEnum.UNIT
-                                || lexemeNegativeEnum == NegativeEnum.EVENT_TIME) {
-                            standWordObjVal.put("unit", lexeme.getText().toLowerCase());
+                }
+                String standWordObjKey = "";
+                standWordObjValList = new ArrayList<>();
+                standWordObjVal = new HashMap<>();
+                int i = 0;
+                for (Lexeme lexeme : lexemes) {
+                    i++;
+                    if (lexeme.getProperty().contains(",")) {
+                        setProterty(lexeme); //如果分词后词性有多个,只选一个(暂时只处理症状,体征)
+                    }
+                    NegativeEnum lexemeNegativeEnum = NegativeEnum.parseOfValue(lexeme.getProperty());
+                    if (lexemeNegativeEnum == NegativeEnum.SYMPTOM || lexemeNegativeEnum == NegativeEnum.CAUSE
+                            || lexemeNegativeEnum == NegativeEnum.VITAL_INDEX
+                            || lexemeNegativeEnum == NegativeEnum.DIAG_STAND) {
+                        if (!kl_result_mapping_standword_map.containsKey(lexeme.getText())) {
+                            kl_result_mapping_standword_map.put(lexeme.getText(), standWordObjValList);
+                        } else {
+                            standWordObjKey = lexeme.getText();
                         }
-                        if (lexemes.size() == i) {
-                            standWordObjVal.put("op", op);
-                            standWordObjVal.put("standword", fileContent);
-                            if (kl_result_mapping_standword_map.containsKey(standWordObjKey)) {
-                                kl_result_mapping_standword_map.get(standWordObjKey).add(standWordObjVal);
-                            } else {
-                                standWordObjValList.add(standWordObjVal);
-                            }
+                    }
+                    if (lexemeNegativeEnum == NegativeEnum.DIGITS) {
+                        standWordObjVal.put("value", lexeme.getText());
+                    }
+                    if (lexemeNegativeEnum == NegativeEnum.UNIT
+                            || lexemeNegativeEnum == NegativeEnum.EVENT_TIME
+                            || lexemeNegativeEnum == NegativeEnum.OTHER) {
+                        standWordObjVal.put("unit", lexeme.getText().toLowerCase());
+                    }
+                    if (lexemes.size() == i) {
+                        standWordObjVal.put("op", op);
+                        standWordObjVal.put("standword", fileContent);
+                        if (kl_result_mapping_standword_map.containsKey(standWordObjKey)) {
+                            kl_result_mapping_standword_map.get(standWordObjKey).add(standWordObjVal);
+                        } else {
+                            standWordObjValList.add(standWordObjVal);
                         }
                     }
                 }
-            } catch (Exception e) {
-                e.printStackTrace();
             }
+        } catch (Exception e) {
+            e.printStackTrace();
         }
         return kl_result_mapping_standword_map;
     }
 
+    public static Map<String, List<Rule>> get_rule_filter_map() {
+        if (rule_filter_map == null || rule_filter_map.size() == 0) {
+            create_rule_filter_map();
+        }
+        return rule_filter_map;
+    }
+
+    public static void create_rule_filter_map() {
+        rule_filter_map = new HashMap<>();
+        List<Rule> rulelist;
+        Map<String, String> rule;
+        String key;
+
+        String[] labels = {"set_name","idx_name","min_operator","min_value","min_unit",
+                "max_operator","max_value","max_unit","eq_operator","eq_value","eq_unit","remind"};
+
+        Configuration configuration = new DefaultConfig();
+        List<String> fileContents = configuration.readFileContents("rule_filter.dict");
+
+        for (String line:fileContents) {
+            rule = new HashMap<>();
+            String[] content = line.split("\\|");
+            if (labels.length == content.length) {
+//                for (int i=0; i<labels.length; i++) {
+//                    rule.put(labels[i], content[i]);
+//                }
+//                key = content[0] + "--" + content[1];
+                key = content[1];
+                if (rule_filter_map.get(key) == null) {
+                    rule_filter_map.put(key, new ArrayList<>());
+                }
+                rulelist = rule_filter_map.get(key);
+                rulelist.add(new Rule(content));
+            }
+        }
+    }
+
+    public static void create_kl_rule_filter_map() {
+        kl_rule_filter_map = new HashMap<>();
+
+        Configuration configuration = new DefaultConfig();
+        List<String> fileContents = configuration.readFileContents("bigdata_rule_filter.dict");
+        for (String line:fileContents) {
+            String[] content = line.split("\\|");
+        }
+    }
+
     public static void setProterty(Lexeme lexeme) {
         for (String featureType : lexeme.getProperty().split(",")) {
             switch (featureType) {
@@ -200,6 +275,10 @@ public class ApplicationCacheUtil {
                 case "33":
                     lexeme.setProperty("33");
                     break;
+                case "70":
+                    lexeme.setProperty("70");
+                    break;
+
             }
         }
     }

+ 1 - 1
bigdata-web/src/main/java/org/diagbot/bigdata/controller/AlgorithmController.java

@@ -34,7 +34,7 @@ public class AlgorithmController extends BaseController {
     public Response<ResponseData> algorithm(HttpServletRequest request, SearchData searchData) throws Exception {
         Response<ResponseData> response = new Response();
         AlgorithmCore core = new AlgorithmCore();
-        ResponseData responseData = core.algorithm(request, searchData);
+        ResponseData responseData = core.algorithm(request, searchData, null);
         response.setData(responseData);
         return response;
     }

+ 1 - 0
bigdata-web/src/main/java/org/diagbot/bigdata/util/BigDataConstants.java

@@ -22,6 +22,7 @@ public class BigDataConstants {
     public final static String feature_type_history = "7";       //历史
     public final static String feature_type_labelpush = "22";       //指标推送
     public final static String feature_type_manju = "11";       //管理评估
+    public final static String feature_type_vital_index = "42"; //体征指标
     public final static String feature_type_feature = "9"; //症状描述中的特征信息 如部位、性质等
 
 //    public final static String standard_info_diag_cache = "standardInfoDiagMap";                    //词典库疾病缓存

+ 4 - 2
bigdata-web/src/main/java/org/diagbot/bigdata/work/AlgorithmCore.java

@@ -25,8 +25,10 @@ import java.util.*;
  **/
 public class AlgorithmCore {
     Logger logger = LoggerFactory.getLogger(AlgorithmCore.class);
-    public ResponseData algorithm(HttpServletRequest request, SearchData searchData) throws Exception {
-        ResponseData responseData = new ResponseData();
+    public ResponseData algorithm(HttpServletRequest request, SearchData searchData, ResponseData responseData) throws Exception {
+        if (responseData == null) {
+            responseData = new ResponseData();
+        }
         //录入文本处理,包括提取特征、推送类型转换等
         ParamsDataProxy paramsDataProxy = new ParamsDataProxy();
         logger.info("页面文本信息:" + searchData.getSymptom());

+ 185 - 53
bigdata-web/src/main/java/org/diagbot/bigdata/work/ParamsDataProxy.java

@@ -28,6 +28,25 @@ import java.util.regex.Pattern;
  **/
 public class ParamsDataProxy {
     Logger logger = LoggerFactory.getLogger(ParamsDataProxy.class);
+    //标准词只处理的词性
+    public static NegativeEnum[] negativeEnums = new NegativeEnum[] { NegativeEnum.VITAL_INDEX, NegativeEnum.SYMPTOM
+            , NegativeEnum.DIGITS, NegativeEnum.EVENT_TIME, NegativeEnum.UNIT, NegativeEnum.DIAG_STAND
+            , NegativeEnum.OTHER};
+    //标准词处理的三元组
+    public static NegativeEnum[][] negativeEnumTriple = {
+            { NegativeEnum.VITAL_INDEX, NegativeEnum.DIGITS, NegativeEnum.UNIT },
+            { NegativeEnum.VITAL_INDEX, NegativeEnum.DIGITS, NegativeEnum.EVENT_TIME },
+            { NegativeEnum.SYMPTOM, NegativeEnum.DIGITS, NegativeEnum.UNIT },
+            { NegativeEnum.SYMPTOM, NegativeEnum.DIGITS, NegativeEnum.EVENT_TIME },
+            { NegativeEnum.DIAG_STAND, NegativeEnum.DIGITS, NegativeEnum.UNIT },
+            { NegativeEnum.DIAG_STAND, NegativeEnum.DIGITS, NegativeEnum.EVENT_TIME },
+            { NegativeEnum.DIAG_STAND, NegativeEnum.DIGITS, NegativeEnum.OTHER }
+    };
+    //标准词处理的二元组
+    public static NegativeEnum[][] negativeEnumTwoTuple = {
+            { NegativeEnum.VITAL_INDEX, NegativeEnum.DIGITS },
+            { NegativeEnum.SYMPTOM, NegativeEnum.DIGITS }
+    };
 
     public void createSearchData(HttpServletRequest request, SearchData searchData) throws Exception {
         //消除空格
@@ -59,10 +78,15 @@ public class ParamsDataProxy {
             searchData.setResourceType(BigDataConstants.resource_type_o);
         }
         //给症状末尾添加诊断依据标准词
-        if (searchData.getSymptom() != null) {
-            LexemePath<Lexeme> featureData = ParticipleUtil.participle(searchData.getSymptom());
-            if (featureData != null) {
-                addStandWord(featureData, ApplicationCacheUtil.getKl_result_mapping_standword_map(), searchData);
+        String[] items = { searchData.getSymptom(), searchData.getOther(), searchData.getVital()
+                , searchData.getLis(), searchData.getPacs(), searchData.getDiag() };
+        String[] itemsType = { "symptom", "other", "vital", "lis", "pacs", "diag" };
+        for (int i = 0; i < items.length; i++) {
+            if (items[i] != null) {
+                LexemePath<Lexeme> featureData = ParticipleUtil.participle(items[i]);
+                if (featureData != null) {
+                    addStandWord(featureData, ApplicationCacheUtil.getKl_result_mapping_standword_map(), searchData, itemsType[i]);
+                }
             }
         }
         //所有信息参与推送
@@ -88,6 +112,9 @@ public class ParamsDataProxy {
             //提取现病史
             featuresList = fa.start(searchData.getSymptom(), FeatureType.FEATURE);
             paramFeatureInit(searchData, featuresList);
+            //提取时间信息
+            featuresList = fa.start(searchData.getSymptom(), FeatureType.TIME);
+            paramFeatureInit(searchData, featuresList);
         }
         if (!StringUtils.isEmpty(searchData.getVital())) {
             //提取体征
@@ -101,7 +128,7 @@ public class ParamsDataProxy {
         }
         if (!StringUtils.isEmpty(searchData.getOther()) || !StringUtils.isEmpty(searchData.getIndications())) {
             //提取其他史等
-            featuresList = fa.start(searchData.getOther() == null ? "" : searchData.getOther() + searchData.getIndications() == null ? "" : searchData.getIndications(), FeatureType.FEATURE);
+            featuresList = fa.start((searchData.getOther() == null ? "" : searchData.getOther()) + (searchData.getIndications() == null ? "" : searchData.getIndications()), FeatureType.FEATURE);
             paramFeatureInit(searchData, featuresList);
         }
         if (!StringUtils.isEmpty(searchData.getPacs())) {
@@ -233,6 +260,9 @@ public class ParamsDataProxy {
             if ("11".equals(featureType)) {
                 return BigDataConstants.feature_type_manju;
             }
+            if ("42".equals(featureType)) {
+                return BigDataConstants.feature_type_vital_index;
+            }
             return null;
         }
         return featureType;
@@ -258,11 +288,15 @@ public class ParamsDataProxy {
                 map.put("property", String.valueOf(featureMap.get("property")));
                 map.put("concept", String.valueOf(featureMap.get("concept")));
                 if (Constants.default_negative.equals(featureMap.get("negative"))) {
-                    if (searchData.getInputs().get(map.get("feature_name")) == null) {
-                        if (i < 6) {
-                            searchData.getInputs().put(map.get("feature_name"), map);
+                    if (map.get("featureType").equals(Constants.feature_type_time)) {
+                        searchData.getInputs().put("时间", map);
+                    } else {
+                        if (searchData.getInputs().get(map.get("feature_name")) == null) {
+                            if (i < 5) {
+                                searchData.getInputs().put(map.get("feature_name"), map);
+                            }
+                            searchData.getGraphInputs().put(map.get("feature_name"), map);
                         }
-                        searchData.getGraphInputs().put(map.get("feature_name"), map);
                     }
                 } else {
                     searchData.getFilters().put(map.get("feature_name"), map);
@@ -279,73 +313,82 @@ public class ParamsDataProxy {
      * @param sData
      * @return
      */
-    public SearchData addStandWord(List<Lexeme> lexemes, Map<String, List<Map<String, String>>> standWords, SearchData sData) {
+    public SearchData addStandWord(List<Lexeme> lexemes, Map<String, List<Map<String, String>>> standWords, SearchData sData, String itemType) {
         List<Lexeme> feature = new ArrayList<>();
+
         //收集分词结果中体征指标或体征指标值(数字)
         for (Lexeme lexeme : lexemes) {
             if (lexeme.getProperty().contains(",")) {
                 ApplicationCacheUtil.setProterty(lexeme); //如果分词后词性有多个,只选一个(暂时只处理症状,体征)
             }
             NegativeEnum lexemeNegativeEnum = NegativeEnum.parseOfValue(lexeme.getProperty());
-            if (lexemeNegativeEnum == NegativeEnum.VITAL_INDEX || lexemeNegativeEnum == NegativeEnum.SYMPTOM || lexemeNegativeEnum == NegativeEnum.DIGITS
-                    || lexemeNegativeEnum == NegativeEnum.EVENT_TIME || lexemeNegativeEnum == NegativeEnum.UNIT
-                    ) {
-                feature.add(lexeme);
+            for (int i = 0; i < negativeEnums.length; i++) {
+                if (lexemeNegativeEnum == negativeEnums[i]) {
+                    feature.add(lexeme);
+                    break;
+                }
             }
         }
         //根据收集到的分词结果把体征指标和对应体征指标值(数字)拼接
         List<String> featureType = new ArrayList<>();
+
         for (int i = 0; i < feature.size(); i++) {
             boolean featureTypeState = true;
+            boolean featureTypeStatus = false;
             if (i < feature.size() - 2) {
-                if ((NegativeEnum.parseOfValue(feature.get(i).getProperty()) == NegativeEnum.VITAL_INDEX
-                        && NegativeEnum.parseOfValue(feature.get(i + 1).getProperty()) == NegativeEnum.DIGITS
-                        && NegativeEnum.parseOfValue(feature.get(i + 2).getProperty()) == NegativeEnum.UNIT)
-                        ||
-                        (NegativeEnum.parseOfValue(feature.get(i).getProperty()) == NegativeEnum.VITAL_INDEX
-                                && NegativeEnum.parseOfValue(feature.get(i + 1).getProperty()) == NegativeEnum.DIGITS
-                                && NegativeEnum.parseOfValue(feature.get(i + 2).getProperty()) == NegativeEnum.EVENT_TIME)
-                        ||
-                        (NegativeEnum.parseOfValue(feature.get(i).getProperty()) == NegativeEnum.SYMPTOM
-                                && NegativeEnum.parseOfValue(feature.get(i + 1).getProperty()) == NegativeEnum.DIGITS
-                                && NegativeEnum.parseOfValue(feature.get(i + 2).getProperty()) == NegativeEnum.UNIT)
-                        ||
-                        (NegativeEnum.parseOfValue(feature.get(i).getProperty()) == NegativeEnum.SYMPTOM
-                                && NegativeEnum.parseOfValue(feature.get(i + 1).getProperty()) == NegativeEnum.DIGITS
-                                && NegativeEnum.parseOfValue(feature.get(i + 2).getProperty()) == NegativeEnum.EVENT_TIME)) {
-                    featureType.add(feature.get(i).getText() + "\t" + feature.get(i + 1).getText() + "\t"
-                            + feature.get(i + 2).getText());
-                    featureTypeState = false;
+                for (int j = 0; j < negativeEnumTriple.length; j++) {
+                    String featureText = "";
+                    for (int k = 0; k < negativeEnumTriple[j].length; k++) {
+                        if (NegativeEnum.parseOfValue(feature.get(i + k).getProperty()) == negativeEnumTriple[j][k]) {
+                            featureTypeStatus = true;
+                            featureText += "\t" + feature.get(i + k).getText();
+                        } else {
+                            featureTypeStatus = false;
+                            break;
+                        }
+                    }
+                    if (featureTypeStatus) {
+                        featureType.add(featureText);
+                        featureTypeState = false;
+                    }
                 }
             }
             if (featureTypeState && i < feature.size() - 1) {
-                if ((NegativeEnum.parseOfValue(feature.get(i).getProperty()) == NegativeEnum.VITAL_INDEX
-                        && NegativeEnum.parseOfValue(feature.get(i + 1).getProperty()) == NegativeEnum.DIGITS)
-                        ||
-                        (NegativeEnum.parseOfValue(feature.get(i).getProperty()) == NegativeEnum.SYMPTOM
-                                && NegativeEnum.parseOfValue(feature.get(i + 1).getProperty()) == NegativeEnum.DIGITS)) {
-                    featureType.add(feature.get(i).getText() + "\t" + feature.get(i + 1).getText());
+                for (int j = 0; j < negativeEnumTwoTuple.length; j++) {
+                    String featureText = "";
+                    for (int k = 0; k < negativeEnumTwoTuple[j].length; k++) {
+                        if (NegativeEnum.parseOfValue(feature.get(i + k).getProperty()) == negativeEnumTwoTuple[j][k]) {
+                            featureTypeStatus = true;
+                            featureText += "\t" + feature.get(i + k).getText();
+                        } else {
+                            featureTypeStatus = false;
+                            break;
+                        }
+                    }
+                    if (featureTypeStatus) {
+                        featureType.add(featureText);
+                    }
                 }
             }
         }
         //将标准词中体征指标值(数字)与分词结果中体征指标值(数字)比较
         String newStandWord = "";
         for (String f : featureType) {
-            String[] features = f.split("\t");
+            String[] features = f.trim().split("\t");
             if (standWords.containsKey(features[0])) {
                 List<Map<String, String>> standWordList = standWords.get(features[0]);
                 for (Map<String, String> standWordMap : standWordList) {
                     if (standWordMap.containsKey("unit") && standWordMap.containsKey("value")) {
                         if (features.length == 2) {
-                            newStandWord = judgment(features, standWordMap, newStandWord,sData);
+                            newStandWord = judgment(features, standWordMap, newStandWord, sData, itemType);
                         } else {
                             if (standWordMap.get("unit").equals(features[2].toLowerCase())) {
-                                newStandWord = judgment(features, standWordMap, newStandWord,sData);
+                                newStandWord = judgment(features, standWordMap, newStandWord, sData, itemType);
                             }
                         }
                     } else if (standWordMap.containsKey("value")) {
                         if (features.length == 2) {
-                            newStandWord = judgment(features, standWordMap, newStandWord,sData);
+                            newStandWord = judgment(features, standWordMap, newStandWord, sData, itemType);
                         }
                     }
                 }
@@ -368,21 +411,22 @@ public class ParamsDataProxy {
         if (flag) {
             addStandWords += smallerStandWord;
         }
-        sData.setSymptom(sData.getSymptom() + "," + addStandWords);
-        System.out.println(sData.getSymptom());
+        addbloodPressure(sData, itemType, addStandWords);
         return sData;
     }
 
+
     /**
      * 将标准词中体征指标值(数字)与分词结果中体征指标值(数字)比较
      * 除了血压>140/90mmHg类似标准词,其他标准词直接添加在症状后面
+     *
      * @param features
      * @param standWordMap
      * @param standWord
      * @param sData
      * @return 血压>140/90mmHg或血压小于90/60mmHg或同时返回,在addStandWord()中进一步处理
      */
-    private String judgment(String[] features, Map<String, String> standWordMap, String standWord,SearchData sData) {
+    private String judgment(String[] features, Map<String, String> standWordMap, String standWord, SearchData sData, String itemType) {
         if (hasDigit(features[1])) {
             try {
                 if (">".equals(standWordMap.get("op"))) {
@@ -401,9 +445,10 @@ public class ParamsDataProxy {
                             }
                         }
                     } else {
+                        //"symptom","other","vital","lis","pacs","diag"
                         String num = getNum(standWordMap.get("value"));
                         if (Double.valueOf(getNum(features[1])) > Double.valueOf(num)) {
-                                sData.setSymptom(sData.getSymptom() + "," + proxy(standWordMap.get("standword")));
+                            setStandword(standWordMap, sData, itemType);
                         }
                     }
                 } else if ("<".equals(standWordMap.get("op"))) {
@@ -424,7 +469,7 @@ public class ParamsDataProxy {
                     } else {
                         String num = getNum(standWordMap.get("value"));
                         if (Double.valueOf(getNum(features[1])) < Double.valueOf(num)) {
-                            sData.setSymptom(sData.getSymptom() + "," + standWordMap.get("standword"));
+                            setStandword(standWordMap, sData, itemType);
                         }
                     }
                 } else if (">=".equals(standWordMap.get("op"))) {
@@ -445,7 +490,7 @@ public class ParamsDataProxy {
                     } else {
                         String num = getNum(standWordMap.get("value"));
                         if (Double.valueOf(getNum(features[1])) >= Double.valueOf(num)) {
-                            sData.setSymptom(sData.getSymptom() + "," + proxy(standWordMap.get("standword")));
+                            setStandword(standWordMap, sData, itemType);
                         }
                     }
                 } else if ("<=".equals(standWordMap.get("op"))) {
@@ -466,19 +511,104 @@ public class ParamsDataProxy {
                     } else {
                         String num = getNum(standWordMap.get("value"));
                         if (Double.valueOf(getNum(features[1])) <= Double.valueOf(num)) {
-                            sData.setSymptom(sData.getSymptom() + "," + standWordMap.get("standword"));
+                            setStandword(standWordMap, sData, itemType);
                         }
                     }
                 }
-            } catch (NumberFormatException e) {
+            } catch (Exception e) {
                 e.printStackTrace();
             }
         }
         return standWord;
     }
 
+    /**
+     * 根据不同项目添加标准词
+     *
+     * @param standWordMap
+     * @param sData
+     * @param itemType
+     */
+    private void setStandword(Map<String, String> standWordMap, SearchData sData, String itemType) {
+        switch (itemType) {
+            case "symptom":
+                if (sData.getSymptom().indexOf(proxy(standWordMap.get("standword"))) == -1) {
+                    sData.setSymptom(sData.getSymptom() + "," + proxy(standWordMap.get("standword")));
+                }
+                break;
+            case "other":
+                if (sData.getOther().indexOf(proxy(standWordMap.get("standword"))) == -1) {
+                    sData.setOther(sData.getOther() + "," + proxy(standWordMap.get("standword")));
+                }
+                break;
+            case "vital":
+                if (sData.getVital().indexOf(proxy(standWordMap.get("standword"))) == -1) {
+                    sData.setVital(sData.getVital() + "," + proxy(standWordMap.get("standword")));
+                }
+                break;
+            case "lis":
+                if (sData.getLis().indexOf(proxy(standWordMap.get("standword"))) == -1) {
+                    sData.setLis(sData.getLis() + "," + proxy(standWordMap.get("standword")));
+                }
+                break;
+            case "pacs":
+                if (sData.getPacs().indexOf(proxy(standWordMap.get("standword"))) == -1) {
+                    sData.setPacs(sData.getPacs() + "," + proxy(standWordMap.get("standword")));
+                }
+                break;
+            case "diag":
+                if (sData.getDiag().indexOf(proxy(standWordMap.get("standword"))) == -1) {
+                    sData.setDiag(sData.getDiag() + "," + proxy(standWordMap.get("standword")));
+                }
+                break;
+        }
+    }
+
+    /**
+     * 添加血压(血压既满足血压≥140/90mmHg,又满足血压小于90/60mmHg时,只取前者)
+     *
+     * @param sData
+     * @param itemType
+     * @param addStandWords
+     */
+    private void addbloodPressure(SearchData sData, String itemType, String addStandWords) {
+        switch (itemType) {
+            case "symptom":
+                if (sData.getSymptom().indexOf(addStandWords) == -1) {
+                    sData.setSymptom(sData.getSymptom() + "," + addStandWords);
+                }
+                break;
+            case "other":
+                if (sData.getOther().indexOf(addStandWords) == -1) {
+                    sData.setOther(sData.getOther() + "," + addStandWords);
+                }
+                break;
+            case "vital":
+                if (sData.getVital().indexOf(addStandWords) == -1) {
+                    sData.setVital(sData.getVital() + "," + addStandWords);
+                }
+                break;
+            case "lis":
+                if (sData.getLis().indexOf(addStandWords) == -1) {
+                    sData.setLis(sData.getLis() + "," + addStandWords);
+                }
+                break;
+            case "pacs":
+                if (sData.getPacs().indexOf(addStandWords) == -1) {
+                    sData.setPacs(sData.getPacs() + "," + addStandWords);
+                }
+                break;
+            case "diag":
+                if (sData.getDiag().indexOf(addStandWords) == -1) {
+                    sData.setDiag(sData.getDiag() + "," + addStandWords);
+                }
+                break;
+        }
+    }
+
     /**
      * 判断分词后的特征中是否含有数字
+     *
      * @param content
      * @return
      */
@@ -492,6 +622,7 @@ public class ParamsDataProxy {
 
     /**
      * 将字符串中的数字提取出来,针对分词结果中"90."类似情况
+     *
      * @param standWord
      * @return
      */
@@ -507,13 +638,14 @@ public class ParamsDataProxy {
 
     /**
      * 将血压超过标准值的标准词改为血压升高
+     *
      * @param standWord
      * @return
      */
-    private String proxy(String standWord){
-        if (standWord.contains("压") && (standWord.contains("≥") || standWord.contains("大于"))){
+    private String proxy(String standWord) {
+        if (standWord.contains("压") && (standWord.contains("≥") || standWord.contains("大于"))) {
             standWord = "血压升高";
-        } else if (standWord.contains("心率") && (standWord.contains("大于") || standWord.contains("超过"))){
+        } else if (standWord.contains("心率") && (standWord.contains("大于") || standWord.contains("超过"))) {
             standWord = "心率快";
         }
         return standWord;

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

@@ -12,10 +12,7 @@ import org.diagbot.nlp.util.NlpCache;
 
 import javax.servlet.http.HttpServletRequest;
 import java.text.DecimalFormat;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 /**
  * @ClassName org.diagbot.bigdata.work.ResultDataProxy
@@ -25,17 +22,20 @@ import java.util.Map;
  * @Version 1.0
  **/
 public class ResultDataProxy {
+    protected static String[] vital_filter_data = Constants.vital_filter_data;
+
     public List<FeatureRate> proxy(HttpServletRequest request, BigDataSearchData searchData, List<Map.Entry<String, Float>> featuresOrderList, String featureType) {
         int cursor = 1;
         DecimalFormat df = new DecimalFormat("0.####");
         List<FeatureRate> featureList = new ArrayList<>(10);
 
-        Map<String, String> resultMappingVitalMap = ApplicationCacheUtil.getDoc_result_mapping_vital_map();
+//        Map<String, String> resultMappingVitalMap = ApplicationCacheUtil.getDoc_result_mapping_vital_map();
         Map<String, String> resultMappingDiagMap = ApplicationCacheUtil.getDoc_result_mapping_diag_map();
         Map<String, Map<String, ResultMappingFilter>> resultMappingFilterMap = ApplicationCacheUtil.getDoc_result_mapping_filter_map();
+        Map<String, Map<String, String>> synonymMap = ApplicationCacheUtil.getStandard_info_synonym_map();
         for (Map.Entry<String, Float> entry : featuresOrderList) {
             //过滤特征数据, 过滤低于阈值的数据
-            if (!resultFilter(request, searchData, featureType, entry.getKey(), entry.getValue())) {
+            if (!resultFilter(request, searchData, featureType, entry.getKey(), entry.getValue(), synonymMap)) {
                 continue;
             }
             //性别年龄过滤
@@ -58,15 +58,7 @@ public class ResultDataProxy {
             }
             FeatureRate featureRate = new FeatureRate();
             featureRate.setRate(df.format(entry.getValue()));
-            if (FeatureType.parse(featureType) == FeatureType.VITAL) {
-                if (StringUtils.isEmpty(resultMappingVitalMap.get(entry.getKey()))) {
-                    continue;
-                } else {
-                    featureRate.setFeatureName(resultMappingVitalMap.get(entry.getKey()));
-                }
-            } else {
-                featureRate.setFeatureName(entry.getKey());
-            }
+            featureRate.setFeatureName(entry.getKey());
 
             if (FeatureType.parse(featureType) == FeatureType.DIAG) {
                 featureRate.setFeatureName(entry.getKey());
@@ -93,15 +85,20 @@ public class ResultDataProxy {
         return featureList;
     }
 
-    public boolean resultFilter(HttpServletRequest request, BigDataSearchData searchData, String featureType, String result, float threshold) {
+    public boolean resultFilter(HttpServletRequest request, BigDataSearchData searchData, String featureType, String result, float threshold, Map<String, Map<String, String>> synonymMap) {
         //过滤录入条件中已有的特征信息
-        if (searchData.getInputs().get(result) != null && FeatureType.parse(featureType) != FeatureType.DIAG) {
+        if (searchData.getGraphInputs().get(result) != null && FeatureType.parse(featureType) != FeatureType.DIAG) {
+            return false;
+        }
+        if (FeatureType.parse(featureType) == FeatureType.SYMPTOM) {
+            if (searchData.getGraphInputs().get(synonymMap.get(Constants.word_property_symptom).get(result))!= null) {
+                return false;
+            }
+        }
+        int searched_position = Arrays.binarySearch(vital_filter_data, result);
+        if (searched_position > -1) {
             return false;
         }
-        //
-//        if (searchData.getFilters().get(result) != null) {
-//            return false;
-//        }
         return true;
     }
 
@@ -141,9 +138,6 @@ public class ResultDataProxy {
         for (Map.Entry<String, Float> entry : map.entrySet()) {
             synonym = convertMap.get(entry.getKey());
             if (synonym != null) {
-                if (isFilter && synonym.equals("阴道出血")) {
-                    System.out.println(entry.getKey() + "-->" + entry.getValue());
-                }
                 if (result.get(synonym) == null) {
                     result.put(synonym, entry.getValue());
                 } else {

+ 1 - 1
bigdata-web/src/main/resources/application.yml

@@ -12,7 +12,7 @@ spring:
       charset: UTF-8
       enabled: true
   datasource:       # mybatis 配置,使用druid数据源
-    url: jdbc:mysql://192.1.3.116:3306/bigdata-web?useUnicode=true&characterEncoding=UTF-8
+    url: jdbc:mysql://1.1.1.1:3306/bigdata-web?useUnicode=true&characterEncoding=UTF-8
     username: root
     password: langtong
     type: com.alibaba.druid.pool.DruidDataSource

+ 0 - 899
bigdata-web/src/main/resources/doc_result_mapping_diag.dict

@@ -1,899 +0,0 @@
-iWoXV4ISKfEEe8p5BEeGMXcP2fi9nVPgIVOt7Mod6Ptttw/uxcjHEZNGAwm1dTlh
-13BZUxQKtR8khcL82U/gR6xTxv6q3ER1T31+8tdUysA=
-13BZUxQKtR8Ee8p5BEeGMbPfb65AhyohrCW1qrlOrIXnCFVQR0+OhAr8ipqZuWdE
-13BZUxQKtR8Ee8p5BEeGMSgN76O6SVyHRQ5SX/rmfCbnCFVQR0+OhAr8ipqZuWdE
-13BZUxQKtR8Ee8p5BEeGMTGSeaWwHrO28DsYuNRP2xrzo/C7RYPhiQ==
-13BZUxQKtR8Ee8p5BEeGMfy0mrZa9NlMB+04xUYH/mDnCFVQR0+OhAr8ipqZuWdE
-13BZUxQKtR8Ee8p5BEeGMVDAaNQ6vkAnhf6kv3fA54PnCFVQR0+OhAr8ipqZuWdE
-13BZUxQKtR9x+KllafTRWVzBEC3KTBfP57Coq4ynowFKYBGd+lGX+w==
-UBb+CN3DpdXV4GVpSzaFCvOj8LtFg+GJ
-RwfaZMa+tcJkNVRINR3RaHpmvKAVeqCzRPB+qQ9rdKU=
-aExuyB28XAR0Cy32pByLQhO3DcTvO3TKaXBl6wZu5y0=
-Rq6VzCfzICn9+r0EMibpOfOj8LtFg+GJ
-tjTBHQOg4JZWgHE3Y5h4coemfMvU1eABfER6RG1klik=
-LPekO1Vw5kgU8eAB+2lgKlX9mMU2d4g0sKnW7jmERCH1rLaDeGOQwfOj8LtFg+GJ
-LPekO1Vw5khtd8WtUYdrl/znlgPCB6PWstNvNKfkPxHtfbwrS7yCE0pgEZ36UZf7
-iB2sYRaVfwL9+r0EMibpOfOj8LtFg+GJ
-XQT3SHWafIA+AOWtZC88XC+F4lgKG0ZK9Z7CDt8UKI/v3eyoY7qwoXAul+X1XFtHy4x6AQXguls=
-GG71AOESABIJbTP+AlIFufOj8LtFg+GJ
-GOs/j0/PHelIkRc7oSI9szKnOEpdVQkO9RrMjQw02M5PfX7y11TKwA==
-GOs/j0/PHelIkRc7oSI9szlHsXZwP1nWl2UMsW6I5bP1rLaDeGOQwfOj8LtFg+GJ
-GOs/j0/PHelIkRc7oSI9s97P1cGs5sNK6P3MMb1JPeD1rLaDeGOQwfOj8LtFg+GJ
-GOs/j0/PHelIkRc7oSI9s94er8ZM74QIQtrkkMzshHxxqUIOvKQ/dwLm/EKxWl15
-cDwUoESXFL5MSclGunBL8q4kLpO4b0WCN5m+Gay4mDc=
-XTjWGwZLoH1auJLtJZplqtSXQVOsJCee52mHitj3oNVPfX7y11TKwA==
-is24Ye5iddmK0fcjJ8eyd1F5djzFc1mvfywvCjeRl/T0fQTyIpclWA==
-KbKku7ucQ39uoije31Jd6MgDR9Ol2aU1fER6RG1klik=
-XeNsCvsSABj/1Gi6u346QEpgEZ36UZf7
-u9VShjNiQLaEh57YJ81oCvOj8LtFg+GJ
-8eEwHEIyR3CEqKNFUcAAUEpgEZ36UZf7
-oRqu1B35G5r4prflBcOI/gfkmii5BuyZu7hkhPiE07E=
-oRqu1B35G5oQ+WWu+Cc9mPRovAvBdywmstNvNKfkPxHtfbwrS7yCE0pgEZ36UZf7
-0jJMm1O24VdIuBTSfWq8fz8zYxNh6qQehkzsWr2fJvRpwcfsxZv+X0iU8imBtrfgy4x6AQXguls=
-NhbO6gkLwqjse810KERveORV0q3Q8qjoy4x6AQXguls=
-NhbO6gkLwqh9giU0ougSyIemfMvU1eABfER6RG1klik=
-IOQii0cLb7Ss+U6SBrCCGp+9Oh29Slfk52mHitj3oNVPfX7y11TKwA==
-enu6avlk5YpYqoBsat2Ybx/ps2807HA2y4x6AQXguls=
-0sR5tvt5nTkiJp0gJWIG2B/ps2807HA2y4x6AQXguls=
-ike6hX0KY4854R3RmIhG3R/ps2807HA2y4x6AQXguls=
-DOXrtCrKcXSzbDHIoU2htR/ps2807HA2y4x6AQXguls=
-DOXrtCrKcXQc6kU7pH5cVR/ps2807HA2y4x6AQXguls=
-MzrnRYF60fg1zeORSYfFpEoPmHAI4936
-yWaySNFE8XgC0uinfuVoYjBrQoRmQwfSteq+RIooEghPfX7y11TKwA==
-MdIN8DMpaEBWgHE3Y5h4cvjGqlRxOSxuKSotK/v0yek=
-Oed05VhE/J8vZEYJ+Qgwo0oPmHAI4936
-95YPV7nX9j+yPJEuX5FlVfOj8LtFg+GJ
-BGL6SBJINCSqv45Aj5fuOh/ps2807HA2y4x6AQXguls=
-ZNQWeAaprLh+Mdl3Bm+eOB/ps2807HA2y4x6AQXguls=
-Ys4HY1VWiNz9qI/NdGuLvvjGqlRxOSxuKSotK/v0yek=
-E4hT7N3ytDu1bH4gSInujULj3Su8S5w3fywvCjeRl/S0FrgmK9pWPA==
-7mHfSs2ahWgivWPiUX9ug78AMGVXssqQKJZKOfgg6nHJOvnYyXNsXpC4iPbph9qG
-ltfmaY06UmH2YvmikroYRkv4Vh0daqQJrFPG/qrcRHVPfX7y11TKwA==
-xbg5pYjlVtXGgDHUkbi1wK7QEgPGBpLdgymuBa+h7SiRwhQGBKdSp/Oj8LtFg+GJ
-Zlo5WYcgZKpNiiBTZZbq1WJoTAS/DAZEoEfwk8+pyRbnsKirjKejAUpgEZ36UZf7
-vPPRWcr4YTeEfvwh8gqO7i9GjCJsfm4xPCHvXzw0mit1CazNTv2aYfOj8LtFg+GJ
-fHK6mvJmg/7/1Gi6u346QEpgEZ36UZf7
-qptm92sSB/VYvUmCs9IY3d7SGlS0JFuG
-qtlkwnn27ACw8mEQdSz4E/Oj8LtFg+GJ
-Vrbj4RFVsOeGcy6xPYEwTveK6RLf4xMTy4x6AQXguls=
-laj6iFmYc2DeUidRm/poynAul+X1XFtHy4x6AQXguls=
-uQzgoFGJdFjdnbhWjFDvHwT1tZsHfiBBy4x6AQXguls=
-fMSADmyw8MVv8ZabwFNKANsp4Ism9gRNy4x6AQXguls=
-Sg9tt2ZNeu5v8ZabwFNKANsp4Ism9gRNy4x6AQXguls=
-1MVvkAG3zx1v8ZabwFNKANsp4Ism9gRNy4x6AQXguls=
-tFWoa+Fa+E0KvpYijT+IHq4kLpO4b0WCN5m+Gay4mDc=
-HlBPgXjTWrPCE5zi/CJYd0pgEZ36UZf7
-qJyJhtR9wYUzXDr7TYw7uQLm/EKxWl15
-5HgQz9bhZBZ5fyp8g0MqBZBwNuVVH6sq
-W+uRpV2VRGfOEs8faPFbVJBwNuVVH6sq
-+1VsVSgMX3q9FppGobofTZBwNuVVH6sq
-fd7Rpt8fWBifF7pIg0uQua1TqwiA1pre
-fd7Rpt8fWBhUIm92l3iN1WDAN33wOHW6wQ7cCkCUWxZPfX7y11TKwA==
-ZtiRChQSkznxJj5V9utwy0iU8imBtrfgy4x6AQXguls=
-1+jfA83l+iKF3SayFI67uACfONS6MbsgaXBl6wZu5y0=
-/VqIfk4vfde3JvJ2Xjm9/UpgEZ36UZf7
-3OUUj3H9vbXrfZHpEMHYgUpgEZ36UZf7
-3OUUj3H9vbXwozCIpR0nf0pgEZ36UZf7
-JWBCcm2oC0hlDmn3A9bDMCZCeN6biUcBg1jh8Ox1rhV6m9y9N5DCvA==
-5whVUEdPjoQERGJhJJb/jB5IdN0yf6TrxJjmGu3AgzrnsKirjKejAUpgEZ36UZf7
-pJZkFr1uMau5/0FNXste6fOj8LtFg+GJ
-jnQH++UTPaibBHhE3G65A5OH5JCq/vF1WhqDUIQPQGM=
-de3O9146cmULVgLDGsMmxnAul+X1XFtHy4x6AQXguls=
-9UQdU1VIB/Ztd8WtUYdrl/znlgPCB6PWstNvNKfkPxHtfbwrS7yCE0pgEZ36UZf7
-zybTgccYrmvNZmfBQxP52cK0z0/1KIV28K8JgXllPjTLjHoBBeC6Ww==
-kdU8UcCILZA2zqe2dEz9kO/1mwKFPYtV1K7XQRHlBMM=
-x9ZTV7gEMRCi91Qg24vlA75amaIn5rxJIrRdP5MeE9j1rLaDeGOQwfOj8LtFg+GJ
-FQUi8oWeKA22mkhDBQ8Od0ffVX1Kx6/gaXBl6wZu5y0=
-FQUi8oWeKA009nSxFi4IHE7wB8aAVMVRF2Mdrjp/QpU=
-FQUi8oWeKA0t2SdYDpcKM4jI8KpajKVSpg10U7yntVtPfX7y11TKwA==
-FQUi8oWeKA2km2jSURfVd0ffVX1Kx6/gaXBl6wZu5y0=
-FQUi8oWeKA1DOzz3YWNJ69+VJP2lrbmu
-FQUi8oWeKA16K4HqriD8jUffVX1Kx6/gaXBl6wZu5y0=
-FQUi8oWeKA2ZveeDa7x7vQ26QOL8owUaqUTgJrEohqbQx1T34QTwhkpgEZ36UZf7
-PN71jlSk34UCxwQXdsGm4ZQZTiZNO+I5N5m+Gay4mDc=
-2aDJllB28JLJXbPtseCSr61TqwiA1pre
-24AwIW/ZQevhfJ7nO4hl9jqmLc90JllH+QN+W6do9IvLzkZfPTHbZw==
-e8PUaMqGKBjbjtQVzMQGtVO8SBODgX57y4x6AQXguls=
-g6f6B3EKC0mq/hI3Siy1ns1Rj9szbZqu9RrMjQw02M5PfX7y11TKwA==
-cn9SelEe5HtR55atK842DPOj8LtFg+GJ
-kN7D+ZqtUAf40aKLMAZlPfBjDc6YVozA/Moy/+Vge7xPfX7y11TKwA==
-kN7D+ZqtUAcsXyKn8XbgBbbrO1fPMBV70pCfO/z5g6Y=
-kN7D+ZqtUAfgxTPOJka4x+1sIpk3UltPRPB+qQ9rdKU=
-kN7D+ZqtUAdEPzDylc672CH/h1pywZ5c0pCfO/z5g6Y=
-kN7D+ZqtUAe6K5+69vyqZ9/Pdt1H5L9h0pCfO/z5g6Y=
-2uRZ3LWgKU3RH5Nj+q+LtlPq3vaS3WGD
-rt8lOfUgZoK3CTjvFzoCRlQlsPKn/6q1hFq5sh8RQyE=
-rt8lOfUgZoJlQTf2O+iulomK/3Xny8ms9hT2lIaacqU=
-IHXErJfSSFCNuoiIa651tyyfxx3KDwLB
-785EOhh4F5sj7CuznFHzhJBwNuVVH6sq
-I1DBVtavRK2E1PvLgQn/VJBwNuVVH6sq
-liY3+k43l7+Q4FSyzAKv7/wyznKZVl2qYcKCqJ6M1pTMhUL6uE0NXEpgEZ36UZf7
-UrVzAjnIcuBxOkPtc5YzshjdGWQl0x5hy4x6AQXguls=
-cZht5tTkz8OyPJEuX5FlVfOj8LtFg+GJ
-DGdum4rbXqc5TekogOYmZ5BwNuVVH6sq
-kMsfiffRfraGOny5ykosGoUXNaoO/BVxA4H4FjoDGQbLzkZfPTHbZw==
-k63/U+Ort/t1sXunLF29ToZjzlmb0DiP9hT2lIaacqU=
-w0f3DSSJVtT4n7ZrF0P2pJBwNuVVH6sq
-anqc376RwxH2YvmikroYRr8AMGVXssqQKJZKOfgg6nHJOvnYyXNsXpC4iPbph9qG
-anqc376RwxEclteAVjASagjVcYt6XiKfROcxxZkPB1r0fQTyIpclWA==
-anqc376RwxFrnfoP+wEgV+RV0q3Q8qjoy4x6AQXguls=
-anqc376RwxGunL6RPUuCpx1hqIGQ97twstNvNKfkPxHtfbwrS7yCE0pgEZ36UZf7
-anqc376RwxEl2d7cPemZpxAJGqasuIcYJfZSBCKF4gHm9GlJmRbg+OcIVVBHT46ECvyKmpm5Z0Q=
-rsOHmN/4ufkL8rKaud4vfO/1mwKFPYtV1K7XQRHlBMM=
-0z7NEIWwDp3MhUL6uE0NXEpgEZ36UZf7
-6CdJfik1TY5WtttuC4yb65BwNuVVH6sq
-kigrNEhv/MvSNFr9wNKob/Oj8LtFg+GJ
-G4j5jFyDtCkSCQzGhDDQ3yH/h1pywZ5c0pCfO/z5g6Y=
-qna3IZTy69SQLBb9TLgT0vOj8LtFg+GJ
-Qnj2SoYUQEDwOxi41E/bGvOj8LtFg+GJ
-mpaFzePG/5qUfFjfGL0+BmL6uHlLqsog
-u2y2FVfBqZ7HXWLfSvfpsvOj8LtFg+GJ
-md7FgUY16RRpHAHM1WsmQ8/EDJLz2N3ohFq5sh8RQyE=
-WeRGepVqdPi7Pl0reaplqbOsDNsReNLeRPB+qQ9rdKU=
-oVJkClU0Bvh5NR6CtIcYXyJQS0qubhjOCpU7P23QhntPfX7y11TKwA==
-LX1/RTaigThHUNbECAUpcAfkmii5BuyZ+wmNWke18BM=
-Iwq5Ivop+7oJTP+5mC6pPL13FBy0uL+iRPB+qQ9rdKU=
-f/NLwF/5qBnwshyLxCfprPOj8LtFg+GJ
-XEK48ftZVQvwshyLxCfprPOj8LtFg+GJ
-xm0YhMMvUrTv6eQ9seoGjEUzv8FEiuOYROcxxZkPB1r0fQTyIpclWA==
-KA3vo7pJXIdFDlJf+uZ8JnpmvKAVeqCzRPB+qQ9rdKU=
-BIsR7PAOZaBXpjffLvuUW0wWBzUGIE3Fy4x6AQXguls=
-l0FzfX6DT5kc2AsKYh9Av0wWBzUGIE3Fy4x6AQXguls=
-OgGc28R9XYqrdXvWFsyZiN7SGlS0JFuG
-LxBJSTkhXn+dGLiDN2Hnj97SGlS0JFuG
-zp7DEq21BTwlFymD5/1N/rBzljBEfN2xy4x6AQXguls=
-tlK7bfXVIBXcuzi3+wsImh/ps2807HA2y4x6AQXguls=
-UhUtlWoQP1DCE5zi/CJYd0pgEZ36UZf7
-SaUpgNmsHasnHOlkm0sxA+RV0q3Q8qjoy4x6AQXguls=
-0FmNHjoeZ7YD+iwJRdWW+/Oj8LtFg+GJ
-KBLbMm9Rg00q123TAhgbee/1mwKFPYtV1K7XQRHlBMM=
-nC3Olv+9F3VfoGFpKmLQzCBZw/ZMqkrAepvcvTeQwrw=
-ZnpTQ/05IxPiTIsP7LhxYtHEM4o6ZCR6y4x6AQXguls=
-BWf2VPSq/CBX70UMh3l1zfOj8LtFg+GJ
-rHGVkOky9lRkNVRINR3RaFPq3vaS3WGD
-wkneReaVJMEUYWv2tTiLuBL2525Y8Jlzy4x6AQXguls=
-vecfpO5xbBycNLWbhMusxFQlsPKn/6q1hFq5sh8RQyE=
-9pI83TCsPVXWUpDt6Xr+nkpgEZ36UZf7
-9ATztfXQ4YI5ywm7JAmEzt7SGlS0JFuG
-1gUH5d9S+SQP+0LchfW6bt7SGlS0JFuG
-Sa+uZygGJsFTEX0WzzhmTd7SGlS0JFuG
-0xF9G4KuCCSdGLiDN2Hnj97SGlS0JFuG
-DefAwZ4n13SXuNGxONPgs+RV0q3Q8qjoy4x6AQXguls=
-nAVIQhmgLsUqzclmSTZy7O/1mwKFPYtV1K7XQRHlBMM=
-VQyanJdAJxr8KlV1ph0Yje1sIpk3UltPRPB+qQ9rdKU=
-54MHTIPxFWm5/0FNXste6fOj8LtFg+GJ
-AC5wqOrDg0OEh57YJ81oCvOj8LtFg+GJ
-xEUfjPFZ/xYq17w2ajSKHLBzljBEfN2xy4x6AQXguls=
-qDJCWQ+e+n61f4daHIwZR9HEM4o6ZCR6y4x6AQXguls=
-mAvmI45vfiVtV7mJSxdBKJBwNuVVH6sq
-aMsbvjbfGsUxQ2HeHu18jlufv0N47kkKaAYhz49iPPQ=
-m+hvPY3d9tI9PnHdu7yUaSBZw/ZMqkrAepvcvTeQwrw=
-CDrQ2ea5LGDJOvnYyXNsXpC4iPbph9qG
-GeOoxHykR0NIkRc7oSI9szKnOEpdVQkOwQ7cCkCUWxZPfX7y11TKwA==
-9X6X38YdgQciqg4ZKtRMEaFjfApLwKh/PtbZND328nI=
-sdjtfGRtUulfuLJtpOjzH/Oj8LtFg+GJ
-gywMijxUj6c+OyyB6z9n5POj8LtFg+GJ
-R2eAdMyK6zSU7JD4YB6JqfOj8LtFg+GJ
-gkB282ET6CHZnuNxhT4mNoDCsJ8T2pbfepvcvTeQwrw=
-rmw3y68nbTxtR8wDUlebCerUo2OLEJuOCpU7P23QhntPfX7y11TKwA==
-+bJ/vQZNZX5a94t2FvAzVBjdGWQl0x5hy4x6AQXguls=
-Ijs5NwarmpdGNWh/ueDr//oslnIPxwMNqY/rONiW9dfLzkZfPTHbZw==
-Fa4m96t0Af/TV3ww/e2cDZBwNuVVH6sq
-GLZe/17QCbzt0Lwb79na4yq1UHZ+9sTmCpU7P23QhntPfX7y11TKwA==
-GLZe/17QCbxmXvUvjgbr4kY8THOUtOF7856CtLA2mBI=
-GLZe/17QCbw2Hyl0WmLydTOZLUhfMDr5Z36YRUA/eqPMhUL6uE0NXEpgEZ36UZf7
-zy+BWp25HIY8YGgnfhG/CpBwNuVVH6sq
-YmFbY+KQ4Y7q4CxvGXZpehjdGWQl0x5hy4x6AQXguls=
-YmFbY+KQ4Y62jZ0HIHtNhCKNGmIIhDZD856CtLA2mBI=
-YmFbY+KQ4Y5QHYDAU4bOhUr9oz8W6N26epvcvTeQwrw=
-YmFbY+KQ4Y4dNToG2d9B8wPMYZdUQfnX856CtLA2mBI=
-YmFbY+KQ4Y4dNToG2d9B8/x4wZJZoVmQ8GwBcK2jcmzLzkZfPTHbZw==
-YmFbY+KQ4Y4bHBvW0gRQFxjdGWQl0x5hy4x6AQXguls=
-YmFbY+KQ4Y4JJVgL5g3rBuRV0q3Q8qjoy4x6AQXguls=
-SEf6luKEZaNhu51s4ddTcxak9y4lRig4856CtLA2mBI=
-YdusYOZMMEEHkzvFoiBCspGRrBPOUOsvCd7cH2MFQVPLzkZfPTHbZw==
-WAXiD8YngH/NviT5sRQoM5BwNuVVH6sq
-Qud0EeTCG2GQfWiEdArhspBwNuVVH6sq
-Jl+v2iIQ3PRl6qtXuMmmfRjdGWQl0x5hy4x6AQXguls=
-EpkhMubA/KU2uRhwSJ6d+Y6XI0/uKdr28GwBcK2jcmzLzkZfPTHbZw==
-lk8o5519Kxjg6njkDcx/a4LXI+MfHNbWfywvCjeRl/T0fQTyIpclWA==
-DIt4Xp3Xbla1QXPpBNd8kQncLU6QuExl9RrMjQw02M5PfX7y11TKwA==
-2ldeYKVA5RpUYRP2vPq8D9ll6SkFs1l/9RrMjQw02M5PfX7y11TKwA==
-ZHexhB9C/Zz4F0w18YK/UcJTRkl7CKPoepvcvTeQwrw=
-0aA0U9ckmH2SPaLA/eokGpBwNuVVH6sq
-0aA0U9ckmH1WgHE3Y5h4chak9y4lRig4856CtLA2mBI=
-udHQ1AK6s0BHbbfugUQuewG5f+vLIXgw856CtLA2mBI=
-udHQ1AK6s0BHbbfugUQuezWfKD51et5xAQXL9AdSuF7MhUL6uE0NXEpgEZ36UZf7
-qBVDKbnPe4DL9/eiOW3PNvOj8LtFg+GJ
-ammVyKzxh8yyPJEuX5FlVfOj8LtFg+GJ
-6fCswTdb7gp4T5EqkTXoH5BwNuVVH6sq
-jmczOIjm5GmjJuX2eeHASfOj8LtFg+GJ
-hck8BB9RXPfRv+VvHMI2mBL2525Y8Jlzy4x6AQXguls=
-xGJWNwmRrvjSNFr9wNKob/Oj8LtFg+GJ
-Dme0iKBg4ltC5hNG7CjHwfOj8LtFg+GJ
-Dme0iKBg4lsKVHWF4Myk4AIg5cy+cuSy8Qk70COrU7VPfX7y11TKwA==
-C4Bngy5bB8t1b91EHw30B0oPmHAI4936
-5yuQig9LutUtwK0yz09R30oPmHAI4936
-dyMnqxlKzdN/JSshJxQ3iqf2wJuFXvN5y4x6AQXguls=
-BKa9L3k9bnJkzZHOvFXHIKf2wJuFXvN5y4x6AQXguls=
-BKa9L3k9bnKHDjyHip04zkffVX1Kx6/gaXBl6wZu5y0=
-GCjAqXPF1Dof+sd2M1vkT/Oj8LtFg+GJ
-tN2/kArLFem7Pl0reaplqbOsDNsReNLeRPB+qQ9rdKU=
-PhvRblnFgRvdce7uzab8M4ydqAmNreE85+3hueUDKGFPfX7y11TKwA==
-asaad8Q4C6Ctv3/3+UBOAUpgEZ36UZf7
-mW7W5BgaP+MjHOA2mhvm0OrUo2OLEJuOROcxxZkPB1r0fQTyIpclWA==
-mW7W5BgaP+MlWHMII4NFM1/cKgeh02Cpy4x6AQXguls=
-mW7W5BgaP+MvmaXSzDwxNK4kLpO4b0WCN5m+Gay4mDc=
-4fpWUFa+lACNuoiIa651tyyfxx3KDwLB
-Iv1mcWBS5FKHDjyHip04zjO11wrX//LPpDa+H9/X6UI=
-qvpIupBm2WX/AxGfixJ3IUpgEZ36UZf7
-8FSnJAv4mC/Mc5Bnc8mDRe54uYxEV7tyotGKnIGJ8i70fQTyIpclWA==
-eAGFq9Be2c60E0hhBYOohO/1mwKFPYtV1K7XQRHlBMM=
-7KSbuV1nCERWtttuC4yb65BwNuVVH6sq
-PbluYqiSMUInlR5KMGbbXKxfcB7OUo5Mk0YDCbV1OWE=
-SvUyT0up+YUaegOSGrYRJl4BNx8oMOoc856CtLA2mBI=
-8y8wJLjHjH8TNfXi0hp2zzxKSn9brCFL0J2lNnMxKpaYzJ6oJv+qKw==
-6EiWonjOwKYAZgmfbgyEWuHSb9kEZhbZAfBGcSNe17xPfX7y11TKwA==
-iXWjcPj0niUZmdQ/MALAmPL6oKDxDkyLHWnCZH6t2//hH/tXNeBfPQ==
-E0zofMTBmei7Pl0reaplqbOsDNsReNLeRPB+qQ9rdKU=
-zC/bIffd/q9utdpwhrdIlAfkmii5BuyZ+wmNWke18BM=
-oVV0uxz5T6z1aHc/UGh87LOsDNsReNLeRPB+qQ9rdKU=
-4yKVkHCQKXYwTqu9Wh9027OsDNsReNLeRPB+qQ9rdKU=
-RjlHunEZKP0T7ne662LsTrOsDNsReNLeRPB+qQ9rdKU=
-iwZpY5oYT+RXSiqVjN5JhLOsDNsReNLeRPB+qQ9rdKU=
-Cks1i1RgvXeuzpfidcLfubOsDNsReNLeRPB+qQ9rdKU=
-xQ8n2p9QTXp30QT7blyM3Qfkmii5BuyZ+wmNWke18BM=
-vGTRMHlT7dXj43Itc7bH7nAul+X1XFtHy4x6AQXguls=
-kRGK26rRVyvv3eyoY7qwoXAul+X1XFtHy4x6AQXguls=
-2jobYaE9hqkLVgLDGsMmxnAul+X1XFtHy4x6AQXguls=
-P7cKB1x3/7hGsAqNnhnTULOsDNsReNLeRPB+qQ9rdKU=
-QY8HRySr7Iwnp75iBJ/Vjwfkmii5BuyZ+wmNWke18BM=
-IAucFrl7qqxLIGJootoeXhDHi1ipAZxkepvcvTeQwrw=
-+812jhbb/MJhfXGLID+DlwxRxeTVAFkvibzFuc+pkRD0fQTyIpclWA==
-Gc+2o0fCUZzBRTe6oIudrbBzljBEfN2xy4x6AQXguls=
-g30soSzYKlYqYKw79TNc7ZU9yEFVkW8kfywvCjeRl/T0fQTyIpclWA==
-5Y1mwjb8gujXQ5dFwFvnLzH8At29S2vWUUnOob68iS9PfX7y11TKwA==
-By5Q/SU5xir2hPuSHwJFxG4yDp8xPBuoawyE6TLbCTavkJTSWMnxMA==
-cJPzYw+8qO2U1kX+sOaXa7BzljBEfN2xy4x6AQXguls=
-cJPzYw+8qO2oTyQOFtqiPd7SGlS0JFuG
-IfQDH7CTkzKwq57YkquoA97SGlS0JFuG
-1AooRnXbEgiveRA5ybYZwBjdGWQl0x5hy4x6AQXguls=
-+8iGrGjQRQXLJRvWtAt1iX4eJb4c8+yiwQ7cCkCUWxZPfX7y11TKwA==
-vKMadaRxCnt9yZ92+zfrDUX1wgDB6SwAlcfDWHvheBM=
-nVdA10JEgrH58tUSo2w3wV8pxEoXZNj5aeu8Uvl+alM=
-+/2OC1vcA4B763zk1n7SVL13FBy0uL+iRPB+qQ9rdKU=
-Gcnsiwomf6vBdIdG8bPRHll2tDC4Deily4x6AQXguls=
-h6H8S6JOlFZIg9VPXIEScier9kpF888AbpgFshbO4WxPfX7y11TKwA==
-ScnIyRoXkewIde0NTCKaofeK6RLf4xMTy4x6AQXguls=
-xUYZz/Y1ys3dPmsNsdD0UjilXWM8iFGV5+3hueUDKGFPfX7y11TKwA==
-rwSi9v0Y5/n868dzID7JMkiU8imBtrfgy4x6AQXguls=
-rwSi9v0Y5/k3lCRoHQSzQaNUfX3uZ7rARPB+qQ9rdKU=
-L4guYbOD3ybEiQqgpijBkO1sIpk3UltPRPB+qQ9rdKU=
-L4guYbOD3ybiWybz9IQNYu1sIpk3UltPRPB+qQ9rdKU=
-L4guYbOD3yaYjQ+nZpk4a/rLJk4dYoKYaXBl6wZu5y0=
-L4guYbOD3yb/9bq0lnqP8u1sIpk3UltPRPB+qQ9rdKU=
-ZpI2ZmzFQJ3d+AsDA8cg40X1wgDB6SwAlcfDWHvheBM=
-xG5CG1VWnMcYMNtTOEq0iiJCwkfSBhWqy4x6AQXguls=
-xG5CG1VWnMemkG9esmQL6vmkGF5eJuLT5YX/dOX/57O0FrgmK9pWPA==
-xG5CG1VWnMfdjUukdGSSoRjdGWQl0x5hy4x6AQXguls=
-XkypoFugO9L4osiym+Qx7rBzljBEfN2xy4x6AQXguls=
-yUBIpiXiGhsjuTEjt/+DHza5a1CR31xtKBLbMm9Rg01qyZUMAi3tqTcKfUh6nySUeU9Behr53wnItVyfMJtsjQ==
-leErXN0I8raC/1FVali0VVqOf3u62uxi
-uNYj01ma7BBp6IUveDLb/kSqVvpudkC5stNvNKfkPxHtfbwrS7yCE0pgEZ36UZf7
-h/GuGMcf1KaKSb8pX7R3+VqOf3u62uxi
-HzTSi3irigCvmjkAhtg9xlV2rXAZxRtdwIyvNNx82Fm3si0+gPyQ+SSpKIYunmKc
-iUchhe2/rwlC7NNIijAHcl/cKgeh02Cpy4x6AQXguls=
-G6wb24Mf5+T6zB3Lcx4OpWIjE56GxM2wy4x6AQXguls=
-G6wb24Mf5+Q2bj7D5mvDy2IjE56GxM2wy4x6AQXguls=
-G6wb24Mf5+SuA6VKJ2wwgcrVGJOptXRVls1GZC9Rtus=
-G6wb24Mf5+QAEQQg1tP+b+1sIpk3UltPRPB+qQ9rdKU=
-P2k5Ue4Lv8y64ZIHXxB1ELMtDXvYITGLl5Oa2cfGZzRXXWJcXpDSx0pgEZ36UZf7
-P2k5Ue4Lv8wDd7+GstpwnGI2rUC8DjuD1kZ6inS5X/8qp3pee9AtDUpgEZ36UZf7
-v4ihoCtNRVm64ZIHXxB1ELMtDXvYITGLl5Oa2cfGZzRXXWJcXpDSx0pgEZ36UZf7
-VCHr/EMKXxzO0EtYHLOvpgMNBhUCi+wQ9hT2lIaacqU=
-GDDHjFNx9y3/htQJCfkj0jH8At29S2vWUUnOob68iS9PfX7y11TKwA==
-GDDHjFNx9y3/htQJCfkj0jH8At29S2vW2tJwUxoKu3abbUwv5Q8S+d7SGlS0JFuG
-MetFyWuxralvb3xYsvaR/MMR6cuqYjY1KHgdbgnkKc7wshyLxCfprPOj8LtFg+GJ
-xt3ch79mTxiU1kX+sOaXa7BzljBEfN2xy4x6AQXguls=
-xt3ch79mTxioTyQOFtqiPd7SGlS0JFuG
-JZwfCTqSDJWwq57YkquoA97SGlS0JFuG
-V36oXX8CJ64Yoo5YVl4ymjt1kYZzlOQoepvcvTeQwrw=
-duEQlK0W9zCQ4FSyzAKv77AtFeQR31keepvcvTeQwrw=
-NBBXNZCaNE99yZ92+zfrDUX1wgDB6SwAlcfDWHvheBM=
-tsogkendiar58tUSo2w3wV8pxEoXZNj5aeu8Uvl+alM=
-tsogkendiar58tUSo2w3wU8KuEfhpPX9nvxJfBqZsKF1CazNTv2aYfOj8LtFg+GJ
-/nSM2iK24qLBTtMburLns1QlsPKn/6q1hFq5sh8RQyE=
-s6xvxms4FKy3Z3wCjfQBfKEFpmD/7rphVYc272jQVlw9isRJWDpCZQBzJ7mfsQkty4x6AQXguls=
-0XdboMChu2E5gHpaD2pPoiWj50Qs67mB52mHitj3oNVPfX7y11TKwA==
-ms3NmDDAWXnBdIdG8bPRHll2tDC4Deily4x6AQXguls=
-ms3NmDDAWXmcg+a+FanOcFl2tDC4Deily4x6AQXguls=
-/i480IQgLMepMlZ7KX1uK7L8zAiM/vumYB+cHAiOl8tPfX7y11TKwA==
-VynNxYGlkQCQYi/wKhpaD0iU8imBtrfgy4x6AQXguls=
-VynNxYGlkQD3+GLPpxcTj1tgWhqdfi+qibzFuc+pkRD0fQTyIpclWA==
-VynNxYGlkQDbOP3RQ7tZ/vQnZieAvsPmzWNhsrxTgYM=
-VynNxYGlkQCj2Ow89poxDRL8JTHsvtpK9H0E8iKXJVg=
-VynNxYGlkQDiAh217GaWBX6iA24juz/gy4x6AQXguls=
-hUAdePKw8FbP7S63W+brpEiU8imBtrfgy4x6AQXguls=
-i8Syi+i2egOEUBf+PUKtAiWj50Qs67mB52mHitj3oNVPfX7y11TKwA==
-nly0EGexHS8W40YEz3OcshThMltj0h+y52mHitj3oNVPfX7y11TKwA==
-Z6ORYEVTHAYYMNtTOEq0iiJCwkfSBhWqy4x6AQXguls=
-Z6ORYEVTHAbdjUukdGSSoRjdGWQl0x5hy4x6AQXguls=
-Z6ORYEVTHAZcKrbMkfbHlC2cRMPa25eHibzFuc+pkRD0fQTyIpclWA==
-Z6ORYEVTHAZcKrbMkfbHlPSzXA5wk6riG7gWkmicr4aqKNVkN8emPEwWBzUGIE3Fy4x6AQXguls=
-Yrj7/CliiawTfm2BwPdp0LBzljBEfN2xy4x6AQXguls=
-Yrj7/Cliiax2vHf+pDgnBN7SGlS0JFuG
-Yrj7/Cliiaz4osiym+Qx7rBzljBEfN2xy4x6AQXguls=
-f8aF/kdme/IKyS+7h+VKSWL6uHlLqsog
-bK8Zpab/PptNYls6bckCK/nQ97t6cMEn9RrMjQw02M5PfX7y11TKwA==
-h+WfKYcw8/5UYRP2vPq8D9ll6SkFs1l/9RrMjQw02M5PfX7y11TKwA==
-dQt5mgUKF7RGbvA+FxO6AQfkmii5BuyZu7hkhPiE07E=
-9K+PZ38Hd/3Lq4u7hNFVk7BzljBEfN2xy4x6AQXguls=
-9K+PZ38Hd/0q17w2ajSKHLBzljBEfN2xy4x6AQXguls=
-sPbuqnenXG9VSWDLbldzl1Pq3vaS3WGD
-WVz6k53vYlvCE5zi/CJYd0pgEZ36UZf7
-wMnWetYvwcB22baEwHSHdWDAN33wOHW6wQ7cCkCUWxZPfX7y11TKwA==
-FQ7Z0CPc4AlqXJH1d/vXxlqOf3u62uxi
-6uJVi7VzfR9fuLJtpOjzH/Oj8LtFg+GJ
-LbpsRClvKt7SNFr9wNKob/Oj8LtFg+GJ
-zOB+Gixkrqq0PZ7rDpYw+g==
-ShmFYWl9kbLSNFr9wNKob/Oj8LtFg+GJ
-BPywirVs7BwjgMng2FanCRjdGWQl0x5hy4x6AQXguls=
-ttuFIQiBSmBL/UW/zBqattHEM4o6ZCR6y4x6AQXguls=
-miKP0CYl3W5Ym2pzcr/F6L13FBy0uL+iRPB+qQ9rdKU=
-8n8zV92Zv6l9KDxIQfEX1r13FBy0uL+iRPB+qQ9rdKU=
-8n8zV92Zv6nu8xwJpBGB7r13FBy0uL+iRPB+qQ9rdKU=
-8n8zV92Zv6krX2BZrGZD8VpIinwp+ERxibzFuc+pkRD0fQTyIpclWA==
-8n8zV92Zv6krX2BZrGZD8VPHTAexdz+zibzFuc+pkRD0fQTyIpclWA==
-8n8zV92Zv6k1kZKII+JesEwWBzUGIE3Fy4x6AQXguls=
-/SbDH4creAHCE5zi/CJYd0pgEZ36UZf7
-9zUaxn05IBwS7PNKz81G4R36d9MG7xUn6uzv0j5wVxhPfX7y11TKwA==
-9zUaxn05IBxgnwnOZ+hQK4kq0N9SOLm5
-FRuKyrtJj/RL/UW/zBqattHEM4o6ZCR6y4x6AQXguls=
-+Coj8KXFfRxp2idI23BKPPOj8LtFg+GJ
-iF6Bt9zVCn7ItVyfMJtsjQ==
-PfdaDBocFQixm2LbXcoIDXpmvKAVeqCzRPB+qQ9rdKU=
-k7aDH3uuoqARhkIHqx1H7tsp4Ism9gRNy4x6AQXguls=
-d60eywEVz6xBSvshOJLAoJBwNuVVH6sq
-obe5iClk984NDakaoCCLCJBwNuVVH6sq
-1TVDxDeahUN5RG1vEUP2O5BwNuVVH6sq
-B6XhfErTTJgfRf0i/Vkb/bOsDNsReNLeRPB+qQ9rdKU=
-+wYtQHJp691kNVRINR3RaHpmvKAVeqCzRPB+qQ9rdKU=
-Y3uHEyYQDdrSNFr9wNKob/Oj8LtFg+GJ
-WV4Ty/OMJBjA2E20A93dy1/cKgeh02Cpy4x6AQXguls=
-m0lX8CRPaqiw8mEQdSz4E/Oj8LtFg+GJ
-Do2wiH59igUFYo+n99SzmPrLJk4dYoKYaXBl6wZu5y0=
-UQx8DfENDTsDlTTw1nBAWlPq3vaS3WGD
-hT2R6oNQDGiD+EtUMNSV0fOj8LtFg+GJ
-xGjxEbbo/twhJLbnEbgPLFPq3vaS3WGD
-xGjxEbbo/txre6ZjJY/aDNSX1ILygfSsdTD26Z5KQnpal+TXCztiQ/yCn2NHqVIHy4x6AQXguls=
-Xeg5n8JTu9Gw5i8Z7YSfZkpgEZ36UZf7
-VQVgaWVz5xKx92ImtPG7wALm/EKxWl15
-lQFziLYwAFR/Rx3+b7qP0/Oj8LtFg+GJ
-v9yCwhqLXXRy0a0P9VppW0oPmHAI4936
-Ss1fTwot0Qh1CazNTv2aYfOj8LtFg+GJ
-mbpi6adHTerCE5zi/CJYd0pgEZ36UZf7
-1aJE0MOrznGQLBb9TLgT0vOj8LtFg+GJ
-2O5atTA83YryUEMJR9kTcPOj8LtFg+GJ
-b30Bnk44ReFqPP6LYZnzpu1sIpk3UltPRPB+qQ9rdKU=
-aak3L9Lnp6k4jrPr+Vc2QkffVX1Kx6/gaXBl6wZu5y0=
-SPMC0Or3Wq5Ym2pzcr/F6EffVX1Kx6/gaXBl6wZu5y0=
-Od0k7somw0+ognNgz49kBq1TqwiA1pre
-neSRPR/Dc1r+5avra8D+/N7SGlS0JFuG
-NPyf8uRLdZAxgppd7vKR30iU8imBtrfgy4x6AQXguls=
-EMu7srLgFkT8KlV1ph0Yje1sIpk3UltPRPB+qQ9rdKU=
-x9PLCfVsCr/aY475fTCHFCJCwkfSBhWqy4x6AQXguls=
-x9PLCfVsCr+l3V44t9O2VSJCwkfSBhWqy4x6AQXguls=
-x9PLCfVsCr+UayicXLX+aCJCwkfSBhWqy4x6AQXguls=
-gre6Tf1xXnA8kiJVq+hjxkoPmHAI4936
-LAphuzvX0+3XoplDMw5YiCJCwkfSBhWqy4x6AQXguls=
-LAphuzvX0+1cKg99X5f5WEoPmHAI4936
-RT8uwG1AoLRL/UW/zBqattHEM4o6ZCR6y4x6AQXguls=
-tKMGaq5ZqS8faicHeoCF8GnzW8KqwV7b9RrMjQw02M5PfX7y11TKwA==
-tKMGaq5ZqS/cxQIQipmO5ytKOLKlA1ksMvC5rExawa6V8xmS/Gv42azwXryjYWOyFt/BclTC+KpZOr/GQaeSWEpgEZ36UZf7
-MEV2TdfjfmxsgNJHgfD0IHy5ViVd9uvlrFPG/qrcRHVPfX7y11TKwA==
-SZ7z14JzRxz8N5fA/Bb0QEoPmHAI4936
-bhXPjU5Ou0zCE5zi/CJYd0pgEZ36UZf7
-ZTORLADhCW2V5Bc5DWG/rll2tDC4Deily4x6AQXguls=
-ZTORLADhCW0//Lt/QRmfpyH/h1pywZ5c0pCfO/z5g6Y=
-L9fVUSRavgJxLBNTp+QtPfeK6RLf4xMTy4x6AQXguls=
-dNe0XAa3Jm+3JvJ2Xjm9/UpgEZ36UZf7
-GJGUhATERBm3JvJ2Xjm9/UpgEZ36UZf7
-/9URtgHOtUUmgH9IsYidFKiSzovJkrG6856CtLA2mBI=
-lxyRA/zOuaXhlvYRJmLKFghNNHLHKan7QE1oNjRzv0A=
-k/AWU8J38exqXJH1d/vXxlqOf3u62uxi
-0Xh3Jo3x1fcVN9/lDCFFSFqOf3u62uxi
-sXhYv4ghjQ393cgW1OhgWPOj8LtFg+GJ
-ddsicK1RKkr8LfyJUw8Qg3ynnASRkZlj
-Wj5HYIWDLWGw78a972g1EkpgEZ36UZf7
-su0V2rk2gah2w8q8JxH30WL6uHlLqsog
-7YT/1gWrFMOsITkil5j+MAxHjZXQ2XqDuF3NIeLI7v0kqSiGLp5inA==
-GPdd2yIwWWesOniOA5cBq41ncbSjshCEmQCWLXtYoTFPfX7y11TKwA==
-mtIyd1Hqz2UxOjWwaO+5DiH/h1pywZ5c0pCfO/z5g6Y=
-1MHev69zrjZj004btOAkes94cw1mrZqiQE1oNjRzv0A=
-PbYt1gxECy9PyDHKyZ3KARCOh35FTrhDYCbiEbl34508wX/qhzBqr0pgEZ36UZf7
-EjAf+Fk40oLXv2qPN2R841D8sLBRuvnPVj3R0+P6Ke796uutIWsx7JC4iPbph9qG
-it7CAuuV7SAxR6MAda5351Pq3vaS3WGD
-IS3trY+w1C5ped3RWFjnRS7e/oaau9gAXpBSJ5uhUAo=
-7ttNQ1aOZmErxH/5ZZarV4EwIA0kxtT3y4x6AQXguls=
-fDYkXHftmz8W40YEz3OcsuYEtK9W2WqUmQCWLXtYoTFPfX7y11TKwA==
-XXxX/NgmOKOlw/JG9WEaL36iA24juz/gy4x6AQXguls=
-Lwk9eym56F2hG0E0QBbiBCyfxx3KDwLB
-UCgJlS/HXezaY475fTCHFK1TqwiA1pre
-UCgJlS/HXexHXYr3weuURK1TqwiA1pre
-mqvMdLunKrO04LVLknUe10UNUQ2QoJYZBtmtkvJYaYzLzkZfPTHbZw==
-JuMgbbZn7fp/Rx3+b7qP0/Oj8LtFg+GJ
-Be1T87t+ge5XlrymvmHctvsjOZIlqq3hrFPG/qrcRHVPfX7y11TKwA==
-Be1T87t+ge5XqKHPIBx1decIVVBHT46ECvyKmpm5Z0Q=
-Be1T87t+ge409nSxFi4IHE7wB8aAVMVRF2Mdrjp/QpU=
-Be1T87t+ge6oc3vYT7LsOXLLIfzR98fTHWnCZH6t2//hH/tXNeBfPQ==
-Be1T87t+ge6yBrpNLcSpoZjZkopBAnj4HWnCZH6t2//hH/tXNeBfPQ==
-Be1T87t+ge5YEOaSf136eQT1tZsHfiBBy4x6AQXguls=
-Be1T87t+ge6km2jSURfVd+cIVVBHT46ECvyKmpm5Z0Q=
-Be1T87t+ge5gONVh6hyj4FjBxRP/noEkHWnCZH6t2//hH/tXNeBfPQ==
-Be1T87t+ge6BEzUegK+LzecIVVBHT46ECvyKmpm5Z0Q=
-Be1T87t+ge52p/GUBvJlKgT1tZsHfiBBy4x6AQXguls=
-Be1T87t+ge48js9ij9+tfOcIVVBHT46ECvyKmpm5Z0Q=
-Be1T87t+ge56K4HqriD8jeRV0q3Q8qjoy4x6AQXguls=
-+89J6TR32voQgbOipa/YegfPpApbMOkMhFq5sh8RQyE=
-LlMqJlMfp5XCE5zi/CJYd0pgEZ36UZf7
-q3wgm/88Ra/5FA/QNzKqWKEmC0tHnFgTKSotK/v0yek=
-JRjgwC9Nl8D07Pr83yxuuoZiRLknPIhby4x6AQXguls=
-23R1BuGALKkPTIc+xqy84g==
-MejiOyuUSYXCE5zi/CJYd0pgEZ36UZf7
-DdOs5Dtw0QwfYrJTd7u97V8pxEoXZNj5aeu8Uvl+alM=
-4HI+0PfJaYN8YPH6c539+jzmU+FOUsy4fER6RG1klik=
-lx6eh+YkHBXGQf4A1Ut9bKuL51BaHbjJstNvNKfkPxHtfbwrS7yCE0pgEZ36UZf7
-9Mqch0gZ4bPxBEF6YmaZtkcdj80TCvSKqzKLxcx+tSc=
-9Mqch0gZ4bPz0v8j23MbjNPaFoMUutn7RPB+qQ9rdKU=
-9Mqch0gZ4bMvCICzkLDDGehZn9/adx3vy4GGkE0bbpyw8mEQdSz4E/Oj8LtFg+GJ
-9Mqch0gZ4bO3ZIY+lmc/+RnMjLDUY5xny4x6AQXguls=
-LZyp1gIf6wiOl3qik2jwk6RDFmbmXXil
-oUHoi3J+yiDI1bw1UsJaVEpgEZ36UZf7
-E03BI5P/0r/MhUL6uE0NXEpgEZ36UZf7
-ZYCQozJW2qvwOxi41E/bGvOj8LtFg+GJ
-Wx+TYikA2urCE5zi/CJYd0pgEZ36UZf7
-qW7Uf+cuUKUCAZnq4oBF/POj8LtFg+GJ
-JsWoe4vRDt+jI1emh9XUFPOj8LtFg+GJ
-qMdsxFnf7SjCE5zi/CJYd0pgEZ36UZf7
-7nUs+pzMGNQU2voVSXubFpBwNuVVH6sq
-rh16PU/bLznKwSWbD40NLyyfxx3KDwLB
-Mpws87qKqdUCAZnq4oBF/POj8LtFg+GJ
-wAG7h4jgsHz1hFgQXur/mkpgEZ36UZf7
-cyrUnsE+xTt/Rx3+b7qP0/Oj8LtFg+GJ
-FeneHV0jniXhjOGBjP0tkSoVbfyrL10EWhqDUIQPQGM=
-FeneHV0jniUYclRR5n6EOPeK6RLf4xMTy4x6AQXguls=
-B2EBAR60IppisJUSU6syO0oPmHAI4936
-2auQrCxhHIuioNaJ2OEJLEoPmHAI4936
-Vfay8OeyRBHCE5zi/CJYd0pgEZ36UZf7
-3BvyzjY734aioNaJ2OEJLEoPmHAI4936
-cFYwLcx8lBi40Fj+KszbNkoPmHAI4936
-+BWPPfYlvW1XqKHPIBx1ddHEM4o6ZCR6y4x6AQXguls=
-tqfw6NEVIE2E1PvLgQn/VJBwNuVVH6sq
-D/nWCdnKl6ptV7mJSxdBKJBwNuVVH6sq
-wesEbkcq3G2JlqzsLpoontS+kgXZKgOPy4x6AQXguls=
-YUhOmXNESHB2ZZeRKlYPOEoPmHAI4936
-w0pNO/G/ztmyPJEuX5FlVfOj8LtFg+GJ
-aALCXOoFPx92VgIo4mv4FtS+kgXZKgOPy4x6AQXguls=
-aALCXOoFPx8Ey0tJ0nESHdS+kgXZKgOPy4x6AQXguls=
-E/5wOVIsF6a+DupvRV9k9N7SGlS0JFuG
-+js67kDQcFh9h8vjUcC6wfOj8LtFg+GJ
-JOWuxy1tcO63K9xlTBbaJvOj8LtFg+GJ
-vw9DQsUCodtXqKHPIBx1da1TqwiA1pre
-q8SO41xH4H+tv3/3+UBOAUpgEZ36UZf7
-X+2h3edByPRXrrLCZAbA0IBwebx29WjwN5m+Gay4mDc=
-zCVSXXb5NXkVN9/lDCFFSFqOf3u62uxi
-DtuuJAfVwT3VGlpd50u+NkpgEZ36UZf7
-EiJtPPoy5YOqBDtVMagTbba/H5IGWzTO9hT2lIaacqU=
-JawkevnCrNdts8zcqwR2eKHvMDErP7gJstNvNKfkPxHtfbwrS7yCE0pgEZ36UZf7
-lPChL110T8qH6H8fqQsEDQYd3czwK5kuaXBl6wZu5y0=
-rCMp7rtnhxrHQdqfJSKMLAYd3czwK5kuaXBl6wZu5y0=
-TG2nF5NcrshL/UW/zBqattHEM4o6ZCR6y4x6AQXguls=
-4wo8hNCdEQEmaNNvL8sx3NdP8cG+AoEp9hT2lIaacqU=
-/7ct4BMAXCUzXDr7TYw7uQLm/EKxWl15
-t6I+Wba8BRC9FppGobofTZBwNuVVH6sq
-FuqufNWLbz7WJtI2H4aUC7BzljBEfN2xy4x6AQXguls=
-Nt6VZaeWqZzN5z6vOYv1dKlsit/TVI3D9RrMjQw02M5PfX7y11TKwA==
-Nt6VZaeWqZy1QXPpBNd8kQncLU6QuExl9RrMjQw02M5PfX7y11TKwA==
-rKBk01Fx9j23JvJ2Xjm9/UpgEZ36UZf7
-ySmvEQkp+QnDVB+FOWxfQpMk2YgHTvJIlG2KEQazVUfqIZZcdg+1Fg==
-ONKJPxQ05EuDeZQi7n+ymPeK6RLf4xMTy4x6AQXguls=
-/ZBZNOiYzE+2EkinjidSXecIVVBHT46ECvyKmpm5Z0Q=
-PmXiFkkqLljCK04zVVZrqh9chXIUgi4lFw5IxUfsdvk=
-VgjQjLlxJgbVGlpd50u+NkpgEZ36UZf7
-oCdVZ3TjXszsI02ZCbErN/CvCYF5ZT40y4x6AQXguls=
-06VstCfw9TsVN9/lDCFFSFqOf3u62uxi
-yIwYB0D5ANpIkRc7oSI9s7K8YzH4gDQgy4x6AQXguls=
-kQHtQ28+jmSs22EWcIktH5C4iPbph9qG
-l88DeydS7Mr/5w6rMKFsfecIVVBHT46ECvyKmpm5Z0Q=
-cchXAGqWaFReJ21yxIT3be1sIpk3UltPRPB+qQ9rdKU=
-RNUTN8me5q1ReH0oBHbJGNqY7RGsCVoPAfBGcSNe17xPfX7y11TKwA==
-RNUTN8me5q1or2m5+SKQMMSKe9vVY/8AlG2KEQazVUfqIZZcdg+1Fg==
-hU2JsvCVd8iVbaq0hPsRvnpmvKAVeqCzRPB+qQ9rdKU=
-CQJvmF3yt1F6BlAdBV+jGC9myxH6CkHeEFyO6huNc6Q=
-3w3xExz5BYjfEMKoqqshoIaR13R3nUd3teq+RIooEghPfX7y11TKwA==
-xjGHNt3JuT9IOeeheINUM0oPmHAI4936
-HQ4O/5TsBQbpSgcoVE4LbXHIgbvw9UUMxNhXTmnBUo8=
-jDc+I5DLhjcdldob8yjvsEoPmHAI4936
-jDc+I5DLhjdaVQ4Lv2EkrkoPmHAI4936
-ERG/my0wCEMmgH9IsYidFKiSzovJkrG6856CtLA2mBI=
-8GR+KuRP/IrZpafk8rhqLjO11wrX//LPpDa+H9/X6UI=
-+SvHIm2Mlu9B+y4G1LWUjUoPmHAI4936
-+SvHIm2Mlu9WgHE3Y5h4clmDacM1Qce94KJlnTPYf0iYzJ6oJv+qKw==
-HLbF1HKtXYGIo7PKykxrN0iU8imBtrfgy4x6AQXguls=
-UnEQf/j0jK6x92ImtPG7wALm/EKxWl15
-FkH+3MJcYBmyPJEuX5FlVfOj8LtFg+GJ
-bq4owRXG1PiioNaJ2OEJLEoPmHAI4936
-bq4owRXG1PiMRJQtxc8R6koPmHAI4936
-osXaeNVdi5Bh4GvBMx4eJ/Oj8LtFg+GJ
-uCAuXCRbEjOtv3/3+UBOAUpgEZ36UZf7
-YTFr6yTNbAO9SSnHHBVGA/Oj8LtFg+GJ
-GhRXduWr8cb2YvmikroYRiHFVYFksbf2rFPG/qrcRHVPfX7y11TKwA==
-GhRXduWr8cb3R9KvkRZsVtHEM4o6ZCR6y4x6AQXguls=
-z0NB6EgQrYuej9syichlRRjdGWQl0x5hy4x6AQXguls=
-7dwIUGq+pHAjgMng2FanCRjdGWQl0x5hy4x6AQXguls=
-7dwIUGq+pHDVNpX+SJIcBl2BBsIawet1u+2srYn+TwXMhUL6uE0NXEpgEZ36UZf7
-8F5Rffa3tXf4n7ZrF0P2pJBwNuVVH6sq
-DH2VViKrbzkp6/lKXi3UMOrUo2OLEJuOxJkxuUM2UM3TUyqisEKkO0pgEZ36UZf7
-jryElcwKEMNxLBNTp+QtPfeK6RLf4xMTy4x6AQXguls=
-J2nslBNjSd9lRnm22WMLCZBwNuVVH6sq
-CrymWgzKBwmowyaOlIWPkfOj8LtFg+GJ
-W6++NOLhnGKW64PK7OzRci1TUpamJyWhy4x6AQXguls=
-W6++NOLhnGImgH9IsYidFKiSzovJkrG6856CtLA2mBI=
-pU876B1hGC6+86Rb1W1pEQ==
-ymBA422YpT60tTwm0ePTu/Oj8LtFg+GJ
-B64Md1JCAwjWUpDt6Xr+nkpgEZ36UZf7
-0GpXlkW1y6vWUpDt6Xr+nkpgEZ36UZf7
-iOqRqy56ghCDwJ8yRW4QTd7SGlS0JFuG
-sxgS7X/mz0eeQpPRvTm3LFPq3vaS3WGD
-jhM9JTBsgxfSNFr9wNKob/Oj8LtFg+GJ
-wyDvFk8TTUS0PZ7rDpYw+g==
-X9EC5zk/BzLTp7h58XZ5OfOj8LtFg+GJ
-YbFLLWDTZX6jebsJIc8YlfOj8LtFg+GJ
-6gWj62/jMx79+r0EMibpOfOj8LtFg+GJ
-mc0v41Pmxbu3JvJ2Xjm9/UpgEZ36UZf7
-93ZjDiJwkDG8RbktMnXXHfOj8LtFg+GJ
-Xn4HnNubANHFZ5D2h4QJfYZhCmXNWZmGaXBl6wZu5y0=
-/VfPpD7+6ViEcDEYG6zc49S+kgXZKgOPy4x6AQXguls=
-048X8sVpSrC5/0FNXste6fOj8LtFg+GJ
-odwlcbPCv1V2ZZeRKlYPOEoPmHAI4936
-s9fvPkvw+eO5/0FNXste6fOj8LtFg+GJ
-mVQ8Q8ewqYWXVpljuLaKukxdyVOf7XNtZ5wrfkhkzAA=
-ffIYZ1PjuXBx4u2IJrBm00oPmHAI4936
-0oaWW6Ft5KK1f4daHIwZR9HEM4o6ZCR6y4x6AQXguls=
-L2rEB7a+UV80RdSYnDioG4yT35O/ZMlXjuyKZVVSxxc=
-/nZa4JHvh5RutdpwhrdIlO1sIpk3UltPRPB+qQ9rdKU=
-/nZa4JHvh5S+AVOQd4583+1sIpk3UltPRPB+qQ9rdKU=
-0j/OcOgq4vblQZ/5Ca6DjU5xRxlEwuuujuyKZVVSxxc=
-yAZvjf/Npq3Jcbvke1EgJ0oPmHAI4936
-wg6D0EnuXuQnHOlkm0sxA+RV0q3Q8qjoy4x6AQXguls=
-zONWHZaMDFDdMM/Jx/UGaCQln6pOmJcZ0pCfO/z5g6Y=
-b+p7oPuIEcXgfJazTxRSvALm/EKxWl15
-b+p7oPuIEcWpakXUpZ6hBrfQ1g178t/sR4q+tB+teD3wshyLxCfprPOj8LtFg+GJ
-T8EFg6F1LsJnJtwh+biWBnUGLM4fr3KEy4x6AQXguls=
-9ln3OtBAZ4xYHWoVS6+3aE7wB8aAVMVRF2Mdrjp/QpU=
-2w7I+GMn9H92bBstIl8fQUoPmHAI4936
-zmnYQWRJshw8pS//ypC4EfrLJk4dYoKYaXBl6wZu5y0=
-zmnYQWRJshxfVjmT72+IU/rLJk4dYoKYaXBl6wZu5y0=
-pP/EazI2ohTJcbvke1EgJ0oPmHAI4936
-HSlkVdSEOqxDB6mfhWFtF/rLJk4dYoKYaXBl6wZu5y0=
-iaqd4ac59tkwmxiV/uttpe1sIpk3UltPRPB+qQ9rdKU=
-6950kamGyz1jn8atkAa4WRWb7Iq+ue9U0pCfO/z5g6Y=
-ZBlMqkWFMgGHlQYO/29XsPOj8LtFg+GJ
-etqHd962VKXwshyLxCfprPOj8LtFg+GJ
-1rOjBHyFj+eHnIZJN6/3sBATcNYyjC0W0pCfO/z5g6Y=
-yjsVsC9nyaHCE5zi/CJYd0pgEZ36UZf7
-RL9wd7sqH8nJ/XFJLG1noC3MK637qtLAFw5IxUfsdvk=
-FfjvvdggP/1GEF1igpqnMjoZ9Con4QX6A2+HaLUZbe0=
-tVBVCkW2P2vvP1LP4h1GfVPq3vaS3WGD
-c8fipJzZpKHSNFr9wNKob/Oj8LtFg+GJ
-bAvcVi4Iw6s88My+QyBF4iOSA1tar8TQ0Rzn8E7ul0JLV1Hq0b8BpPOj8LtFg+GJ
-PARbOnEYlB3rgwUip8TSvrBzljBEfN2xy4x6AQXguls=
-go/dWWwGU8bJOvnYyXNsXpC4iPbph9qG
-TkKCqeWSukeV4wuSWx4U26GFuSH/HQxAy4x6AQXguls=
-TkKCqeWSuke8RbktMnXXHfOj8LtFg+GJ
-TkKCqeWSukd0P3wPBDQ7QFPq3vaS3WGD
-hO72ygyNsdS3JvJ2Xjm9/UpgEZ36UZf7
-LoM+jDhQqFDwozCIpR0nf0pgEZ36UZf7
-mySxSoQQ5hH9+r0EMibpOfOj8LtFg+GJ
-3jzcnOifPTGUtstGJWfN1Hrz3wa3t9i6y4x6AQXguls=
-4kdkKXQ7T0R1hHUpo6tg/ajv8HiCer8Ay4x6AQXguls=
-4Wm1uiOER9zSNFr9wNKob/Oj8LtFg+GJ
-7ddpONXhUU5L7w5GPenWeql77FvoyOUCfywvCjeRl/T0fQTyIpclWA==
-d1sVTi4llK7lQZ/5Ca6DjTtDCKtSyZ8Eaeu8Uvl+alM=
-Fmkib4/xoTMCeemNLJHnJgLm/EKxWl15
-PaGbbzoWurQnHOlkm0sxA+RV0q3Q8qjoy4x6AQXguls=
-9Si22Bpxf/QBFq6hXHFOTkwWBzUGIE3Fy4x6AQXguls=
-5z/FaS08FC2I51kihoSlswLm/EKxWl15
-unXa+WSPJaRSSitwj7vrXQLm/EKxWl15
-aoyMNdWOkHd1CazNTv2aYfOj8LtFg+GJ
-4+Hqev/UbHPPxYlpacEdI0pgEZ36UZf7
-TQRngJH1Ek1qPP6LYZnzpr13FBy0uL+iRPB+qQ9rdKU=
-CcAtnE63g1xa033tXDwlqSgM1VPOu4sN
-2n75FC3uwfC2lddTY1y4I0wWBzUGIE3Fy4x6AQXguls=
-erLQ3JyUfISiMFttLBCaNgLm/EKxWl15
-psmYD1yV0+1SSitwj7vrXQLm/EKxWl15
-T0tpWQa0WBy9wwymMgTHHEwWBzUGIE3Fy4x6AQXguls=
-GU9rv7S9HDKCGC55KuzT8UwWBzUGIE3Fy4x6AQXguls=
-eYAwQTFdThU3xjZ6HMSwQb13FBy0uL+iRPB+qQ9rdKU=
-ZcATeY3SOmU8js9ij9+tfH6iA24juz/gy4x6AQXguls=
-ZcATeY3SOmV6K4HqriD8jX6iA24juz/gy4x6AQXguls=
-WpMnbnNRcj++AVOQd458336iA24juz/gy4x6AQXguls=
-LT2QzTDBMvBSn/fQrSogfSanigrTdC7fzWNhsrxTgYM=
-3S0zBzzcG28nHOlkm0sxA+RV0q3Q8qjoy4x6AQXguls=
-rH75MlwLe4iHDjyHip04zn6iA24juz/gy4x6AQXguls=
-ORtAqQQY1sfPxYlpacEdI0pgEZ36UZf7
-BtmsuCW8kSpA4pTRFdS/KQLm/EKxWl15
-hgKSS6WIoWEdo9FMoGbGk0oPmHAI4936
-hgKSS6WIoWEBDkcxYXRMQhToYGFen0lpzWNhsrxTgYM=
-hgKSS6WIoWHSQcDia9XkMUZDtywxNaqwqebDJ2D3GrP0fQTyIpclWA==
-ObtZggguHVH75+AsqJdaK/Oj8LtFg+GJ
-5ElRLBbico5HfaFd/KsR0koPmHAI4936
-gBhYk85FRG6M6X8re3fQg/Oj8LtFg+GJ
-IIbeVb1Zp2Vw6L/p6JSpG/Oj8LtFg+GJ
-z71z+qSu7Ey0IhLdN9AyUEoPmHAI4936
-cGT7aZk2gf7PxYlpacEdI0pgEZ36UZf7
-79ikOahtbziMeW7poAUy4dDGrvtwVnWwfER6RG1klik=
-oDX9OktCqQS5+Ag8CVGtZAEles108WxdRfifV1nUUrFKYBGd+lGX+w==
-4WFREg6StsXlQZ/5Ca6DjXXPc5Ki/J8mZ5wrfkhkzAA=
-+/5WFE6HdRIVk1QoQHbV70oPmHAI4936
-/rrEnWld478nHOlkm0sxA+RV0q3Q8qjoy4x6AQXguls=
-LBjLIuMcxdXj9lLGelo0UO1sIpk3UltPRPB+qQ9rdKU=
-h1XeOIBMRZ14iFg1egzOlALm/EKxWl15
-Liq4+z+iHBbwshyLxCfprPOj8LtFg+GJ
-hMPHG8zWfevwshyLxCfprPOj8LtFg+GJ
-+pXXyHkf87vPxYlpacEdI0pgEZ36UZf7
-O8xLRFQpwrDdxEXzi6UoSsyW8297TnFZ0pCfO/z5g6Y=
-59OFXSNrO2ax92ImtPG7wALm/EKxWl15
-MyZ2EamTQ95rfLPYpSRg6UoPmHAI4936
-1suDit3Eq7XNgWyWzjfkBTVnubG+Sf58Qxxo88aAg3c=
-p+oXZGb9felB+y4G1LWUjUoPmHAI4936
-T8qiUcOxWGex92ImtPG7wALm/EKxWl15
-megPgZgZatmyPJEuX5FlVfOj8LtFg+GJ
-hIcKxvB0qrStKsK1NKEnjnUGLM4fr3KEy4x6AQXguls=
-hIcKxvB0qrQ1/obow+hNxNS3UCP+Xxke56zwMY8I/+GEqKNFUcAAUEpgEZ36UZf7
-hIcKxvB0qrQ1/obow+hNxM87KOEe5EKO56zwMY8I/+GEqKNFUcAAUEpgEZ36UZf7
-hIcKxvB0qrRmdPhpVvErmmU8YnidNLyF56zwMY8I/+GEqKNFUcAAUEpgEZ36UZf7
-hIcKxvB0qrTRUDfrIg6YeeOaiJxfN2NojuyKZVVSxxc=
-IgfkS/yzfiNl6qtXuMmmfSJCwkfSBhWqy4x6AQXguls=
-vdDujKxsGqTu8xwJpBGB7vrLJk4dYoKYaXBl6wZu5y0=
-vdDujKxsGqRfVjmT72+IUyJCwkfSBhWqy4x6AQXguls=
-vdDujKxsGqSuYTcjFB8CYIW56gVH63DBT8qiUcOxWGe/98RHxldG1vOj8LtFg+GJ
-vdDujKxsGqSuYTcjFB8CYL6qBg32lrLQT8qiUcOxWGe/98RHxldG1vOj8LtFg+GJ
-NUY6EzUNBcupT2zvt/urCUoPmHAI4936
-O8LPxcSZWgCyPJEuX5FlVfOj8LtFg+GJ
-MsAiyvZZGvKtKsK1NKEnjnUGLM4fr3KEy4x6AQXguls=
-Lz3xBm67RkV4emxgFA0tiJBwNuVVH6sq
-2UBsnltmJt+RNpK5CN0kEoEwIA0kxtT3y4x6AQXguls=
-53+yvEZVribSNFr9wNKob/Oj8LtFg+GJ
-s/Uo311nB4nNgWyWzjfkBTVnubG+Sf58Qxxo88aAg3c=
-hIwdjylHLGpzJ4M0r7zib0iU8imBtrfgy4x6AQXguls=
-cq6XXjMR3YCyPJEuX5FlVfOj8LtFg+GJ
-URZTYYOprr+ioNaJ2OEJLEoPmHAI4936
-URZTYYOprr+MRJQtxc8R6koPmHAI4936
-8a/odfEE6zzSNFr9wNKob/Oj8LtFg+GJ
-pou90Ds2zWZCzwZsznq8ZEwWBzUGIE3Fy4x6AQXguls=
-pkeEKh1jPSBWgHE3Y5h4coemfMvU1eABfER6RG1klik=
-OwPmdJgfleD9qI/NdGuLvopY37QaCE2vaXBl6wZu5y0=
-98gWtMm+tR46B4D4P9VTIQLm/EKxWl15
-Jv1hD0HAYBs9M2n0C2t1jkoPmHAI4936
-ghSbmaLOO99L/UW/zBqattHEM4o6ZCR6y4x6AQXguls=
-ghSbmaLOO9+2eQd7E/7L89HEM4o6ZCR6y4x6AQXguls=
-ghSbmaLOO99tji7RQU6MglXygIrc0WtXfER6RG1klik=
-Ls5FWwWEd6pSR0e9F1/EYPOj8LtFg+GJ
-at1Bn/0PBKEPvuklRRGDBgLm/EKxWl15
-wDXNPMfkdyNsE0uOQeg/4POj8LtFg+GJ
-dHtBk0+GYeJ8wv8Kzlk4jBL2525Y8Jlzy4x6AQXguls=
-bd68Ff0/MOdHmITcZ8OvTALm/EKxWl15
-RlqtTc1ddfqEqKNFUcAAUEpgEZ36UZf7
-5EBWJUcB7QrWN4gnV7c93koPmHAI4936
-5EBWJUcB7QpKxBbFVac+1wtqBXZ4E+c/PtbZND328nI=
-162SX0X5QG3chbqz0R3o2V3BzxGJLcsP8sfKPfIpMQNPfX7y11TKwA==
-C+CTZb0f4RMrkmpQpbhvUoY/p688/scQYB+cHAiOl8tPfX7y11TKwA==
-XT3mt0mRlBrY32VsZPX+0EoPmHAI4936
-LJS42ZwcpdFDHOAJ30mSrEoPmHAI4936
-LJS42ZwcpdEKOGJCRlOCGEMsG0RZhXWmN5m+Gay4mDc=
-LJS42ZwcpdE7jee3IyQ7GQtqBXZ4E+c/N5m+Gay4mDc=
-7NGKKJN34ogCAZnq4oBF/POj8LtFg+GJ
-Az4+5t1fUEIHBZ5Mnx6yw0oPmHAI4936
-fJTXcZwpB8kt87PJTa1JoRL2525Y8Jlzy4x6AQXguls=
-ndv/6Tbir2Al9SPHO/q0fgLm/EKxWl15
-1/6y3xqeTKfY32VsZPX+0EoPmHAI4936
-wK1sZrL3pJAXtVFp7veb3xL2525Y8Jlzy4x6AQXguls=
-CqFH5cAKYw6qhKm7+HXh+aRDFmbmXXil
-LQrltoM1cpvCE5zi/CJYd0pgEZ36UZf7
-Ol11wPce++vCE5zi/CJYd0pgEZ36UZf7
-w9678/OUZYnSNFr9wNKob/Oj8LtFg+GJ
-RtC8zrx8egrP0mfP1bj7qKFjfApLwKh/N5m+Gay4mDc=
-ERwzEHJFSaSkXYAzJbi62ajv8HiCer8Ay4x6AQXguls=
-ERwzEHJFSaS8RbktMnXXHfOj8LtFg+GJ
-Kr9NpwKWfsKHDjyHip04zlPq3vaS3WGD
-6Oqf3E+UYp2A2FeyW2xavPOj8LtFg+GJ
-/aUJ40q0OGE8js9ij9+tfFl2tDC4Deily4x6AQXguls=
-fkGZhX/El4RpsvPgzA9aB2L6uHlLqsog
-RZ+v/54TrXap58z+jjbwkUpds7npaylHy4x6AQXguls=
-iHNF0shQTZ0i5uPoBbmGy2ksmHFhrajUy4x6AQXguls=
-IzqZUh1jNoW7fEDIh3MPj/Oj8LtFg+GJ
-xjBOWYwtJQIcjhU/Xv96eKyD0xvYLTOLy4x6AQXguls=
-xjBOWYwtJQInz2o+xwX02Whf20/Sfg2Oy4x6AQXguls=
-xjBOWYwtJQInz2o+xwX02cQ6uk/WHcyf6MIva6/KGSO0PZ7rDpYw+g==
-xjBOWYwtJQLNj3osZXWK/wNqyAperh+Gceie1Maa4Hdfzaof9cbYCvOj8LtFg+GJ
-xjBOWYwtJQJRKpnwl88SZLCpTXnOszLxAuqg1HJi1UpPfX7y11TKwA==
-fG3H/eYATNjSNFr9wNKob/Oj8LtFg+GJ
-fG3H/eYATNhSRQKZWsra5zmXZqcwXuLSy4x6AQXguls=
-9WcEVwVcacS0PZ7rDpYw+g==
-5Od2zL01rcmjebsJIc8YlfOj8LtFg+GJ
-NIMkrNyEXQQTkBuMqRoBcqjv8HiCer8Ay4x6AQXguls=
-bL0xvp6bKsyA2FeyW2xavPOj8LtFg+GJ
-OlIufldps163JvJ2Xjm9/UpgEZ36UZf7
-H250ngXCLbRa74IbmJiVRPOj8LtFg+GJ
-v0o/NZ2Flyh0rznFov+n2+fhcFcsFNKYQxxo88aAg3c=
-ILtHucU7b9vwshyLxCfprPOj8LtFg+GJ
-B5DO9dw1D2a7yXAHVflBY0oPmHAI4936
-entKqGlyDvuN/55cHq0j7EiU8imBtrfgy4x6AQXguls=
-REmCvUYOcA6Cg6aQfJfPZkoPmHAI4936
-IRF3FIzGK/WMRJQtxc8R6koPmHAI4936
-Kc1jyiJVnGWx92ImtPG7wALm/EKxWl15
-2gjhNrDt+eeioNaJ2OEJLEoPmHAI4936
-0D2aGEdKA2ZKGV/+gaFbkKf2wJuFXvN5y4x6AQXguls=
-0D2aGEdKA2ZWgHE3Y5h4coemfMvU1eABfER6RG1klik=
-KxlRPOIG9ZstwK0yz09R30oPmHAI4936
-ysFI1Rx/lmayPJEuX5FlVfOj8LtFg+GJ
-BT/fHxNzenBkzZHOvFXHIKf2wJuFXvN5y4x6AQXguls=
-AHJVRVXWVMjbiQGOjO5mmqf2wJuFXvN5y4x6AQXguls=
-AHJVRVXWVMiK6lgP/9Y2oqf2wJuFXvN5y4x6AQXguls=
-LwTctfycqwn1eDN17P0yBwk1seY0eQtCpg10U7yntVtPfX7y11TKwA==
-oJ7KGIaocyBSndz+M2zpG0ffVX1Kx6/gaXBl6wZu5y0=
-46rP4jXWI5nbMhjb7ruRAgLm/EKxWl15
-XXIUiO8imQcnTs9sqqXWpRS4C2VAq+q+Fw5IxUfsdvk=
-XXIUiO8imQfCgbjpU0Ib6VPq3vaS3WGD
-XXIUiO8imQdip1CQWTvLTfOj8LtFg+GJ
-3oeh0L+U9UBZp8LAxcbkMZBwNuVVH6sq
-bpBWCSOn5muOpn2IcS2BfMlK0pFWqtW2CrACxSMFVJ1PfX7y11TKwA==
-ljwmOqHUx3m9FppGobofTZBwNuVVH6sq
-ntKwejfnuA0YgouZt2pykBRGX6dD+yb9qWi9XkUN3uznsKirjKejAUpgEZ36UZf7
-+yp7LhPh6/o2wwd3InzQFy4v4ck8itax5kzFRBUU5DACAZnq4oBF/POj8LtFg+GJ
-twznt9msCJOjJuX2eeHASfOj8LtFg+GJ
-oVwjgLWM2luHDjyHip04zrBzljBEfN2xy4x6AQXguls=
-ZMr6bs8Pd9byUEMJR9kTcPOj8LtFg+GJ
-ZMr6bs8Pd9bQ6oLuzbuHdMAyuvLUrV6nwEoaBEGc9RE=
-MWXFwS+gXECVbaq0hPsRvnpmvKAVeqCzRPB+qQ9rdKU=
-MWXFwS+gXEBL/UW/zBqattHEM4o6ZCR6y4x6AQXguls=
-eYrwlVYgQAsNLBVQVO59LecIVVBHT46ECvyKmpm5Z0Q=
-zm66Ok5YvbJgW+fN9gkOExnMjLDUY5xny4x6AQXguls=
-ocjyg6d/YZbYuiqsh91JVPOj8LtFg+GJ
-C6eysrtIgcAgcxiJCY3Ya7JwOivdSNCn8sfKPfIpMQNPfX7y11TKwA==
-aM6jPf4QFiflc3LHoaCHKTiUnYxvdTs4aAYhz49iPPQ=
-orFEvaQa0+AHI68W/MPHCYZhCmXNWZmGaXBl6wZu5y0=
-orFEvaQa0+DIKZk4XelWJ9S+kgXZKgOPy4x6AQXguls=
-S7N5m+yTVdiTXs+YU4gZf3pmvKAVeqCzRPB+qQ9rdKU=
-39rO+Kxnmjjv3eyoY7qwoXAul+X1XFtHy4x6AQXguls=
-6N8OYQckkzXbjtQVzMQGtVO8SBODgX57y4x6AQXguls=
-/WeDlc4QzvHCE5zi/CJYd0pgEZ36UZf7
-Q+t2NuZi/bYYBYr4xsa99POj8LtFg+GJ
-m7NwXX44/6UMorRxG+mAPKl6skmHW//Gy4x6AQXguls=
-5sZDUmzYHMSQadl/kdNn9Gp3SEzZLUEIXpBSJ5uhUAo=
-4Qvrbb1JTp8Qc5QWoX2eifOj8LtFg+GJ
-m/tIDzJi3OZXUDBIWUrqSK1TqwiA1pre
-S9B++UiCXWUkpVTVLAAIUPOj8LtFg+GJ
-O3P6K+AfRNzF44QHb2ipd8svCgK9hR1bXpBSJ5uhUAo=
-wtKpMto5s6ytv3/3+UBOAUpgEZ36UZf7
-0OYj7bJYGaCbsiqDLJxCRhnMjLDUY5xny4x6AQXguls=
-TEJT79gBm7PDY4PKs+sJ4F/cKgeh02Cpy4x6AQXguls=
-6sLf9oF5/2cFSyaIvrb/N/Oj8LtFg+GJ
-cRBYkFVyJUwqp3pee9AtDUpgEZ36UZf7
-GYBI2zJwMBNey2dyHe3hZWCQBVIqdo0V0pCfO/z5g6Y=
-ynINb2Eqx7SloP32ysnd4UpgEZ36UZf7
-pgzRnG9D+zC0PZ7rDpYw+g==
-Kpq53a0+iGDSNFr9wNKob/Oj8LtFg+GJ
-ky+iLMs6QhG3JvJ2Xjm9/UpgEZ36UZf7
-2Om0H6dKuzbSNFr9wNKob/Oj8LtFg+GJ
-g0zbV1jZvRGV4wuSWx4U26GFuSH/HQxAy4x6AQXguls=
-g0zbV1jZvRG+FqF3alT2MFPq3vaS3WGD
-g0zbV1jZvRG8RbktMnXXHfOj8LtFg+GJ
-XZm6QFzDmJh5QHl4Rg/BHfCvCYF5ZT40y4x6AQXguls=
-/gVNZGSuGULWbJef4vcbmDpK56AtCq0bQE1oNjRzv0A=
-7AFfCdxoVJaez/DwjHv7eCH/h1pywZ5c0pCfO/z5g6Y=
-ycU0RK38xbDLdJNqyw1kxCJCwkfSBhWqy4x6AQXguls=
-pd1F9WAw6p6GsXOp2DRhHxjdGWQl0x5hy4x6AQXguls=
-b8ErQvNUZgeHmDmTzSfyUE7wB8aAVMVRF2Mdrjp/QpU=
-b8ErQvNUZgc8pS//ypC4EUffVX1Kx6/gaXBl6wZu5y0=
-b8ErQvNUZgdfVjmT72+IU0ffVX1Kx6/gaXBl6wZu5y0=
-bKuUJ1epVUJL/UW/zBqattHEM4o6ZCR6y4x6AQXguls=
-bKuUJ1epVULWXIcogNVO9PeK6RLf4xMTy4x6AQXguls=
-bKuUJ1epVUKAB2gzKtqpWrBzljBEfN2xy4x6AQXguls=
-bKuUJ1epVUL/BocxQ/VkHF6uLIHrocIjibzFuc+pkRD0fQTyIpclWA==
-ZVyEsgcvvqkCxwQXdsGm4T/R8tJQvU4AN5m+Gay4mDc=
-a50cHx99OyS+86Rb1W1pEQ==
-WgaH2IFpABYVN9/lDCFFSFqOf3u62uxi
-YC4R/Hqz5OjVS9iZLCqmXZOdTChiEQ4H
-CA9qvj9VlfX4aBmcnHTh+e1sIpk3UltPRPB+qQ9rdKU=
-5thMB8eHe2f/1Gi6u346QEpgEZ36UZf7
-B9uuO07HaYDhefW3q+MscXpmvKAVeqCzRPB+qQ9rdKU=
-jTuQkMDtjykttMlk2S6x6POj8LtFg+GJ
-j5r7gucVUZPSNFr9wNKob/Oj8LtFg+GJ
-pF+/2e5PCdiYv/g0PaK/jL13FBy0uL+iRPB+qQ9rdKU=
-entv5lp5ztG/98RHxldG1vOj8LtFg+GJ
-fHieFygyEvy40Fj+KszbNkoPmHAI4936
-uensoKoCEG0i5wfAwIsXFiyfxx3KDwLB
-xEHYC5PyimNE0MxH/kbINQm+ik3u28cBbhNbzfKkM+JxqUIOvKQ/dwLm/EKxWl15
-xEHYC5PyimPg6njkDcx/a4LXI+MfHNbWfywvCjeRl/T0fQTyIpclWA==
-xEHYC5PyimOQuCgWDzuDNJzjfvzgtybvfywvCjeRl/T0fQTyIpclWA==
-xEHYC5PyimOlLpDXPIWwurSL2LbT/xPdKGYaGfDHL2mUDVAInWSevrOsDNsReNLeRPB+qQ9rdKU=
-MmnONpzqj5b7W3Ekux8q5C73DbanPF9TRccUPCPq9v2crq/MRwHEjUwWBzUGIE3Fy4x6AQXguls=
-VcWnl3ReS/WiJEG5WqIaFPOj8LtFg+GJ
-BcX7V3pTwpetFaNdnKehnD/R8tJQvU4AN5m+Gay4mDc=
-BcX7V3pTwpetFaNdnKehnGbGMFTW030UPIp5tKIseY5ZOr/GQaeSWEpgEZ36UZf7
-bRU8Xd4lWq/dTZAg/dA2ZFgGDQzefWVhjuyKZVVSxxc=
-767F12U7TA7L9/eiOW3PNvOj8LtFg+GJ
-x8Xhf0IsI6jVGlpd50u+NkpgEZ36UZf7
-sPozkzJeO5QUA88Ffjsp4r73AC6YF/AdfywvCjeRl/T0fQTyIpclWA==
-hS36/7wW1bLYQHkH4ek/mxjdGWQl0x5hy4x6AQXguls=
-cgYrEOZbHFKw8mEQdSz4E/Oj8LtFg+GJ
-n4KofNyd2vY4R2AxmSq+I0pgEZ36UZf7
-b8nVx09fy5I4ol1WGH/UYwc35O/wfJWEWhqDUIQPQGM=
-GxXLVwg10cxZKfrHsoPLMnpmvKAVeqCzRPB+qQ9rdKU=
-4CgPGy6SSwl9UjjrSV1dAF/cKgeh02Cpy4x6AQXguls=
-pFdZPuCKzsz5i3FRvU5uBhL2525Y8Jlzy4x6AQXguls=
-sfDdVW5fHlb1trjY76bzOvOj8LtFg+GJ
-NiV9MVLKhXKHDjyHip04zgfkmii5BuyZ+wmNWke18BM=
-pjQ6oNqUNpDNgWyWzjfkBUkSLXgOkKuLYB+cHAiOl8tPfX7y11TKwA==
-2nSar6BjfcOCJKgpiEaOwl/cKgeh02Cpy4x6AQXguls=
-4dmt9tLfxArcemGYPMM4W3M6cjhRvLxgy4x6AQXguls=
-CK6wOt90IerSNFr9wNKob/Oj8LtFg+GJ
-j9TJ0zgrtW3XWx32zET11Xc9lFxBaLeD9RrMjQw02M5PfX7y11TKwA==
-j9TJ0zgrtW0CemFOIJjudWYAKjuUUIzqstNvNKfkPxHtfbwrS7yCE0pgEZ36UZf7
-XsRueZvhAyrZenX/hyHS+gfkmii5BuyZu7hkhPiE07E=
-XsRueZvhAyoY2HrRmU8pmnfPzG5Uk11rstNvNKfkPxHoX8GccRaWYkpgEZ36UZf7
-Y0UYF4M6ChLrfZHpEMHYgUpgEZ36UZf7
-MWehmVZf6C3SNFr9wNKob/Oj8LtFg+GJ
-MWehmVZf6C1SRQKZWsra5zmXZqcwXuLSy4x6AQXguls=
-rWYaShuEwPU8js9ij9+tfFl2tDC4Deily4x6AQXguls=
-6SsNbr0oX/ax7oF3dV8rMlPq3vaS3WGD
-HCEq+yB3xiRUIm92l3iN1WDAN33wOHW69RrMjQw02M5PfX7y11TKwA==
-X6lEFzNDmIp9OfyBOiPDBSJCwkfSBhWqy4x6AQXguls=
-skgWSl8Po0/OnczYMVtnUkiU8imBtrfgy4x6AQXguls=
-QqZvghyTZW3Etpl/UCrmDnNnfPcTejy4aXBl6wZu5y0=
-AEyn6ksEetlWgHE3Y5h4coemfMvU1eABfER6RG1klik=
-R2Qp0UuOuBmx92ImtPG7wALm/EKxWl15
-WEck0+cxgSKioNaJ2OEJLEoPmHAI4936
-06uexQw4y8b+wP1ZSJe0FSJCwkfSBhWqy4x6AQXguls=
-r83+pje9TfVip1CQWTvLTfOj8LtFg+GJ
-IstZUls4S9C0PZ7rDpYw+g==
-Be6thebZitW0PZ7rDpYw+g==
-P6wUpZ7cEfLSNFr9wNKob/Oj8LtFg+GJ
-24DcSkM24SyWrgmkghmdO1Ko6ZZdPmtcIstZUls4S9C0PZ7rDpYw+g==
-24DcSkM24SyfWNoX9a3Od+cIVVBHT46ECvyKmpm5Z0Q=
-vnwU+0qImZgMfYHTbdiqgzafjRHdOXF7kZHZKTLqi55oSc+ICvgEcA==
-Wv0p/PwJHRdip1CQWTvLTfOj8LtFg+GJ
-Wv0p/PwJHRe8RbktMnXXHfOj8LtFg+GJ
-ZWQHTSD6hCvSNFr9wNKob/Oj8LtFg+GJ
-EB1+TmwsWHFLSooFBSheEecIVVBHT46ECvyKmpm5Z0Q=
-fSwdf2OLVVybhnAszwc98POj8LtFg+GJ
-xADmzjZLg26rDnbY10uRMhdFowAX23QPk0YDCbV1OWE=
-Ul8U37ddLmtgUpBCSW/6PxdFowAX23QPk0YDCbV1OWE=
-bIi9Gd5dx4UOvr8fRUm9HQT1tZsHfiBBy4x6AQXguls=
-tQqyk3JtpQRKvIGmSUkp3n8sLwo3kZf09H0E8iKXJVg=
-tQqyk3JtpQQRTjBq75VbAgfkmii5BuyZ+wmNWke18BM=
-tQqyk3JtpQROxwZ9C7+94Qfkmii5BuyZ+wmNWke18BM=
-tQqyk3JtpQTFSvfKUaOFUKvYn9sFOwi1fywvCjeRl/T0fQTyIpclWA==
-tQqyk3JtpQRkcAErkj/nUrOsDNsReNLeRPB+qQ9rdKU=
-tEm/PKNO8d3xYWtd1M6BhPOj8LtFg+GJ
-NyAak/c85ik4bE/6KHjA/hmH3vQ7kTSoXpBSJ5uhUAo=
-rT95lZHuLzm/RoLGcCoeUvOj8LtFg+GJ
-246DAPSPSX+UWPSfdoP5UPOj8LtFg+GJ
-TRi1oeyNUdOyMfjkGshymtHEM4o6ZCR6y4x6AQXguls=
-W0u07doTgmmAgbdnywkvhNHEM4o6ZCR6y4x6AQXguls=
-ubdFc9Fjb2NAHJSgJ0mhqt7SGlS0JFuG
-Thq2mIfRTdi8HjJqAapif7BzljBEfN2xy4x6AQXguls=
-8iRAY6UGp0Zb0ng1o0nHZ/Oj8LtFg+GJ
-ccapIA2Os+Sw7MyLlkc8AN7SGlS0JFuG
-hlmCVY6Y2sCyPJEuX5FlVfOj8LtFg+GJ
-gh+pwxxYTntwBAZHGE82h/Oj8LtFg+GJ
-f9vKvkRJdeDWUpDt6Xr+nkpgEZ36UZf7
-rlgWhYLTdSWdGLiDN2Hnj97SGlS0JFuG
-NxXJMZyQWz+dGLiDN2Hnj97SGlS0JFuG
-HSkrEwRQj92+DupvRV9k9N7SGlS0JFuG
-v0cw1FPyd87WUpDt6Xr+nkpgEZ36UZf7
-asbQtasot/N/NfWlTO+M8g==
-hYF2byblOfrmON+KcZNNZ9oEi1pr5Y8k
-FOjb6eu8wujVGlpd50u+NkpgEZ36UZf7

File diff suppressed because it is too large
+ 0 - 24253
bigdata-web/src/main/resources/doc_result_mapping_filter.dict


+ 0 - 921
bigdata-web/src/main/resources/doc_result_mapping_vital.dict

@@ -1,921 +0,0 @@
-UAhzARPR0Qf10Met8kIgVw==
-+A8u/ahQbqKnd4baFu155g==
-0UKoe8zCXefPulK2WolA3Va5do4bdCEifkRC94tU/To=
-8Tp+XthtGfGQJKtG6RTzExokdeqhF+go
-XktB/ud1IdrPgmIN6ApKBPWxb34fTDWG
-K/Brn7Ib8sRcPaf9LJ+DBQ==
-i7JwU1nco+SBcqYOn/p3qQeOdfp1kXgT
-fg3VEZ4eXv3+GMRwzHLVqvWEPETOYDom
-olBfBBlxWjyM96I3Xs6a7SHud7S4gPqZ
-UkldRKmIA6XTeO8h3KzbE1JJXUSpiAOlSGn9O0wylo0=
-98tZS+rEmlkcMOLS8JGPFnduRH/K+w4XryKysOD+KUY=
-aEFLrAB9hgtXGbeq1ZPeL2hBS6wAfYYLS2Pp6MTDBxE=
-aEFLrAB9hgs/AeD9UyuBxGhBS6wAfYYLrRQRI1ydLs8=
-PyqpOhFEBAIbikqc3Pog+DvfIILEoAZjZbG8KUhskwQ=
-4bf/szkP4tz4Y5lplGxRjiFAweb+TtuRmLHSnXSr1tGD5T4kUWam5Q==
-xhWftWtq9ZvsvE6g9Yp2r8YVn7VravWbLVdWfmPb2YI=
-vxbYaB+VKJBsS5LUKBN7hzX/KtP/8Y1rwcxRug42nho=
-dbb/nqpHFMqECyPJL1H7IcshUneIso8BNOeVZhn/Ac8=
-Pwacc4yn9IubHghofvZJSjX/KtP/8Y1rwcxRug42nho=
-IO1oQEFa/v130m3TyYKftXdbFU4uJZSuBASzRD8CLbY=
-oBu5zVSHPPL8TDhhEAofO5Rsg7fqcFtnc1Zb0Iz+B67MMzixc8eC8A==
-oBu5zVSHPPL8TDhhEAofO6Nl1S8YsDl80Gfgyi0jxbvNSZ28Fqx0gUpgEZ36UZf7
-oBu5zVSHPPK8l8TifqYoZcgiOVobKoiYc1Zb0Iz+B65hBX9kydshYg==
-fOrTNgGFmiYaubfPs72f8quOEBdMUBdd011whlSYrjw=
-fOrTNgGFmiYplc2ZybWmWquOEBdMUBdd011whlSYrjw=
-qoGjKQFnt7YBK2PIIM9+Cwx/w4/vTBWbrTLV+AcRYgGBbwIGZjiRfhVMwnleooJT
-uvaBJAcZFNds2zB4pUp/NLr2gSQHGRTXuhV5lrnssFU=
-cc2O2ErPHjaW9lRUGVrS9EYaw/JfO4JTPEjsemsNdiY=
-Fm6FhlKr8CPYHkRoOFT4ixZuhYZSq/Ajy6dyqOg/k3E=
-ZEPi+GPAF+jugkF1qqDd+WRD4vhjwBfoSNL7p2JKYZg=
-oRqu1B35G5rbxfAeY2EVMK04iybxhohrBpdWO4Fg8Pr3QhuGSiXXyw==
-fuam+naSn9KgX+GpHsWCrg==
-J/ywEOrmnqvShTNi7+4gEK8nK0CULuGtskF4kESh+LM=
-yfAIL5bW83d7CgdhAuXHiUjCWF2zvkE1atKSiOnQI0Y=
-enu6avlk5YpYqoBsat2YbzXZgSUyF/GdvgJU7rpjpfE=
-7+jGLvyUa5/Yh0tep9xrO9DE8mLUkOBnOq4FtKDlq5o=
-6wlgpJFzcf7VbitxfgpQhtwMPiv1ajnLvgJU7rpjpfE=
-Yy+RisEA3WeacctNq0KkK/BTamT/jgXXGjFhHUGm/IA=
-Yy+RisEA3WfFKhCR9/Q+JPBTamT/jgXXGjFhHUGm/IA=
-EDe0NFCJQvZa3IGJc7gruP2/W1+HYjdDBiNf+1YVhVY=
-E4hT7N3ytDvTeO8h3KzbExOIU+zd8rQ7SGn9O0wylo0=
-E4hT7N3ytDvtn/U1rdYHwxOIU+zd8rQ7XVLw9eJaiys=
-E4hT7N3ytDuRMvbsctv8GROIU+zd8rQ7fSzrHtCtCfA=
-0gJJ4eT+QkquUkyijQrbhjwR40iYrlSn
-fFPdqoc78PPpKHShXNtYAEpgEZ36UZf7
-2VnBmYRg5zvda1Ywa4fZE7O+fe4P+8qM
-tFWoa+Fa+E0yY+Up6+gBRL58J9w2rdLWRPSDQg6jxMY=
-+l0W0xn2JisHaKGhyASQJYHYRN+xXxTBvmys7d6QFJk=
-wyAhnI9iC+uMnf5E827xCmBPDGFC9wgfBASzRD8CLbY=
-wyAhnI9iC+s0DUaFzexLGmBPDGFC9wgfBASzRD8CLbY=
-wyAhnI9iC+uELqeRheZkvGBPDGFC9wgfBASzRD8CLbY=
-j1guSEHHCuR4abTVpuzkqxioYo8K988BBiNf+1YVhVY=
-080IZsc81Fk4sUfChItYiA==
-TKNSNdqos1P0w8pIRafPiQ==
-8VitcNoBXAtX23Y1G5a6cQptsZ2H6OWn
-xPUAqLbOBlzRDNKxpCQAA8T1AKi2zgZc9YfRIjL5Ktc=
-QoDu3HV1C6oJz39Bb0uwVTdyV/Mx6XpSbENZYM316MM=
-SObVEgiERlXTQZdx1iZp3UGphsMK03t8
-YUxF9R1PnhFegbyH7wSWLG8pqmcRFp34J9+B79Ksa2kzBXeQmxljDw==
-dFBNHJ7NONdhGDlCTb1US8IDrOT9t+vX
-E15h7WxtCFc2CX7dMYQEh81QHv0WTE4JvgJU7rpjpfE=
-udYnRmH717aOlKx4CS8Z8TSfNvu6TNjQBASzRD8CLbY=
-zymIfQvgoOwD2nyIzKs+lU77OSqWg/c/3VSrUIlGaYE=
-6aKrGF9UZz9KFYkTTsqeykPwVzRAzwRPbHtWBq+Dwak=
-flRnb2S3MMdrSNrsd9xvuA==
-d6/WlpxTwSscJDcSrwbauKVaVePy5OzR7NLBEkDmDJE=
-tIEhYj+TusJEqHLqoaGmFMYLGNp/VSkVWRaTFzIkLGM=
-xtCriKwKEaXzEcoAZ2UDHrMZg+Ol+NGYF8GIy1NJkdE=
-Ct+/ZMeI82X673nxNvyJiu9GLm7YBOP0SJAqyeGLlGQ=
-YKH3VLPNTeyWdV5caABAiNhmyYhFEPDLXiguQ/MHYD0=
-MIqhjxJmusPrfgC7wGdnmKCUMFUcmUqK
-ZQ2LRXszz8kSAbY1DsWadOh//o7r6XxK
-/K+ThajQ/dfvcc6O29A2f4lqS/Mj6xYPn777VwNyqoE=
-wICtK1IUPa6W0zF49pWNSUeYGAroSv6dSJAqyeGLlGQ=
-nW8CI9k62L02mD1TDX+LS51vAiPZOti9DoBDkkMJqoI=
-nW8CI9k62L00aMbD7d8dz17IWQydvrHXW7k4wPhAGm++Peof7PeC6Q==
-DdYJ41tkonZ5XOpeZn4QidIUlWmOeVgv8HwQ4K/4B5ttY1CEpVlMHg==
-Gk8oLdRS3gxpKTjNikKsfLs9F4LyYomyQsjDFyh0etI=
-PFrAddEL4pzX0RbKyJvnpy9SVZGkU2DK+eba7duZR1lioLrTn8ZW2A==
-j23xQ58QAELVzHyFm3niykGyx5t7pL84Oq4FtKDlq5o=
-j23xQ58QAEJ8mBRbsBkfs3wcWqo7FXn4hNYv1+T6BN0=
-cn9SelEe5Hv+ubbNNz+FZtbskd2Q9Eo5Z5WjJulMlEE=
-/j0M5sfgPzLOk52if20mxw==
-fjMCoG0jWP70D9MCaB06J2uHsBqKgYJy
-0gGUhVPoq4G6hnX53NjgLrYC32YgTV1X3uOrqlqKCX0=
-BsWMI/N9HfOzbDHIoU2htbskWOWaLi4uZbG8KUhskwQ=
-KgmO1PFbNMavVNXf3J8ZWGqBMJ+Pk0DbXnwIH8A1QSQ0NfV+EiaCXzgDx8qs11DG
-MuMDNZcg7nZO0EmI9a+k5ncPD33t0ml2syt8HrP/pcSzXBgsQFYzuw==
-Pi3wT64utZrDnUvXZYRoA/Kj9HvbuC+X7NLBEkDmDJE=
-Xpd8xjvI4CCkbrgqDpZu05fAkIv2a/rRSJAqyeGLlGQ=
-AX3Duro2QJ+E/pbB/Jm1/604TgZpNwc1kHp6lXvE8SqxDWcnRW1BHEpgEZ36UZf7
-Z5YtqmbJBKHMbyjLTchoHtBGyCYVBnZyVbBCO8cUTWk=
-PMikm6ZOGyJ1m1inn08K6LbqHMzYOiYtFMZpp0RTvZI=
-PMikm6ZOGyIKsqVBON1zjKHT8+SKZwoVC8at4D0TvJ8Q/Sq4QLi9FQ==
-PMikm6ZOGyJ5h6BaDEZBhqHT8+SKZwoVC8at4D0TvJ8Q/Sq4QLi9FQ==
-8c9eljjNpb61eo7t6oDXmx1uXWlpRJO0fZ1wgfbo+vIkFStuDxoGnffigd5WxBh+
-NhZObOtoJl8pAeTv2wlQLgyGawPO7JWaryKysOD+KUY=
-kjhHUdlPTadHGAO3beL1pDyvysLaX7DZ
-1jVmhx/d4tH6DJeaEF8xKUEPKQo6lUkBZbG8KUhskwQ=
-TtKmAkYb6HnxjtxHyZnIw0EPKQo6lUkBZbG8KUhskwQ=
-3hheyJz3V/34SP0dcD7s71/4tQ0bMmAd+Ej9HXA+7O8I6vTWnQXQRw==
-Lib0vPfLPtxEpmEtu+VPzxksyOBEscR3iy48LWiKVlE=
-ZrU0s36NPVIPX8N7xPjKkL7qvKIC0DC8O8B+JsbxdH8=
-YQQzAAyWvKh2w8q8JxH30SFqPT+S5rzfFWN3xRThYNo=
-qFhKC4xvDKwL5mGLILBHXUiXRFo9Aa23AGxaLY4tP2M=
-joB4IcA83AWNSvebcO4BiL8LeKWpgSGtXSbGJs3iiXG+Peof7PeC6Q==
-1cg7mRlV5xONSvebcO4BiL8LeKWpgSGtSKqx8eVEK7m+Peof7PeC6Q==
-C6UiFAmco8y1FUfOYTyArARi+kgSSDQkhSFrjI+fSRY=
-tFjZ6z0VdLlYqoBsat2YbzXZgSUyF/GdvgJU7rpjpfE=
-JtlQTh+8G26zbDHIoU2htbskWOWaLi4uZbG8KUhskwQ=
-JtlQTh+8G24c6kU7pH5cVbskWOWaLi4uZbG8KUhskwQ=
-MgUw+6QtiyqeKpuD11H1CgRi+kgSSDQkhSFrjI+fSRY=
-b1iz9138JyavVNXf3J8ZWGqBMJ+Pk0DbmhY4VLvdi4U0NfV+EiaCXzgDx8qs11DG
-nY40Ut+RIFoc9nsNL+OXjJ2ONFLfkSBaYl1GqHN1GQA=
-pyxGPw41ncvMbyjLTchoHtBGyCYVBnZyVbBCO8cUTWk=
-DMpn0HNqQvEKsqVBON1zjKHT8+SKZwoVC8at4D0TvJ8Q/Sq4QLi9FQ==
-DMpn0HNqQvF5h6BaDEZBhqHT8+SKZwoVC8at4D0TvJ8Q/Sq4QLi9FQ==
-d1AxPOpo2Cv93JNqsUycwwSLEezwDmWg/drEPLBEyQw=
-A9EjgvwkmHo+03JbZpPE8Hfn1DKk1F/4Dn+yn06ez/M=
-BhsjQLQoO71W2IqCAxB59IlqS/Mj6xYPn777VwNyqoE=
-BYKkcMrlbA8rs5eHoCDZFp3Pvk80g3i5yzLSqBF4Qps=
-C82vb02Df1JjaLTyEAOGq4L7OSgM5NFk
-/UXMNRAbEKsNb1xbo65ynxMlWU6alBDjO8B+JsbxdH8=
-rc1zi+a6JBrTo+B+vTsKY6ZyCMGQDyCDwQCJH/19Ln8=
-iF/Iy08qg25R6LM7+ZWh3vAhhfcEVqY+BASzRD8CLbY=
-OLDqQX03hXI0XKLw+5TFRUwNGO5Ogn8OZqxkL7I2NVI=
-itxCkCgM3e/HR/yXsgqARTWy3QE3h5UCAGxaLY4tP2M=
-LesXilJbw1zU1HHtteHSSaq9hvWLhhkTA1p8C3jFxs8=
-LesXilJbw1xs40O3vb/386q9hvWLhhkTA1p8C3jFxs8=
-8hOYBSoW2rw357iKkbbJNKvmAiJ1O7EFwjQM4EcB0Tlw2tKUH/Mr1g==
-a2qaEgH2uitUKTzJfTzWAak222GTl6gFUiIv/D5WOos=
-krrruYgapLXZllAv/2HVX9L7+fEKZv0KJAzhCMCR95WpdbcStATXpA==
-yj08ZqkH6UHP1nDhegL2lso9PGapB+lBIh9npNstG2I=
-xxZWOqQuI9XdlcvkMNg5KscWVjqkLiPVPA+yLHt86QQ=
-N87pCW+PJ61zb3nyqhq4LeRQWMhHBjWpB451+nWReBM=
-mo9+1qJ1Bj+lczdM8fSw3A==
-YwhAwisuJxnqwH9CZg8yZwTmQu6VtReBZ5WjJulMlEE=
-p8rSijy4S/z9jIKrcZHCAg==
-pq+h4zIgi8NXOVOSA1ZI6p4v2SAHQkIu
-XcJy0D6ZIbnmSSZLxUCJkp4v2SAHQkIu
-8adGIwlWWpyadbJk4GAiXikAN/sCm2Ft0q/AY+ii4C0=
-/hyoJ0OpfoWC/LNm9Hp9WGar/ECPvFUaF+ILpw1ycyXIzRRf893Duw==
-/hyoJ0OpfoVnEHJZIsQM9fdiYTQ1i6WuF+ILpw1ycyVBl8n3844wlw==
-GSlPybW1zPDmSSZLxUCJkp4v2SAHQkIu
-8TGR1QwfnTBpotEfz8I+YLKXV//u3jtcZ5WjJulMlEE=
-SpF2P7OBV2wegz8zIdldwUqRdj+zgVdsNJGmuEyjS8s=
-ZvZZTZ7pziyNqUSxxCASkHzEZm9ZPC4O7NLBEkDmDJE=
-/xXph/WD+DB58snWo/4AUHEVx3SMYWgo+E2a+WrAOSSoUdn6Tyi38Q==
-/xXph/WD+DC+1a2XxvflnXEVx3SMYWgoGPBJmx8X1uqoUdn6Tyi38Q==
-cRXHdIxhaCiPVM7ZLMk1VYRdNR24d3uPFq3wx9naQvdSzlBthODeKA==
-UrlPSgtiaPLJkWf9fy2Raw==
-gPP0pn4Vnj8nXqmtlcEY1T1bJ4IjKcyniy48LWiKVlE=
-9ATztfXQ4YIsHnge8Xnl74nl/1XwI7OU9+KB3lbEGH4=
-4tpRm69RvqsKmD/nTTHWgDnpkgGKkmzg/FRS7OcKkCw=
-RMvBGSygzAh9w+Rjqt54okTLwRksoMwINA4hp0V8TNo=
-kSAhO9CzcUTmrrPnrDrHqx973JVNVnZuy4x6AQXguls=
-ecRd3YmlGXsYMJDHu5JraQ==
-u1c81U2XanhA7GBUVpOV/rIrbOqvt3WS0Zi/2VsQQhM=
-/FLxB86zFvBgoVKxRjTUev2/W1+HYjdDBiNf+1YVhVY=
-+f2HbkfmqV4iJ/UW1nvPJjFb/LPZrxpW/FRS7OcKkCw=
-T5kzYYlVa6JpWOS3AlvTLOkL/m2R6SzxEwsL/uWWMxOlFI1nAKhgow==
-EOBt6VwRTEb4Jqp6Jt1+/Cnc4TyMqf+x
-HcoRQvqpZkoOfkFfjiFYBB3KEUL6qWZKghXYDLDGUjU=
-dPtc1NlBhWCrAYN/GMqzxZ4v2SAHQkIu
-2e7uYOPTI79eqnfOaRKA0g==
-UaSY6fDNqjhveVf/77+GhA==
-TG0ZzSWO3qWlhLmaXm8CGkpgEZ36UZf7
-Nyf0K+tj7F+up+L02Mfh87j+/5/peP/7
-bPRFWaAJ/eQcy9OKY5JeFrsfZbE2TFcHZbG8KUhskwQ=
-hlNWSTif4T6+E+KSh/Q3h/h1FFqRmzitav3bY6gAyDY=
-nrF6JY01jhDbETTC+K3nXQ==
-MRVT8OqakW5fniN8e8zu9WtAsj+g+txU
-CriSCwqltGpIwEzRSy6SDDrAEiAbHvMM
-IQI8TdWPqkb4gXCux2R5Aw1Jk8rT54ZbGjFhHUGm/IA=
-zv2LU12YL5Y7KPGqDyepes79i1NdmC+WVbBCO8cUTWk=
-zv2LU12YL5bb2INQ3k2Ym879i1NdmC+WHJcF65EK1c4=
-JYCkkl3fmOaP+TmIjhZGL4lRyZKaVKmgImsQu9NuQ59w2tKUH/Mr1g==
-nwBxkxtVkmhO2KMxulPDWhMn31WcshlN
-gJ0jLgvDLuR9tEYyqaMIGEyVFcKaJldi
-aS2TcLa0weJe02tnodIhaA==
-koyqxJA/Nmqz3H0lWP6JIv2/W1+HYjdDBiNf+1YVhVY=
-MWb0E7WsWMYwFyi1IaZpA4szgo77Q3CVZbG8KUhskwQ=
-s0UcSmE9+e9YiwxTuBnVjm7shZQ9NQdrIsY3y+RgJaU=
-AikMxc6U6Lq8UGbFh3xJZQ==
-nje2JJx5AaZX6+jq++Ubz87/tACVFJMR/FRS7OcKkCw=
-FIE0JiVOEyCplffU+3Mc1xSBNCYlThMgCs2+9Axdk2g=
-FIE0JiVOEyDXmH31BbEr+BSBNCYlThMgjfksl5blglA=
-FIE0JiVOEyDsK+w2tHRuPBSBNCYlThMgVIz7qr8YKm0=
-FIE0JiVOEyCTrA8NkwfiOBSBNCYlThMgVIz7qr8YKm0=
-FIE0JiVOEyAjGqVvnw0T8xSBNCYlThMgWLZOJ4VLhx8=
-FIE0JiVOEyDO+uyfk2ixBtPkHk6/MjDxcfrBxkpmJ6QrkFqkuiJw6sm32hUS/XIh
-FIE0JiVOEyBzVlvQjP4HrmpILQwZyM3Qp0H5SWh9xSdOLOOxcTbilgxH7TvUCTrr
-1j52Uc5xWCuL6BW7WgsRB2zyzv2IehJ8ZbG8KUhskwQ=
-O2VvNVqML1KvVNXf3J8ZWFLkXbaSuuEWPYlD18L0k/c0NfV+EiaCXzgDx8qs11DG
-14XA9bJFfcVj1OzUC2h7tzvtKcbFvrVzCTLN0w4X8fKCYhVsX1ug1Q==
-p2VzEvdv8akUV6g7W25sghn1AyZOJwhjgW9Ccc2cMbpPDu6bhIEPcA==
-7JE1nvqVpkpBJGQEgM2n1eyRNZ76laZKfds87HbRifg=
-7JE1nvqVpkoc9nsNL+OXjOyRNZ76laZKYl1GqHN1GQA=
-STcJ8c/FcFsa1Psz+IIZS0k3CfHPxXBbbQNtrV52HVQ=
-g99MO8FN1D5MfME/tSkjjpf9MN8+DZPb7KAVG2lPb+RQMMXI0pTedvwLQyzdi7io
-g99MO8FN1D7q5VENJBaBvyNk4TwrzSIw7KAVG2lPb+R1zc4x08XR3/wLQyzdi7io
-g99MO8FN1D56Fddr7hlr8tML2v8oYEmn3VDoV3QsKv7AJN20uiDrtUpgEZ36UZf7
-g99MO8FN1D6gaXRRrB2In9ML2v8oYEmn3VDoV3QsKv7AJN20uiDrtUpgEZ36UZf7
-qMPQaIGrpezlqOQPaBru2Jq53E8FSxJDiKbyU7+plsSzADtSbtsJDRHrOQg9htYx
-qMPQaIGrpezlqOQPaBru2C4J8p2ueG8MiKbyU7+plsR4ezu3JUMN+xHrOQg9htYx
-Y9A+gg9R2s2fQim4e0rjPWPQPoIPUdrN8oScOsjcRZs=
-Y9A+gg9R2s1ushPSH9+/SGPQPoIPUdrNfvqbuOSwODA=
-vryxtT6ncK/qaRWtQGLbON/oJMCdPMlZda0GsrQ3i+bfRvLZZgm1nQ==
-vryxtT6ncK9QXe1IsSYqxV5ZoSCq56ESda0GsrQ3i+bfRvLZZgm1nQ==
-vryxtT6ncK/yfQNxklPMxm6W4E4Zzonz+912MVnBN13vsQP2pokabA==
-vryxtT6ncK/8wmSqbN3Wsi7sSIe/MzKWxKb8XsulpWDOD2fB9G081eecLLWV6SJq
-vryxtT6ncK/8wmSqbN3WsjOesBgPJHVOxKb8XsulpWDOD2fB9G081eecLLWV6SJq
-vryxtT6ncK8lSA0fG714oDI5Q7lS67Aju7QdzsZvwuvsygA4/cwtRg==
-GRzyUl5G+x91m1inn08K6LbqHMzYOiYtCrKlQTjdc4waSQ0ihkOTZA==
-GRzyUl5G+x95h6BaDEZBhqHT8+SKZwoVC8at4D0TvJ8Q/Sq4QLi9FQ==
-DtDdl2Yw9CqGaz4t6B+0hOpDNvv44seC
-CHLNhe40sNobyMLVywzPnWw2ZqTGDA+b
-UueKL3akmJcxYSIr3rZ5HV4bTV5MNJvEZMTIRQftDaD2x6JFBPAbcA==
-UueKL3akmJd58snWo/4AULa/FS+XVNbVHqWQ/oVLEK8=
-UueKL3akmJe+1a2Xxvflnba/FS+XVNbVf2HWawEOSko=
-m7o3vEdJZMRRwKK9rzYzmde5k+9MeidX83dXIoHx4+e8Zr+1ZzgxAUpgEZ36UZf7
-tr8VL5dU1tVUXQGuec+kBLa/FS+XVNbVMWEiK962eR22kqt+Iq8ONg==
-tr8VL5dU1tUxYSIr3rZ5HV4bTV5MNJvEZMTIRQftDaD2x6JFBPAbcA==
-tr8VL5dU1tV58snWo/4AULa/FS+XVNbVHqWQ/oVLEK8=
-tr8VL5dU1tW+1a2Xxvflnba/FS+XVNbVf2HWawEOSko=
-FuGDanOqERWtktBprG3sQznybeZeC7bgZ5WjJulMlEE=
-0u+yQewY64yZkH6M7ZzjRw==
-prfJfRawKQUqCU/+qEBgqLgI5EXUXdvIydVsDztYBYtcy56AEq1wSahR2fpPKLfx
-B++XjWNiwxp2xkUZqwhVVp4v2SAHQkIu
-vXieyS6VHlhCN0YDeNBBtmFhI5ctmLmD
-vXieyS6VHlh/MyisL1m732FhI5ctmLmD
-a2zCNODpNjJHVSyomC3RNp4v2SAHQkIu
-VnrAleiz9BcvlTeGYr4z0GGIHzfa5yuM/FRS7OcKkCw=
-aLicfrOGw4vp1+B3EtTTEWpu4I82OBoR
-PA6vPm9kiUYaHZ7J0lO1gTwOrz5vZIlGAgEpDB+I1Vw=
-PA6vPm9kiUYqqtObA+jC6TwOrz5vZIlGAgEpDB+I1Vw=
-a//0Cgxjos/jQh3nVG2RciXBPH2DKdJv
-bBAbveiPWmKJ/PHXGtzvi4odSpEvESgm
-WmuWJuTwCRsYb+zNYf8YoEpgEZ36UZf7
-Bk/nP68MuaWLcOureSEh6wZP5z+vDLmlg7Q9YeM+5Os=
-v4S90bmdTGGB6Mv+r3oUPb+EvdG5nUxhiGlTuYvwdd0=
-v4S90bmdTGEqqFf1kGpzN7+EvdG5nUxh75dIY3QhG4A=
-uEm+zGdzejuZnF6DuRckiW27nvnjqQYwyzLSqBF4Qps=
-RjlHunEZKP0T7ne662LsTqsq5P4L6Ap+/FRS7OcKkCw=
-YSKAoBxxX2YjAs+T2gxrss9LDbQ33mH7
-w0FcE22waepb0FRV5yj+tWApXEYMyMBPszksQO0S2Jk=
-+AD/rZpYED9L58cEADwJHq8VNz24YO2L
-Q0J/+EnHM3rprHaPoFnSBc9LDbQ33mH7
-GBoXxXTOiUUOLL9kDKY3ChgaF8V0zolF4PUbFHPSm24=
-GBoXxXTOiUWb6DKgZ13YZBgaF8V0zolF4PUbFHPSm24=
-IMHDeNUnTX3QHYMe2/qu5fccs0BDbFoqV2Le1m4XGVw=
-XBz/0WesuX+W5RytCgvxs1jKwedLHULy0FLeKWatmmsM+3+ZxP8wKA==
-IcfqYrsxHcsRR9DGg7KxUt9zwNItyBWhAGxaLY4tP2M=
-oPhDFaqTtcfAvh3kNk3SJC1t13qMSy/k/FRS7OcKkCw=
-t+fc8F7KGD3YP+5g12Xd/TckQ1lM60MxbIFXurBxXlF7arQIk4twhA==
-+9YAgXKwnnDeVrqfQty5mKp1S+3tbEMyXnxmhPdKEuw=
-ZVKesIbC5UDPJ23f127MIBfmfkKXu19EBASzRD8CLbY=
-P1EPh/GVwXTPJ23f127MIBfmfkKXu19EBASzRD8CLbY=
-RV12FyWi2m9NGaQLxDyRVy9Jtri7jcCu
-iUchhe2/rwmo9N+4b9O4Kj7Nn+r5o8/wBiNf+1YVhVY=
-puGqUHg2pdbCcVOxsHJ0vT7Nn+r5o8/wBiNf+1YVhVY=
-Z9ulCaAnj1wqVsD26zR7QY2A+dCHYsY+QsjDFyh0etI=
-V/cwxO1va3QNG8dYx1SrqimeJNcxLvwdfkRC94tU/To=
-tEGfN05J62p7+mtEP+W2zmofQiDAQV1+YEg4WqLcrb0=
-caueP01nutnAYhfhdZc0DIddWEMbjnMV0Zi/2VsQQhM=
-VynNxYGlkQBi1DM1j79KO+Iiw5mWoSM+bkJ8I2Mw5U8=
-BT3BDz5UVQtCIBzPA0Hzjw==
-GxLyab77WIVNVxv1Q9UBH1GAC9Z34mk5RPSDQg6jxMY=
-UtCC9SEz4uw7KPGqDyepelLQgvUhM+LsWDm5Lq8Ayo8=
-UtCC9SEz4uwuhTHXw3/53lLQgvUhM+LsWDm5Lq8Ayo8=
-EQ0++UQ15V6yYb3mwQVJHhENPvlENeVerOW0a497QYM=
-hLQNb8ee7VmTlTng6OND3TuNbdkE2wQkfkRC94tU/To=
-yvOBbTrbEUqK3KXUbQsrtMrzgW062xFKFpcGMsPOjPg=
-L4fv7s2vspT93JNqsUycwy+H7+7Nr7KUpZwvaxMxA0Q=
-vlwcdwZ8FBSYPUdk0/IdWYfMR9GClb5O
-eFhYVPfX+7dw0mETqn25yV53qiy/ifzJOTp3rprBbf0=
-XneqLL+J/MmTlTng6OND3TuNbdkE2wQkfkRC94tU/To=
-Dm0OWrp7Uv2TlTng6OND3TuNbdkE2wQkfkRC94tU/To=
-3vSAWdieYDMI3qYrJnE6eQ==
-+JxKobHWjnEqmP86D2wswNhmyYhFEPDLXiguQ/MHYD0=
-TIsVL5DUBcEqmP86D2wswNhmyYhFEPDLXiguQ/MHYD0=
-TtKrGpFJaX/rxj9pcc7diJ4v2SAHQkIu
-jlWMwTmo4B8Fo94fcHp1+45VjME5qOAfHRufi7Dz8+U=
-B7IoxD+rD6TVlLrDUTFPoAeyKMQ/qw+kv1mdfqrePJM=
-UyDbWxQXOCFyWkMtzNxKjZ4v2SAHQkIu
-mY0AC8tbAB4iVnQcMMKOVtvdiJSj1vI8/FRS7OcKkCw=
-ttuFIQiBSmBR5rYLL1hCP7bbhSEIgUpgkDtcX5PjG7c=
-5pjjlw/5pTHPgzhy5V6T3E7T/M1lPh+AXiguQ/MHYD0=
-gftjwjXII3Ov0CQnXM3WW3jmC05lUniT
-daOC776d72/lK4VJ8PG6El3CctA+mSG57NLBEkDmDJE=
-Qj/P9cC8CL7rmNwu0Gjmqg==
-ZldvwrHIQlaK3KXUbQsrtGZXb8KxyEJWWajxrUJ/4cCUhW8p4wsnQg==
-qKiu4WzYyu4l28Z/OBqUDQjmhlLYngZHYTDxNHZVHIA=
-lTjIckuiCeo/trxkeqgXE5U4yHJLognqmyNEplv0gDs=
-msQg8I9ogkdZtqiGCIo1LZrEIPCPaIJH4Ogsn3YzA8w=
-msQg8I9ogkdRPUvVLndWi3oADwE6jljqUXu0DMuigJjeGliRkMko3A==
-msQg8I9ogkdJ03CaLUlm65rEIPCPaIJHc0JpvX+sz/4=
-PFzyvB8tBgl6AMdku3vLEzxc8rwfLQYJwN+gCQYkCxQ=
-bNUypw8nkn1/lXqO/WRoyX2oh/4BEJQQZbG8KUhskwQ=
-7cZk1APtn1no1TJapS3LWTo0sQbkHpz0XiguQ/MHYD0=
-g2+7gMKiX11kcZfZMtGIzQ==
-MwF+ApR9qK1ueHha3XlU9iOCFug3Kgau
-dJpTex86WAMwlq7FCRR3cHSaU3sfOlgDWBTa+1hjixc=
-KVqkkJ5fXY5iHpImQyttJilapJCeX12OnU/X3u2ChHg=
-GwsdThjKocGlBZ6ez5tswRsLHU4YyqHBnd+j/hoWgPw=
-mvxKCEHginqtqkbLwKwK2WWwW4Oqjd4b
-J6OVmsxN7uhdUU2EqomYE6PFx/R767viv1mdfqrePJM=
-gouVrQMvdA4QnRCbG8EiZIKLla0DL3QO4uW9uAuG3rY=
-JYTCz8oz7zDGhUu07Atsbl50ZywX4LKbpPa7GqMmqRE=
-wnBrmsLm/mpGqTcZNjIJwT2mIYrdhLxA+wj8SNfzdio=
-xXzCHN1kDmvVO6ScbP8HHHoLdSKNitjSyzLSqBF4Qps=
-wCdkMHwxmXmWx18mJMS+bAhiIOXw/dSaFWN3xRThYNo=
-RtVIoGlZdw1iOnxrdZMC1whiIOXw/dSaFWN3xRThYNo=
-aX5xZ6VBA+eYC19sDmZUtT9/g++8U2v1/FRS7OcKkCw=
-7ABKXB9DxjyYC19sDmZUtT9/g++8U2v1/FRS7OcKkCw=
-1P96bReUID3AlU/9MRyvVdLxIpT5xV7I
-wN3A6tAeZF5+VBc1ocwqSpapJhMHdXdQOq4FtKDlq5o=
-pgFI7yYDU1GNg9YQPybpwZ0dczEE04sfloEotSOE/UG9bc1pwK0HZvfigd5WxBh+
-aSU0Z5dz/yw7tq7Zt87ggOaB2/MlSFOr7eP0VGZphgp6QxYuwwH6NA==
-wyPiA7heMwnLm4U9qLQID8Mj4gO4XjMJmyNCWr9DFf8=
-ijDltQ2o6KeBRbqtqzJITR7oHj6ARY4X7eP0VGZphgp6QxYuwwH6NA==
-wINucbldLHd2SQMMSiAfccCDbnG5XSx3O3kAeP3eRNU=
-8G1JVfLQ6HzTDmnqIYP0ncDdwOrQHmReRUHLl/7+aGs=
-8G1JVfLQ6HwRuo+k93q3SPwiM7mwmzc8s4swgMue9cM=
-iVo7nF2TcX9GqTcZNjIJwaTFXWHUVGkFzECi/beW+c2jlnFqmomQFQ==
-/CIzubCbNzzTDmnqIYP0nfwiM7mwmzc8DlOIbaCM4Mg=
-/CIzubCbNzzdspKklvEj0YHAG2SAG1n5loEotSOE/UG9bc1pwK0HZvfigd5WxBh+
-/CIzubCbNzzkzFf+CBlT68dC5MDxoo8i31KXSW07L4ygABg+qYtpiw==
-IQoKziC4bVPIw8jqT7fOToNqLkNStzNN
-iuw4tnsoxt8ttku5wjNpxNWzYFFI7AYP
-DlfA419wTmEI1IvF1HAZjlSLGtVzu3Za
-PmUjDqGidjpGCRFgfNcPC0pgEZ36UZf7
-TyZCs03OO63lSWJyA+jnwZ4v2SAHQkIu
-aghYWkm63ABgJuQ6Kx8gJH6zISq+2dfp
-RODIkd4+490odhzhWNrlBEJVtM7/jdB3
-KWkJUMmP3HYodhzhWNrlBEJVtM7/jdB3
-WAnIapHmV3mB4HQmOR7LsSHud7S4gPqZ
-trHRY+xCSogXYnyZ6ZJKJQ==
-Mbmi/A90nyXsLhhGFT5yEwI5Pku1psKZWGgkX+sK4nA=
-AYZg4FtyP4GtN7b+a7LftuovjntMc3SiOS7F4oME4tTXOtisNdGIdSHud7S4gPqZ
-IXkPFPlOVIclB9lZ/ubIXYMYaUjdQ0MUfkRC94tU/To=
-4e57L86Ihfymsz6ZSPerfTwR40iYrlSn
-OjSxBuQenPSl3Rk1R0TSjxaT5VpKFjCU
-eQHRBFxMDWA7WMf2BIknx+1UK4der6Bh
-qlgeYnp6Gd/HWhpttKQ/A6pYHmJ6ehnf4oWMbMfUFIM=
-s5dYBjMytR65X7ZXj0Uv0rOXWAYzMrUenMquyOOoj8TYzz3r3x3S/g==
-s5dYBjMytR6cyq7I46iPxKGKwqAqdV3aFEW+IMKyBD6qXe+ntv8tgNlUX7DmUMWM
-s5dYBjMytR609CNTmM0EPbOXWAYzMrUe9VqK0pdvuTA=
-OlZQA72ZDZrkbekNMKZ/hBs3GT70ciCU/FRS7OcKkCw=
-sznBlA3nS+ZogDNqJr8XssnxHmZ0xlqrCwE1z6B/Blc=
-sznBlA3nS+ZPW0jcwUQqeZhxXvfDVJr3PK1eq1q1hqg=
-sznBlA3nS+ZCyqr21G8fPphxXvfDVJr3PK1eq1q1hqg=
-ahdHwChX8/YwWU6jaieZ+BSvcdPQaTCEeDLAwfuEhcxSzlBthODeKA==
-ahdHwChX8/YIayJ99X/P3xSvcdPQaTCEeDLAwfuEhcxSzlBthODeKA==
-1yw5jiqncGQgfDHj4VDjengywMH7hIXMUs5QbYTg3ig=
-S40MCyYJDO7z+iX0vzx92S9Jtri7jcCu
-ZUV41LY+hoSZdtCZ3hKGwYKHQrLAKeg6Qo+b5Q3VZwY=
-LAphuzvX0+0+flCDOeksxew9uXjHghAXtHIsU9VS3ZbTdl0SvvSiXQ==
-LAphuzvX0+2k0cJZEj9B9ywKYbs719PtTg0uaio5pVI=
-261M969mfldVSyhHkFpyGOrn2pInliil
-uzrG7v+xI+Q2toyDMjukNoBPclwdJCClQ4kUfjALs6VPRD42R84sWkpgEZ36UZf7
-wxSr1LqU3fHHWhpttKQ/A8MUq9S6lN3x4oWMbMfUFIM=
-3RlDgHP4umsLZexAxlGQQPoE1ewuutCx/FRS7OcKkCw=
-sLtOhy76moLqLN3zrEQ3Gh/bZ5h2VMbzsYXDsix/naKttPD/zSXCrw==
-49KBr5px2JYLZexAxlGQQA/xjwmODKT1/FRS7OcKkCw=
-MEV2TdfjfmzX0RbKyJvnpy9SVZGkU2DK+eba7duZR1lioLrTn8ZW2A==
-POvGieO6dP841qXLnQ314EpgEZ36UZf7
-2NTocBcJ8he8kWtUJg+fl/M7DZlS4NTJkIWqd33DqIQ=
-bQJtjBvartf659mJclaWbZ4v2SAHQkIu
-aDxpJoN/PwrKvVIER3PSH54v2SAHQkIu
-aDxpJoN/PwoVCwQVXbbfVmFhI5ctmLmD
-tGdCVg+4dFz659mJclaWbZ4v2SAHQkIu
-7xlDlQOfCyqCx6R/+34bDA==
-wuAmLXM9TGuieOyycJPd7zVJ7JvToHql
-mChduLRUinAZykcSFRuKfaSYfF1gjMHD/FRS7OcKkCw=
-p04arrU2thNrOBeZqipgpU39yjFwiKfg
-FeoDIuhlezZZmeRVdBNeeO7fWLQO2vAClGL2bvCVjbapdbcStATXpA==
-8uf7LyAYqw2Dy30ukFEkoEJVtM7/jdB3
-mv2uQ4EChG8mfUIF63yPPTJGfdvFIM7qyzLSqBF4Qps=
-uh5/ZXF8ZmlYvrUEe65mMBokdeqhF+go
-AatyJrYwLG6o7Kqva54ZpEjNHMkQfY/4ryKysOD+KUY=
-o3VwBTezHdeW2Bttl0aNLSXBPH2DKdJv
-ukG5s4B4LnwgTj12gis6/liiRIPsjsUx
-Be1T87t+ge6tc5EZVJ1itAXtU/O7foHuHHIaGk0U9zw=
-xrfSbDQIiw6BVtlZvm7IEvu1v7COj+SP
-q3wgm/88Ra/5FA/QNzKqWCHXZvfEP0LOITMjyrs2LzEVvJK+I7rN4EpgEZ36UZf7
-JOdzNgAMU759VZlINNf8oPo5mwMGKOCoXnxmhPdKEuw=
-TW6J2NnKomjRjda4eHSttddwjnWQoZ6JXnxmhPdKEuw=
-UCea6V2V99m8kWtUJg+fl8VQQlmc8cfJ9+KB3lbEGH4=
-ti7QyiW+DvQDnJXyavsBY1pYjy7n4cBmXnxmhPdKEuw=
-neBA0Hg47enJ3jcgMLZ9eVnFrddFwuGJ0Zi/2VsQQhM=
-KuqimFrtBRw9p4AbeKY1QCrqopha7QUcHniTH44xu20=
-KuqimFrtBRwh0Lh+SGRenSrqopha7QUcHniTH44xu20=
-1kYYzeJGLPv9rV/eju6liYCLXzVQoD8/e449tdYe94rKkA4tvo+sye/wnylh3Khh
-1kYYzeJGLPthx5yON3PYAizlA128LJ/Ve449tdYe94rKkA4tvo+sye/wnylh3Khh
-2auQrCxhHIsXxJ/Vgc4ukCDdRMaMynFBZbG8KUhskwQ=
-HLbONjPzahBoL9YvcamSHRy2zjYz82oQgsNZzcOOA/s=
-1AZ/RVvycEl14yxy81WxOgP5E7pSsB8CPH8zC+3Mpsg=
-sEf/UWY8VGJ9pUw7y+s7ng==
-CsgKSGU0iuEJONZCYhlqXJZCaZNUo4ux
-5ZoSjErEXv5q3gx+pOPZFIBxX7BKuFe7X+jl4WO0JoA=
-5ZoSjErEXv7Iu82pc8TOLinOGmZl+yPRF5IjhLtUo+tSzlBthODeKA==
-NJOpP+ZmbbXzovLhx0nRBeihRHJ/6xdnv1mdfqrePJM=
-uFg/Yxg9PLIs1IocUs/TPaITt1ZHvAIZshY2WQ4j1rF8+IQk0DRVeRokdeqhF+go
-uFg/Yxg9PLLAzQwt3CVOC3irTJL/yqb1shY2WQ4j1rFNZLf4EJk1SjfLJpt8Vovi
-uFg/Yxg9PLLKhZHCTwCZCsPS1iEu/AlBshY2WQ4j1rE92OQO7YC795UUf2qRojva
-uFg/Yxg9PLLKhZHCTwCZCkNKL3gSmEdEshY2WQ4j1rE92OQO7YC795UUf2qRojva
-uFg/Yxg9PLLKhZHCTwCZCjNkLr6v/eyYshY2WQ4j1rE92OQO7YC795UUf2qRojva
-uFg/Yxg9PLKQO5aORBE8r6///N9btsABrOI77LvpHbGXjb3OHxwMOA==
-uFg/Yxg9PLIeFZSOHSSEJzzmU+FOUsy47iAp+OLPslE+HhQneOFfyA==
-uFg/Yxg9PLIqAOoyJRKzNNfmCM69+1qR7iAp+OLPslE+HhQneOFfyA==
-StcYgkZmEOHWY8Wkr6uM1krXGIJGZhDhoOkqcB9V0N8S5v0ru/ArLg==
-dn2Qsy3GvOjCG0apwlqyg3L6sTmLiNI/Z5WjJulMlEE=
-UlIz4dzbI0k+Cust/Q8kQUtCzDBB5yC9y4x6AQXguls=
-UlIz4dzbI0nulS3QAH/ZTsoeCQUFs6ThXnxmhPdKEuw=
-UlIz4dzbI0md+6Clu3ULALcXx896jE8quuw0Cza4wiNSNf5GnzWF/A==
-GdeJyUu69/xtN63c6HS/sb0JfccvndSv9YQ8RM5gOiY=
-FpNKk6eB+A4qm2jz9uA02NdHgJZGvhHUv1mdfqrePJM=
-FpNKk6eB+A5YMT49lLPDttdHgJZGvhHUv1mdfqrePJM=
-FpNKk6eB+A4HQ8KBWkE2XddHgJZGvhHUv1mdfqrePJM=
-FpNKk6eB+A5tN63c6HS/sddHgJZGvhHUv1mdfqrePJM=
-3BvyzjY734YXxJ/Vgc4ukCDdRMaMynFBZbG8KUhskwQ=
-mHMaFW+3mXv3Jlr4aUyUxDOG0g8aruds0q/AY+ii4C0=
-6F5GQVOYgys9IXdVF011y04DNDqPz7AJfxeqLNxDZYHQ4oSphgWeJUY7J5N0BR7d
-6F5GQVOYgyu9K39z0IbIS8PS1iEu/AlBfxeqLNxDZYE92OQO7YC795UUf2qRojva
-6F5GQVOYgysA8NoV9br4oa///N9btsABi6os1lwE5oiXjb3OHxwMOA==
-6F5GQVOYgysMsGpX1Cg1tDzmU+FOUsy44U6STSG2x4A+HhQneOFfyA==
-6F5GQVOYgytBVVAuo62O/v+qGUjdpOwqy4x6AQXguls=
-fBxaqjsVefhhS+omi+D74kGyx5t7pL84Oq4FtKDlq5o=
-FnfxNLEkTXjY5SqWtF0fFEGyx5t7pL84Oq4FtKDlq5o=
-ACGQHmpxH3CcWAeClDsRsgAhkB5qcR9wIhDf5xWMPgU=
-5rBML9eUHrTlW7CZ5piJke5H7cZvP3SFFWN3xRThYNo=
-GBtb3Taaxg9+pwopOR2fnswgP7id3TZM9+KB3lbEGH4=
-+PHN7dej9TzoVovvOkpQXRokdeqhF+go
-ab7S4LKSKOlvSJ8UQFpsYA==
-NSl9QaY7V9I54BJ6hAksJIJaywY2UE6j
-F3Ktohq9lLdLfqM7lPsEW7uJAxZ+VzmFPH8zC+3Mpsg=
-GszjdweBRUV8TFxTbDGFTbuJAxZ+VzmFPH8zC+3Mpsg=
-cVfxhpHQZ8tug8Vncn07h89BZ991h47P
-hV16UBMsD0c0XKLw+5TFRTSwX2RDWdyI8ZzcfVB2VOHsptuiVsjlCQ==
-lGlvQ66dwCRsgjKRmXfbNgyliFByaV69oGl0UawdiJ++0EUxnQ9bjA==
-lGlvQ66dwCRJN34P0riyJgyliFByaV69oGl0UawdiJ++0EUxnQ9bjA==
-lGlvQ66dwCS+RwVcBOPepN4vOsaC5jpSx+yHip4tDCs=
-lGlvQ66dwCRCtbgxFokxWd4vOsaC5jpSx+yHip4tDCs=
-lGlvQ66dwCRHXYr3weuURN4vOsaC5jpSx+yHip4tDCs=
-Uxtw2lOJvUUSpsmE+pXSc3Pwy+KsZWIvCboInA27MOu+0EUxnQ9bjA==
-Uxtw2lOJvUUJugicDbsw63Pwy+KsZWIvCboInA27MOu+0EUxnQ9bjA==
-gsvstpxi5j0QeShVOAXsvIEySI459logatKSiOnQI0Y=
-rV08K/rlRWI+03JbZpPE8MoJIGVKasSYuT+g8CF8h5Mv/eVMdVBn/w==
-rV08K/rlRWKfKF+Jhxy5qZhUgnPSviS2QyMd9MNOFhR7arQIk4twhA==
-Xk2LnaFuq2wSJd/f9ZcYADwWXQGY802sSGhygijEmtw=
-4cJtfDTTyElxMzOPB+U8kfOkdlP6PdPdQo+b5Q3VZwY=
-iWZ1+FV1HJJLQRh5YHMuqamZj6my88+nOq4FtKDlq5o=
-hADTwUgIJkT+hOdowE3gQFCWBdGzkfUKOq4FtKDlq5o=
-bO8/SYGWpEhLQRh5YHMuqXp7TuJXo8E7Oq4FtKDlq5o=
-BYPGG+Rke8Y+jIg2vQkoa7AX+eZ3fchDfoknQKAIiqnAllg7+xuCFA==
-Tjxwl195oKsLNefE5aMc4G8mJus6OHtX9+KB3lbEGH4=
-Tjxwl195oKtyQBs4SzkJV1PusJTGcGD01qdb7JDNTneCIzaoG4uSRQ==
-r+MTn2zwgu694y/edwdpYQ==
-ADiRENPsNOo4GvvuG561CfRmfvLAgGBfXnxmhPdKEuw=
-SViNX60fSwbS/Zps/UDMbB4fppeTx8qZ
-O/CWAYqui6Q7KPGqDyepemhh+tTCSjEuwQCJH/19Ln8=
-L9IhEb/cxy11U7fe1tcmGcu36tEpZhZKm2WO/tHZ0jU=
-YkMU4MC4qUuCLbAllbnuGTDAbyuRDAJIFWN3xRThYNo=
-cBJGt2Ntde+CGu5KOktSlvOkdlP6PdPdQo+b5Q3VZwY=
-2Dh9os6pnRNv5IWfa1X155UUf2qRojva
-0OS8yIohSYDPwBECuQH+rd1nfj3QO9QOYTDxNHZVHIA=
-QRCGdQzPmuxHe+PN03uUuwlmC0ceo5xAavxCoFAqPTd9YdnNB0zCd8u6GxFjbkZxipg4n+amT9IUEksYV8b9Bw==
-kaef1hEpFMR0W/ESpQ1sGu0liRe9U4t8
-TX4x7/JdLccihNfD2ACjawerjyqMAg4J
-Aunviy27Tn8s34SjTRKw966AlIFDzvWhGjFhHUGm/IA=
-iO/G5G1J0KSYcs6LIWNqJO/wnylh3Khh
-Fki5XfvlXJzI9y4pfZiyVPIwcwZJlSAS
-Fki5XfvlXJwYYaRc04ct3X8oNwlAHdKQI9MUVCsia+g=
-/QKA3OLaLvA66F6w8up5WYJ2UD35rrQ0Hg0DaMjCGjA=
-/QKA3OLaLvAgtwYCMtpiXoJ2UD35rrQ0Hg0DaMjCGjA=
-/QKA3OLaLvCcA+LqIQuHAMH6Jk3uyles/LABUXlMXu7hbA8mI06pOg==
-fd/6VRnBV+5P+943EeLXROh//o7r6XxK
-lGxgn5LNNN6D+9QS14gqUZ4v2SAHQkIu
-6Z+yTtFW+7Y41qXLnQ314EpgEZ36UZf7
-o3Yp2kkX1LRQOBhU6CoF/1SLGtVzu3Za
-SNzpJ5V8DIFG9wHLavry5FSLGtVzu3Za
-KBoYoWgOW3gLTpl2c6Njyf7jzj4LMMy/O8B+JsbxdH8=
-tIZAvd1sO1TqBSJFbDuEHlSLGtVzu3Za
-tIZAvd1sO1RCU0xtliYc13j9Dfoa+sK0
-tIZAvd1sO1TcL4XcAOq/hHj9Dfoa+sK0
-tIZAvd1sO1SCjLq21t0Vinj9Dfoa+sK0
-PnUtuWrPMZTlW8BV6KpRW8txnDCodPaa
-7RcWrS+7MYzqBSJFbDuEHlSLGtVzu3Za
-7RcWrS+7MYzcL4XcAOq/hHj9Dfoa+sK0
-7RcWrS+7MYyCjLq21t0Vinj9Dfoa+sK0
-jzfGdSVd6Ps41qXLnQ314EpgEZ36UZf7
-/pn8ayRLGgWf+yQM5BR4lOrkLE8qtcy1QsjDFyh0etI=
-plXHn+PONu9gJU3sChLRJKZVx5/jzjbv7N7/2xV+d08=
-pK/ZV/hg2KdulJBr0GmnqRQSRUXh+2TiIsgVq7rVe/ettPD/zSXCrw==
-jQy6B/fSamartelAkCcLxA==
-UNMVVx+jvGOfmVgrAcnbJFDTFVcfo7xjUyZYksNCWbQ=
-UNMVVx+jvGOFOjcqTu37Ff3eSYk2t1EJXSGdquqQozd+MqbEi+b81fwxXbdPc+bf
-ZC16KGZJuzrZtWfwNJeczo6tKGCLLGlRlVTUu8mgFVw=
-Kb8f3stgLWahvBUtkklw+p4v2SAHQkIu
-Nt6VZaeWqZwlU0sSjtAowWEigKAccV9myzLSqBF4Qps=
-y7IJJKVJ5ODjqYT/AZOwkAj/Jbi050YD
-GZjTIHM0jyFhWorWBbaXMb1BiGWHESwJ/FRS7OcKkCw=
-zjzDFaug1aRRJHh4WyRzb848wxWroNWkwQCJH/19Ln8=
-2s+Nci9wvweK3KXUbQsrtNrPjXIvcL8HWajxrUJ/4cCUhW8p4wsnQg==
-f6t9+C9rN/Jbhi2zmm4G1P5N2YG78Dzu
-rf8snXs8QLDnIgbx9PDDNv5N2YG78Dzu
-R2BhqNY8vQsQATZmRblq46N2KdpJF9S0bENZYM316MM=
-XvDAGI3qDZgwjpEfeNUqgD51LblqzzGUV2Le1m4XGVw=
-HCpZai6l9vJzRPNH7lCRyVSLGtVzu3Za
-txN9SZIKbnuSP4SkVgrDKA==
-LZCADMve1wnxrKHitzOWUoHEsAgomIvukA0gc+vlasU=
-LZCADMve1wlTMqTky/PfJurn2pInliil
-LuVm1fSiDVKdsi7Kzdbo3kpgEZ36UZf7
-WWBFaR0HCBnxrKHitzOWUrTUCuqqqRxxXnxmhPdKEuw=
-WWBFaR0HCBl2OlpdyfCl5liiRIPsjsUx
-viVyinHFitKoVI6WKOWvAoHEsAgomIvuXnxmhPdKEuw=
-viVyinHFitJulkN3J4gwoO/wnylh3Khh
-viVyinHFitIL473qOWrZr1iiRIPsjsUx
-viVyinHFitKAmOFSgHo5YliiRIPsjsUx
-viVyinHFitItxImQxx/DDhKXMTR8xPFxLcSJkMcfww544XjV9hm48Q==
-viVyinHFitItxImQxx/DDjJBseYwGCzpLcSJkMcfww5oNJgLqFqd8A==
-viVyinHFitItxImQxx/DDlhUYiCeB6SULcSJkMcfww6L+9785HsDFg==
-viVyinHFitJTQmWRp4fFrMuJ7sAC0UnR16uNWBjA2f8m9xnOFMukZEpgEZ36UZf7
-LShMZBiFgO4DoAhOOP9x2X5UQ5D/IggLNhbUrID5RUk=
-LShMZBiFgO4DoAhOOP9x2XMPG6TR4glKMpNUntF50Jc=
-uFfIsYZDMoYnX3gwhfqBg9ADT7Zo0hIo
-uzaS/w33qmX29x8disyYmGw2Mcq+QlR6Z5WjJulMlEE=
-u+9GWDpvSUou9vVat8fw+8I0LatYOcXivgJU7rpjpfE=
-sQHe+4cHTbgvn9s92Np4Whu8hdYQdIzjdEEwOohE3nc=
-sOt8Hu+fh1do/VvBBU1qybDrfB7vn4dXkSlT2wHlmBI=
-AJyLc7CET6WOD9dWJ6lSc8etsWnN4VwrZ5WjJulMlEE=
-xZglahXE7MEj78DHJA8NosWYJWoVxOzBZ+y/kv4gCvw=
-xZglahXE7MEZWyq2c/MNsiDIcifM8jM1r0IjXeAfgSb2Is59vHXXSoJaywY2UE6j
-xZglahXE7MEo0jrmQ2bxBMWYJWoVxOzB/C2HdvCkOhQ=
-xZglahXE7MHgSMmLjNI3OsWYJWoVxOzB2xPLPHYAdSM=
-xZglahXE7MEKDuc5bnfpw8WYJWoVxOzBNZprEBoBffA=
-6TPnQbtsLB0dY1B2zQ9xuzLObi+zuDyKfkRC94tU/To=
-Oh2o+4fC+FRVsimE0viIhClytftXzCQxZ5WjJulMlEE=
-iKlzB7VL8RS+lTv6h3jYsK2mHY/qYUNHBiNf+1YVhVY=
-6bnNkKG2YAn5NikgNpe4xmSpT1nqbbkJWSSzi4J6D51E387U0mxTku1UrnXbzCzm
-kueTl4vefEj+rRwJYBToYzhYKtcRsKoTOq4FtKDlq5o=
-TWtbGlY8ZG5u3+SHfMJnwq2RNSvzaok7w29zoqutRRY=
-2qQe38JO//xN7kkFFiHwMUXGEwP/iKtFiy48LWiKVlE=
-bBiO127E15he2HoLv/fYZkpgEZ36UZf7
-XDMJzJ+/UuTMfJGYtgmYK8AXvdldNno8
-2VcLrr+4sTebvmg+Q7/qkcI503QdVi5x
-tuoczNg6Ji0KsqVBON1zjKHT8+SKZwoVC8at4D0TvJ8Q/Sq4QLi9FQ==
-IMEemaM1RvCxJaevPQ3KpujHg4EvTVdzxBzbmvsqN8Jsz/XXlsvu0l83gGzFswkg
-IMEemaM1RvB/wd8Okz/znCDBHpmjNUbwJUGj/gHakSQ=
-Z2bitlw0AMa77Ch6/6yyXL+Lk22k7QQG1N8++L0lHAeAwJ0TUDtkVg==
-Mq0bej2JQ6QYxKlkyczqOghiIOXw/dSaFWN3xRThYNo=
-0NB8czuJbawSxbtaceWJ2QhiIOXw/dSaFWN3xRThYNo=
-0NB8czuJbazhS4Udh5P1VQhiIOXw/dSaFWN3xRThYNo=
-0NB8czuJbaztX2SY+nEstwhiIOXw/dSaFWN3xRThYNo=
-TD24z/PUVjOVgcDRshyn5z9/g++8U2v12UrAFkC7Nv2ppG3uOtOdztIBlIVT6KuB51PhmDmHKCY=
-W2oPA9uGqEXziB4rgd6C/CpcvK8fV34A
-ELM2T7Q2Mrcshx0ihPuyKCpcvK8fV34A
-Xn4HnNubANHFZ5D2h4QJfV5+B5zbmwDRn24FiGAmFiI=
-pvOWHs5I2yYTFDGbPOkzAhQz3x5aewl+iy48LWiKVlE=
-4kz1tOHrKCgihFmgZccXS2jmiJmNa7uO
-z9DQgyHTRF3opiWFprmM5rxAiuGz95sSPH8zC+3Mpsg=
-4qHCQsr7lrJbGOfgQgxaYwv2pMwkjIRu
-bDM5FoY6g/Sp4zF9ZeBsnqm+ZG7TsLmCPVW13/ZITYA=
-ePq3GVRQizaYcs6LIWNqJO/wnylh3Khh
-048X8sVpSrAKo/UK9NDHew==
-s9fvPkvw+eMciqQMcQY8JQ==
-+NKyMbGOgywt3sV9KmqDlfjSsjGxjoMsujul2F+yEk8=
-OCmTnwX57zZdxrRugxgho57Ml2laybKnUyFeDwonN69TLScZwx8sEEHIfKsfMVU7
-mq3XPGPu/Ok3Y4XD3zOr/1iiRIPsjsUx
-tuX4CT0GT8uFsFQKjAAlO7Dx3DSRpvmsf4WOYzogwJqaY3XbryMItg==
-oOpib5u9j6oc1dnc6uyT5zJCH6foy6/q
-t2qVur0ado3+X0tAZBhFVQ==
-LBoZcWkncSeev8/fiYiPKnSUq7geItud2Pn74KzoK7PhiZPxIE5Zeg==
-BGd8d09G2S/XKnC5Y43Q0eWb8dISoqFKIOF7cx9ohLI=
-9euU9L7S53HqXwxhu1zSHXZgmXrZ3pEJGjFhHUGm/IA=
-TO0JBQ8mr8RtOGpeBxU3CwadXEd7JuxlXnxmhPdKEuw=
-W9HH6C1O86+fKF+Jhxy5qQ49t5MU+2hM4c0QH3OjMax7arQIk4twhA==
-wZ5h+HPyyDMq2cWjJKyC41eWISsQnjrzGjFhHUGm/IA=
-utpp6b8KHN0aBUOmZY0YYQ==
-qQUPRuAFBRSJrMU2cmkW7I2DE5p7RGOMFWN3xRThYNo=
-UvA2FcpOj2iRUZkq8czGf9gJr2+iOHjL
-IxosIUcZdeOEyx5AvYpxfCMaLCFHGXXjOYYji+pq/ME=
-IxosIUcZdeO+AVOQd4583yMaLCFHGXXjOYYji+pq/ME=
-IxosIUcZdeMqqtObA+jC6SMaLCFHGXXjOYYji+pq/ME=
-7ddpONXhUU7bxfAeY2EVMGTKX8LJ/VRV7NLBEkDmDJE=
-dHiJrsr8DsryiH2sVtn1unR4ia7K/A7Kc89slo2hvmU=
-dHiJrsr8DsrHQpqlKMOY8R6YC2wn3ucaT2qcmGybiCY=
-/fXHRUZqZnQ7YtGuSolXCP31x0VGamZ0mDk7u/hTKrU=
-/fXHRUZqZnQUMF2hv/qTTB1uXWlpRJO0Bky0okqdmowDtX49A/m9tw==
-/fXHRUZqZnQmN2MJv+UzDECh7CVCkSWCBiNf+1YVhVY=
-hszhg2d0j1Nhx5yON3PYAoI2qars2fOxaHj+8CjlyFJZVprAem6Wt+/wnylh3Khh
-9obp3ii+9gVZoeLYrnJWpj/RhrsZrWTYmUyE5cmCTkA=
-Eo6PIRPavzTliNZcRugWYg==
-vBv0+XanS1xL67gEFem8cNYIZ3rZ9S0pB451+nWReBM=
-3Us4hTxwFHWrSdhaNrJdZe0liRe9U4t8
-bwSldk07Wi8TE1XlgZYZ8QerjyqMAg4J
-CUj7FbbVsoEH3C9N7oX5VZ1gRkHPSYy1
-wvcPgLQTFB0pax+G35NMk0na+GXbcIR8
-N5f8jX4xARnE8WR3NGqPdYsYrFYam1UV7NLBEkDmDJE=
-BZ+lrLVxH9eUZPIjJV+ACl2ECUP25wKz
-G/M0W5F4OF9sQWI5Vcg9mr7IR3wDLgEE/FRS7OcKkCw=
-+ZUN1DorLMWYcs6LIWNqJO/wnylh3Khh
-/dPMLQuqprYGU+RHTFl2ZQsfqELUS06K/FRS7OcKkCw=
-OskzQPHGH4k85vKUXEi4KDrJM0Dxxh+JrgMf5hQQvD5KYBGd+lGX+w==
-MHjASV8ic+zC4jrMgbhSiaBUuwPmO47c8rxZHbJEGwE=
-NUJV/LbdsKzHHa6afUtOodaRh58nZRsKfkRC94tU/To=
-c2D1nM8E5uwuYR3T/sMSWnNg9ZzPBObsM3AJne+dIeU=
-isJ5BIeZcFc7YtGuSolXCIrCeQSHmXBXmDk7u/hTKrU=
-isJ5BIeZcFcIAQUSRiFGR/kmzwALSom5u4W15gd/Kz2jd2fK5ZsrQJfZCNVlPAHp
-isJ5BIeZcFdMxZnKSK/BF4rCeQSHmXBX6vb1Z4xOWGM=
-isJ5BIeZcFfC0I1fazT+cYrCeQSHmXBXfGhZIkcmT4o=
-isJ5BIeZcFcnOXeVeAqQQorCeQSHmXBXSaFepBIs6WM=
-dGLjh0lStMEQ+HSz/izK2/orPWkHqNe5js9pUTat+Omi+m7K+KSxhg==
-Zh/FB6c5Xm+B6Mv+r3oUPWYfxQenOV5viGlTuYvwdd0=
-Zh/FB6c5Xm8qqFf1kGpzN2YfxQenOV5v75dIY3QhG4A=
-k/iIJEppkpOQY1i8lHPFkFbwZWJ0MgHsV2Le1m4XGVw=
-EewTKaQ167YgRw9+yNCtjxHsEymkNeu2E0olbfJ1dAM=
-k2GyZh1pFSolsv6n6uho3ctkriYylHczpHp904IlTO0=
-O6Zqq9szOgSq0culTF3KCgY1yLDiPcgwXnxmhPdKEuw=
-kAYShmyNB8o2toyDMjukNo2+4oA2lbORjmo1+hfLt7o=
-ptlalxjKqk41Xk8fp0jcVUWAkKC6Kk69n2eIVN7KHKYmQuY3MTqpqQ==
-lao0n8VzVLocNPUfXQlcmT6TyzO8VbjyP9+JFq5HfFc=
-1Bbx/h9FUeoKGCS7OlZYlm27nvnjqQYwyzLSqBF4Qps=
-dMBKQ3aABJ3kPycQfDWNSsXJIwVBKZD7
-eGz28sziaVnY0lBNz2HA+CWOy9rh9VpD
-REr0NlrDRI6jRaupwwo/oL+bwu15xQJy
-O3Vypet3iOc5HHRmPAOPzTgDx8qs11DG
-3NkxiJb2q0zVkkvyQ7wisDJCH6foy6/q
-iK0sL22sxIk7YtGuSolXCIitLC9trMSJmDk7u/hTKrU=
-iK0sL22sxIkUMF2hv/qTTE+VRhze+UHyEMp9nYeAoRwDtX49A/m9tw==
-iK0sL22sxInaYy8k8DDmO4itLC9trMSJFDBdob/6k0y+Peof7PeC6Q==
-iK0sL22sxIlMxZnKSK/BF4itLC9trMSJ6vb1Z4xOWGM=
-l1y7aaZ0695dc+ot0u5SjIQboUKx3Kuf
-lvXpc+7yoODjKixbmNsx3tlZxLMPZCO0
-5V5dw3VKeFIy62vz76MTA1h07UKwyj31
-rgJD619A79ZO/zVdlBb0acIDrOT9t+vX
-RO8haUpxV+G8gz8z211NiETvIWlKcVfh04W+qQIwtO4=
-T+uUWVe5qsUR0J/koz9KZgY1yLDiPcgwXnxmhPdKEuw=
-9FuIGlHegUkpLBlfM+VVqmUi5ghnqHjxy4x6AQXguls=
-ag2ellMneJGuJDbDkUxjoCdmGp113JI7VfMcTbyjbvU=
-NsvUxkdzWduM+o3iuJvRlOjp9ja+d3H5k+JdVCtLdmKEt9y4GnTMRepDNvv44seC
-Hv9682Y6BdDQy+yL3lHwiOpDNvv44seC
-cltuHzH3MZDEYh6827F4SvATMLR29vCf
-7JwKle4goSNxux++Z8sw50j4/j5lX/Rr/UEVU0CSNh3Tdl0SvvSiXQ==
-7JwKle4goSNPtCxM7FrOp6Psp+AE7zCc/UEVU0CSNh3Tdl0SvvSiXQ==
-srXjQvuhQDKcTk1Q0IYtzCDdRMaMynFBZbG8KUhskwQ=
-g6MkC3Xh8rsIIIZuRQduFwJ+Lzr29efsZ5WjJulMlEE=
-gzO8Cbg97CaA6VtQMrqmLIMzvAm4Pewm/LODAedI9pI=
-vjcgpLlCeU97OTs6DxmTm/ATMLR29vCf
-Cxid6c+FfAgUV6g7W25sgmzdrQi2IgaWV5a8pr5h3LbOGOlfDyLnXQ==
-Cxid6c+FfAh6r+snkWLpdw7b5hv2IWQtV5a8pr5h3LbOGOlfDyLnXQ==
-/aUJ40q0OGGeKpuD11H1Cn5BmYV/xJeEhSFrjI+fSRY=
-fkGZhX/El4Tp3WfLw+xGhbskWOWaLi4uZbG8KUhskwQ=
-IZ8qkaFH5cN2pmZc9dTe6A+TRU4vbE/A0q/AY+ii4C0=
-pETewWDLfxh89EofgPHJVqRE3sFgy38Yc8Q/wD2s+Kc=
-pETewWDLfxiYcs6LIWNqJO/wnylh3Khh
-OW2PVrqNbgtIkRc7oSI9syjDfW57z7HJTZAXpjLML4g=
-B7gyORehHi6JQdonxQKArUyVFcKaJldi
-N3JX8zHpelJjFUiOhYZQMkyVFcKaJldi
-5i4S6xm9ScoXjMlS0JHBf6SYfF1gjMHD/FRS7OcKkCw=
-pb21QUVW5XEa8NC1qmD4gK7tXZiwuBvF
-kwzSjpp0+Rrc3fVvg2+fYMcB1beekSgM
-t4IT8jVQBw/uYWa5czMdKccB1beekSgM
-dhcYKLqt4OQGnZgNruk5KkpgEZ36UZf7
-b8GEeLzwuUqqtlk8nbR2qK7tXZiwuBvF
-b8GEeLzwuUrV97Yfl/d/Vq7tXZiwuBvF
-b8GEeLzwuUotEBmAGZfup67tXZiwuBvF
-eeNtJL9hcqs8xmBeKeZ1l0GphsMK03t8
-B20iTPe8N0VtWzSnJmqc96BRnfTBEUMjOq4FtKDlq5o=
-B20iTPe8N0VNk1rUuCmgA6BRnfTBEUMjOq4FtKDlq5o=
-B20iTPe8N0WflloDZF1DAuaMBXbLV5H/UPeIrhzocK8=
-s3SdyOvWYn6WfboBgIwji8cB1beekSgM
-eL5Nf4Ql6yzaoMNj1/kGvni+TX+EJesscXjWCiUqpSM=
-pGuY+qbSImd/RPmIXExYfbyS0r7ZfWtN
-XXIUiO8imQc/trxkeqgXE11yFIjvIpkHmyNEplv0gDs=
-R4/KpCfRo5sbEf9EZLuYRw==
-QF8oKuglyQyvcM5Bj961HnbA2IbOkarlWRaTFzIkLGM=
-+sW+WE1wWAjgwad/N0MDpUrMh035Nt0sZbG8KUhskwQ=
-LmQx9rHQGTyXOKThZpPw9Bf/v+hc5txNZ5WjJulMlEE=
-SzoBj/z2A1CDYaHRak3xtUs6AY/89gNQxu0J/zeopcE=
-9EYe34NUtGOHLQnydCQ1HBhG1hsoW3XR
-G6D4ijHWBfzq5Tc7UVGvv84Z1G3kVlYw
-E25PowytIsnGM1+JgQ+uoosqN66+ar7W
-M0McykSEBYVrbo2q0+CU75fTBCA1f2zm
-Ty9M3Wc+IH4OfjobXHv2paYIEBHIXkc/
-xPPmcjBj9sP3C0umxFl3mHRxV+8FuY9ukG57ceWMY4U=
-QGYEYgKwm+cApN1lAmxX+ghk3XG7mSDP
-YvewDT/XqBHZCHvUM1kJ5zfLJpt8Vovi
-C/Pm1aFRDLYVUxW22cZ47G1JlWMFiZTK
-76wIiq0Vkxlyt/PYnKvOcud1KEyAJyMj
-lRpFR4STd/5eEbDoOB+ztYNqLkNStzNN
-8wvQmz5NC5vIeyKlqd8H7A==
-vjhE1Tz40ysxHaFFsSYvx4mqP+0M3CRz
-9eeSihWwS75AONSWzrLlzGRo8t+uKG8M7+nagmDiHZbT1An2OOoSsQ==
-N26aGYp7sjBYbyPB0wRZgw==
-9Y5r9+8kA0Pmh9xPRO3hj0pgEZ36UZf7
-hooQo1fvONtqpcDhJXZmqTqCEnMuhs6Q
-k0y9N6jYrm0avSYeDaNtB+GbtcGcH52pBASzRD8CLbY=
-FZcZMCqNgSopLBlfM+VVqnqJappFK0F1eREs/zJbaak=
-w+Cwf4MK0rVqrxiohJdzBcPgsH+DCtK1I9MUVCsia+g=
-wu4NEuCivVTZ1Wk1MmUbX9sKgB0a2Fz1RPSDQg6jxMY=
-wu4NEuCivVSI8Z8uKyCWGZMVV2WEMeGIPH8zC+3Mpsg=
-mHFe98NUmvf1rMlYntta77uJAxZ+VzmFPH8zC+3Mpsg=
-woivEWJHd5scJDcSrwbauKVaVePy5OzR7NLBEkDmDJE=
-VrHhM/eXUB3AGwkh9PwSWXhF+h+HWcPT3o/RqxfFGiQ=
-aMHmdd1v3CFC7AxSOiW44njxR9mVnoQqO8B+JsbxdH8=
-PTCos0DGivBqMNyA0Nk7RpQg/0wqg9ud/FRS7OcKkCw=
-oah/P5G7Vcg78bCbiC4sD0rQ+yAITFwdiy48LWiKVlE=
-nUo1zw2Dbrp/zhKOVw7+YmKSM2ya9iI/Oq4FtKDlq5o=
-D1eDYe7RqTKZriXLtABITWKSM2ya9iI/Oq4FtKDlq5o=
-D1eDYe7RqTI1Y0eFfBedp51KNc8Ng266OJk/rqQgIEs=
-D1eDYe7RqTKs9eVsmkrHJWKSM2ya9iI/Oq4FtKDlq5o=
-9gJL3CBEKfGcWsG4QxQGsDzEUeASewd2d0qc91dUHes=
-NEywGN3DjQFOEQPZwvsQ1ABQUb+Bgor/QsjDFyh0etI=
-0GIGQBI1htx2OlpdyfCl5liiRIPsjsUx
-7Y6DZNY2xGWAmOFSgHo5YliiRIPsjsUx
-P82MQmGg+aeI6yb631mnTz/NjEJhoPmnBJ8cmcL0nAA=
-GTDeQrdjnpqAldj8xWqqDwhiIOXw/dSaFWN3xRThYNo=
-GTDeQrdjnpqD20MKJeWHMQhiIOXw/dSaFWN3xRThYNo=
-0ovWd66vjdVPcyNoKfhVZnxamTrfW29lQsjDFyh0etI=
-S5bx2VAn5nz+SgemEk7wj1pFs/B64BfS7NLBEkDmDJE=
-4Qvrbb1JTp+DokAwFmKECDJisxJklz+7kG57ceWMY4U=
-x22xvkilTFH+SgemEk7wj2rjy25Aijbo7NLBEkDmDJE=
-Vc9imXWIb09bwwyH078vGnEWSnq2x5KjBiNf+1YVhVY=
-O3P6K+AfRNz4uGxH9DBEAhzPmtBWPAmEpHp904IlTO0=
-xRMzRE7B30im8sAY5Loq51In2oc4nlEEYTDxNHZVHIA=
-QI3BKCa5CS2/Qya9rg8cD7ajLddQHsdKOxgqIHpj3G0=
-VibK7zkhwxswfbz/NSCyQThYKtcRsKoTOq4FtKDlq5o=
-HXcKGk7fgWLSKiTeuE4H4KTniY1uzUoc/FRS7OcKkCw=
-UWayH/xluR0utkxKsPQAtL7ECNRmYRRbQo+b5Q3VZwY=
-Cja1N2r7aqyA7UtHcCm9Tgo2tTdq+2qseEU//+lhXY0=
-2bg5JuTZYIZQBmzJ8tu4RG396D8gjF3QgSzpIj+8oBAoZ4KbCDbYK0pgEZ36UZf7
-N+h4/d3ORJyaVvGyytsEaC9Jtri7jcCu
-L5pW2W5e5QP8xoQ3ak3LT+vmIzppKyg+iy48LWiKVlE=
-4j8xGfGBQHU9IdMdHnWhjipcvK8fV34A
-T6Y7lZRwt1YT+IbQu+uxRSpcvK8fV34A
-lTFz8Of++gzSOKoafpm4sLhU4nVuO2EX
-FzAE8+xHpx/yHKYEQ1q4w+d1KEyAJyMj
-FeDKLbBcDlgX4rfunxcKgfr3MA3I8mLHRgiTfkBFZ8IDrXmRmHb6vfwxXbdPc+bf
-XzE3hg5nBlZcAI17ndbKxeh//o7r6XxK
-fwrs39e2sE4Y2Ku7TsnJl7yS0r7ZfWtN
-su18MMk2rGoogb2mTwdheeh//o7r6XxK
-IHGgxsnOnj74cFOldJX9vQ==
-m69a4x/0L74hGqmV/bsQkQ==
-RDxMnTnhMZ8oLcKBJ602oRLKT8eFdzGhwexVzLebpLU=
-RDxMnTnhMZ8YU7xbNSSDfX4AS0mk96sNnw1/iLmAL28=
-yBW5KwCa3QJ6otuBbzxJOamAVvyPHubjhZln3/ysGCz3QhuGSiXXyw==
-zDr9psujcMy2wsyG/qmxMw==
-5sahv3Hloii2wsyG/qmxMw==
-BgAEXxkJI7OsPgVVaeF78yHud7S4gPqZ
-u5kffeqLBwNBjbs1EA0prDCyeMyaTN9t
-7t3O9O9TCuxXuLGhFwb6si9Jtri7jcCu
-y40FjkV6sF55iS/iPkN3imtAsj+g+txU
-W+Y0SwEFQHg1Xk8fp0jcVXRekVIxM5tbn2eIVN7KHKYmQuY3MTqpqQ==
-p5aCK46PH5VMEoJHcGi8tCXBPH2DKdJv
-+QcUSjkdonh/HeogIEXyxwZH0LrR6LVWGjFhHUGm/IA=
-gHsoP2gDJg6nX0VTNq08ZOLSzhaE/nJD/FRS7OcKkCw=
-aFFZlOb6t3rM6RCpC6CG2cCOsDRlr4swgM7iwnSZ3R8=
-r9wYD2Vr4lUZndUdLmj5xjS9CwvPbEfZ
-xEHYC5PyimOe8oZ3Nggmgq6lGFOOAKSXkdvMt65r33jKKPZ9pFrEuNlZxLMPZCO0
-btCstnrCzv2Ycs6LIWNqJO/wnylh3Khh
-d0o0k+rKjZwXIwEO9+g59veux+wDEn+MpHp904IlTO0=
-3vj0d5eXXoTpXqBX+hIoGQ==
-nB5xS01II5FO8U85Gj4LOwkzhrBsqvscH5LkeyCDeABSzlBthODeKA==
-wm6ORELi8z28ZB07nCjE2yXBPH2DKdJv
-zK3IJj4OCNLmDlpRHXRri8ytyCY+DgjSut1rfaYvqA8=
-+lTEQBikGJc8NHGBPM0w3I7FvPCycJGgFWN3xRThYNo=
-vFYVsMh2w7iZGYPZxX4RY40Z5yFJVnbw/FRS7OcKkCw=
-CncrVpe/1q98tYIJXh/PBZRmR5Qp5PuUQsjDFyh0etI=
-ypYq0llNvxtpKTjNikKsfLs9F4LyYomyQsjDFyh0etI=
-yIa+hslafBUcJDcSrwbauKVaVePy5OzR7NLBEkDmDJE=
-sVYW4FT2Yo41Jxddg7LADHhs9vLM4mlZoITwRCmCjgk=
-kPZomRw9tAC3c2kz3Bc5L03NQibaeph3vgJU7rpjpfE=
-Si3i0N+haNhPXflsFsvr6iKdg5VRj7TbgSNeyMS56rD3QhuGSiXXyw==
-xPhLahM0n3/qQFELmxnh1jVJ7JvToHql
-EgDx6oQPndD5t3x6aCFG0ImqP+0M3CRz
-KmLTIUfMRcp1w2u8ylDE22VnWtVEUaGQ
-2dplvxJbc3ij6Ve8sY3ZKhl7hKbqZ5yoZbG8KUhskwQ=
-HJH2CTxTjyKpYj5/A+CA916zwkV6JkCPI9MUVCsia+g=
-0uUyu0EpSXhL3sXFrmYMBP0YtuuI9KIBw29zoqutRRY=
-9w1pqrvigcfwzhuyXPgpTfcNaaq74oHH2pls4MeHQwU=
-SYmOLTsdfpUj8oWCTU7iEJ7c3lp3jhH9y4x6AQXguls=
-SYmOLTsdfpWZbRfC5irvTR20GDvIkJIutAjZncZBtw8dquGb79CGYA==
-SYmOLTsdfpWsD4nFbHYIbwJ+Lzr29efsZ5WjJulMlEE=
-SYmOLTsdfpXXePlE/3BKzqyiN/jR7TPMmY/LFPKvcPE=
-SYmOLTsdfpX3XOFIbBxqj7oV44iLs/DRJxi/WywRaen7t4gfkUmAbQ==
-SYmOLTsdfpX3XOFIbBxqjx20GDvIkJIu9rmwvwUkGBA=
-SYmOLTsdfpU3HXG6RsZlQnYt+Gr3yymHi0LGduDJbfD0AdrdTA5Jww==
-SYmOLTsdfpX58CJptFaKrRUL2pL6I35EEemd6QV5FrU=
-SYmOLTsdfpVHtGiSAgCMlIV48KJ7DccpEemd6QV5FrU=
-SYmOLTsdfpVHtGiSAgCMlFq/HluUNOr1qy5BpyHFcPI=
-bdQZAKU7mrWvw0XTTXtLYhf/v+hc5txNZ5WjJulMlEE=
-AKdEPSBAqhZuTwoK2mH2a1ga+wv/ApQBXnxmhPdKEuw=
-AKdEPSBAqhbAXdPqIko4qx20GDvIkJIu9rmwvwUkGBA=
-AKdEPSBAqhY2toyDMjukNh20GDvIkJIujmo1+hfLt7o=
-BL9NabCnLLqs0nUFBiBjzF2+o2HvHM53y4x6AQXguls=
-4VOzkz9d1ocfTsj2NQbOyehDNLyCNkpkFWN3xRThYNo=
-xFotwv9QCRcOw4yCqX+MJo6EXLgqYvQGV/vUcFFbXo0=
-xFotwv9QCReuJDbDkUxjoMRaLcL/UAkXOxObTyoMKMU=
-xFotwv9QCRdJ03CaLUlm60mJji07HX6VQMYaBnUZrGI=
-xFotwv9QCReeVqIrAdHu+UmJji07HX6V7BTGaIDrp1A=
-DorPguHF9SK1sKJY4w7NX0JVtM7/jdB3
-3p2dj/WUOxtuoBPSZcUkedSWAlQ61gcvZbG8KUhskwQ=
-XsRueZvhAyrWPUA/f8pcgkaN+4aje31E/Bd7i9pCsgJRJIM98GFYu0pgEZ36UZf7
-ueWzwnpHs3ZN9oF7QXV6rPXQJBkouwCz
-ueWzwnpHs3Ysu9VBkLGKtrnls8J6R7N2cFgsszCTAdlKYBGd+lGX+w==
-ueWzwnpHs3ZER7UsowxLiLnls8J6R7N2Csf7VCRrjQJKYBGd+lGX+w==
-yZRpnP+yLjMBc5pOGLp2hw+TRU4vbE/A0q/AY+ii4C0=
-sGclmiZTHKquJDbDkUxjoLBnJZomUxyqOxObTyoMKMU=
-HElPoHkVj76nHplQBbmy2Q==
-FF1vgOU3uYh8q0nZ+MFJyYRJkskAlH5TbENZYM316MM=
-g1jovPf6F1GfKF+Jhxy5qd9UZKK1wa658J71EEn0hjZ7arQIk4twhA==
-qgKo9TnGwm/yzpOzI09r6/b0h4fpZkUmVfMcTbyjbvU=
-qgKo9TnGwm//hMZW754VmKgZn5hKffbZhuqtrnbrsTodquGb79CGYA==
-qgKo9TnGwm9Swug693Oom6gZn5hKffbZhuqtrnbrsTodquGb79CGYA==
-cc5DUa/vIO1f+ZS5hoH2XAY1yLDiPcgwXnxmhPdKEuw=
-cc5DUa/vIO0ym7O+IXIF9t/g+0cktkWSutgQPaT1sQF44XjV9hm48Q==
-cc5DUa/vIO1c7YcDoqIb9e52uFEEx0ou2p3BehHo8nt3OsyeEuipIA==
-cc5DUa/vIO1c7YcDoqIb9XkxXH0Wa3sq2p3BehHo8nt3OsyeEuipIA==
-9vSHh+lmRSa3gVxzeLve8p7c3lp3jhH9y4x6AQXguls=
-9vSHh+lmRSaZbRfC5irvTd7y1AT9VfuktAjZncZBtw8dquGb79CGYA==
-9vSHh+lmRSadw6D02NP08AJ+Lzr29efsZ5WjJulMlEE=
-9vSHh+lmRSb3XOFIbBxqj/Rj12kLWl2dIu0QFU8JDOz7t4gfkUmAbQ==
-9vSHh+lmRSb3XOFIbBxqj97y1AT9Vfuk9rmwvwUkGBA=
-9vSHh+lmRSY3HXG6RsZlQiH2VcNW99XZ2dZjipKP9nf0AdrdTA5Jww==
-9vSHh+lmRSb58CJptFaKrVGqmYkQwrq4Eemd6QV5FrU=
-9vSHh+lmRSZHtGiSAgCMlIsxYZAlX2HLEemd6QV5FrU=
-9vSHh+lmRSZHtGiSAgCMlN7y1AT9Vfukjmo1+hfLt7o=
-vVsbjXwCHtIKYy+Di8EoBaFRBjWThVlFGjFhHUGm/IA=
-HL8rmewPyn/AXdPqIko4q97y1AT9Vfuk9rmwvwUkGBA=
-HL8rmewPyn9s4bvV+I+PQiH2VcNW99XZ2dZjipKP9nf0AdrdTA5Jww==
-HL8rmewPyn82toyDMjukNt7y1AT9Vfukjmo1+hfLt7o=
-SJa+FiJCadBiDdrE2/WSu0iWvhYiQmnQ0l+eOlaueF0=
-SJa+FiJCadBkqxPNk6+V1gp3K1aXv9avecBAl6wmOEY=
-ZSLmCGeoePGoVI6WKOWvApdqWdeVFb0gmW0XwuYq700dquGb79CGYA==
-YhAatOuUXEsERM36DqXPrpdqWdeVFb0g+fAiabRWiq16QxYuwwH6NA==
-C2vJTOY7dZnDZtxspjvHCgY1yLDiPcgwXnxmhPdKEuw=
-l2pZ15UVvSDM5uuhHQNsfZ7c3lp3jhH9y4x6AQXguls=
-l2pZ15UVvSBRJBcBVI9Z8QJ+Lzr29efsZ5WjJulMlEE=
-bqCB8DyBJ44G/lIq/sjpF0rMh035Nt0sZbG8KUhskwQ=
-WeTkv/3IWfI2toyDMjukNt+k12A5nWgAjmo1+hfLt7o=
-mjpPHyZldWWYcs6LIWNqJO/wnylh3Khh
-TCtCfBfidQM7CHoZvwulqB4LEyifMejwnqkOgSHWovOZAzJcI48FiQ==
-RnkjKy7bTuYOw4yCqX+MJo6EXLgqYvQGV/vUcFFbXo0=
-RnkjKy7bTuauJDbDkUxjoEmJji07HX6VVfMcTbyjbvU=
-RnkjKy7bTuZJ03CaLUlm60mJji07HX6VQMYaBnUZrGI=
-RnkjKy7bTubGVWNxVhT6JXYt+Gr3yymHaOu00tCHy/GlY23IbYlIWkpgEZ36UZf7
-RnkjKy7bTuZDsWjNNYM53QqkGfhh8Y5lkwY1q7cPcwodquGb79CGYA==
-RnkjKy7bTubv58U4p6buBAqkGfhh8Y5lkwY1q7cPcwodquGb79CGYA==
-4DIqUKiEs1Luxn+1KvIdVC0HxeN/KSMOQo+b5Q3VZwY=
-/0BAESVH7V1blGnd3NQxHgGRNX35u9t0fkRC94tU/To=
-oov0b3Lhw82OZ16IhTvg5emoofYVr0mL9YQ8RM5gOiY=
-tfsr8XjYgRRwa3pNpPwn9IzBLx1QLwLQryKysOD+KUY=
-tfsr8XjYgRQm8RYMzdJEFwLDs1c1tC4QB451+nWReBM=
-r7X7GnD5BU3WMpFA8dOBpYX6u1JMMNpHZbXb/d9RO60=
-r7X7GnD5BU21j71vs4mKp4X6u1JMMNpHZbXb/d9RO60=
-I0JXTOTz+fGjHzm9DjskOFiiRIPsjsUx
-FxJ0Oakicwj+wFbg6/XQzr6n+6hwVDTG
-FxJ0Oakicwj3XOFIbBxqj5gfUQLcbAt7dEEwOohE3nc=
-lv3LZULpEhezUF//oM+h1J4XDqYBRf1xGjFhHUGm/IA=
-CSnacheNuHCYcs6LIWNqJO/wnylh3Khh
-cV6+Fjiihhu/YQalCQQXpMIDrOT9t+vX
-QQODTbNfOrMg+6JBq+16TC0HxeN/KSMOQo+b5Q3VZwY=
-Xllk80eUBngKjOLsGJCf+J7c3lp3jhH9y4x6AQXguls=
-rOhmvGJJ8u3hovOIbwI2ehf/v+hc5txNZ5WjJulMlEE=
-yW3ljc/B8to2toyDMjukNks/BOP9VEd27+fFOKem7gQmUGMXnyjHjQ==
-PMpKtrNubIRtVusGoLHeVZ7c3lp3jhH9y4x6AQXguls=
-PMpKtrNubIRHtGiSAgCMlFuJybOqVWewjmo1+hfLt7o=
-PMpKtrNubIRHtGiSAgCMlAAMTEK/7VZqjmo1+hfLt7o=
-h9ZGx7VBqWA2toyDMjukNrXb9of22ifVo9kTCBN8xEM=
-h9ZGx7VBqWA2toyDMjukNluJybOqVWewjmo1+hfLt7o=
-h9ZGx7VBqWA2toyDMjukNgAMTEK/7VZqjmo1+hfLt7o=
-ecNXK5cRRiQTedVcW+1ACv5N2YG78Dzu
-wYXj29HL0odUB4CCS3cFFwerjyqMAg4J
-lHzFFybhC1EWW93c5KZ9w4MQSCN50TpDkG57ceWMY4U=
-b0BomW46y9MdlVd++cSv+BlCJACoyHBoyzLSqBF4Qps=
-4C8KZY34/kswWU6jaieZ+JVowK2tONarh3IYrJiu9UE=
-4C8KZY34/ksIayJ99X/P35VowK2tONarh3IYrJiu9UE=
-CMWGTs0XA9l34x2EPsL7JYodSpEvESgm
-Rxg+21wscO8AP3US4S7kQUcYPttcLHDv1HZRdJVS8lM=
-IstZUls4S9AB7eURvyaaxw==
-i/NMkchEuH7/i6rckSvgQp4v2SAHQkIu
-Be6thebZitVDxzjBAaam+g==
-jMVMcG9dB3JvcexlVWyehozFTHBvXQdyntVuU/h7nOk=
-huML/c8cqstc7YcDoqIb9fDrN1sUcSEqR4khd3pw1IM=
-huML/c8cqstc7YcDoqIb9fZbAaI5jCtsR4khd3pw1IM=
-0NnCpHilrJP+wFbg6/XQzhokdeqhF+go
-uX2LMexjtC+DDXqTwV+vs7yS0r7ZfWtN
-tONtmLyh0yQ09jAoo+UY/g==
-QgD8FjDufS1ja1UTEsHAMw==
-OZZwJs35ml5lTbQuD/rI9COCFug3Kgau
-OH1RRKiiSYROOZ4G3K4YYU/+OJPAB/QyGjFhHUGm/IA=
-Vls5PUREgM3IX3iae1RYqkGelkT9y18qZ5WjJulMlEE=
-DYkPG+bCAJ+c3bZSsmP2l5kmUx2ewZUNBASzRD8CLbY=
-DYkPG+bCAJ8OHka04C7s9ZkmUx2ewZUNBASzRD8CLbY=
-DYkPG+bCAJ/ekahJ945tbpkmUx2ewZUNBASzRD8CLbY=
-ZMIu0vQwdoB+AjK4SSMLQuheRkFTmIMrwOJ2qKmDrDPrilGZfSe60Q==
-ZMIu0vQwdoDgSMmLjNI3OuheRkFTmIMrRuyrDs9fNauXjb3OHxwMOA==
-ZMIu0vQwdoAKDuc5bnfpw+heRkFTmIMrvSt/c9CGyEs+HhQneOFfyA==
-B+a0hQZFsZlbmQ6XCbZXzg==
-jE6GI85puZxZxYV+LBmV4Jxow4nWiIDU
-BVsqqvlJD8d2OlpdyfCl5liiRIPsjsUx
-Xl0zOoAehnqoVI6WKOWvAoHEsAgomIvuXnxmhPdKEuw=
-Xl0zOoAehnpulkN3J4gwoO/wnylh3Khh
-Xl0zOoAehnofE6cl3yBuiQHPtLhZsozr
-Xl0zOoAehnoL473qOWrZr1iiRIPsjsUx
-Xl0zOoAehnqAmOFSgHo5YliiRIPsjsUx
-0IZmYHFR3bA20ON2zdVCZNCGZmBxUd2wfMMtSzFRPVw=
-0IZmYHFR3bDYdbULQfpTftCGZmBxUd2wfMMtSzFRPVw=
-Ny3IKPJiJQ7GkmJFm1LJzk/vyjoO9e9+FWN3xRThYNo=
-LYpQ+vNUOQuVBDXfW1knGy2KUPrzVDkLdNLat5Yda+Y=
-LYpQ+vNUOQtYXGQlXLsacC2KUPrzVDkLw13STXW65x0=
-D9UfgAqjRajZA4GTEoiPhg==
-OlPuNjWpEbOKNzISZuy+EjpT7jY1qRGz396jclCk5qI=
-y52OJQbS71yZ2P5KIyjhrPX8LA/dnPjyGjFhHUGm/IA=
-vzvpZekKhuMKlwFXotd07oVRdAqAyKfiOq4FtKDlq5o=
-xCEoOyRVep4MTQiYXM8lr11f6lSbu1qpryKysOD+KUY=
-5LdbDpeR1jsFdKJcEKaDoZ0kB1qH5zU+vgJU7rpjpfE=
-D4mYPp9JKbFyKmguwA/NStXqqaBrqdOOxnOD8nTXLaRSNJgxVvK0/UpgEZ36UZf7
-Fg0mXFNHBeistqXVm6ybrA==

+ 0 - 79
bigdata-web/src/main/resources/kl_result_mapping_standword.dict

@@ -1,79 +0,0 @@
-L1EmrYbiw1OUhT2Mgp9IYw==
-ITtp7xJvm7xN85EE9UKFSw==
-wD/+T2Rb77CRvSo1kXtPNEpgEZ36UZf7
-7Mb9gmlxjvh1F9jmC1k7P883fdy234AQ
-uxw8ICp6pO5wpgcXrQMg2VJhtasX0D86
-L1EmrYbiw1OIbvEPe9JVrA==
-L1EmrYbiw1PkvbIQjSH0ig==
-F8CWtrMTFqpULF2mGv8rXkpgEZ36UZf7
-vs5IhqszS0FV5nxcKLHXX+78A3F5ApoOtoX2nv595w8=
-ITtp7xJvm7yIbvEPe9JVrA==
-MsRMye4Ce1Tzd4Q5WYcI38K6Q4zNu6SzmeHG94k7IE0=
-4TVdgXZNhk6n617WIf7gjXqAFzRaz0s/E+oKnTDMgwM=
-Izz3qmtzr5r2IotS+Hrtgdt5hAoCEWE7
-kDiWMe1LBSn7WUAQirnyfkgPjzQSs0k2rBCI2o7bKak=
-8sjigmd8+cDI/ooGhntbPA==
-srat2SPWwxguIyv673ST2QbfxHf7qINy
-ml/2hklo0UHyOdjBHhpw6PD8KRVpDE2pSmARnfpRl/s=
-0otZcLsmIrh2Hs6rzcTSZXR2BAIQaNSQ
-uxw8ICp6pO7cN+yZQPS235v06pW+h+fV
-L1EmrYbiw1M/B+Rc2AlyxA==
-gnVG/ah+09SgRGW2oBYU+OEPDCWsDtGsSmARnfpRl/s=
-ml/2hklo0UHRmEFsc/9x2xajCnoy4DJaiJbgaKVsTrQ=
-IEYbDrCxln+pW/vODY540MSGO/2qkdhdzzd93LbfgBA=
-AotDretpE0ZBFWHcMGrhB79ZnX6q3jyT
-ml/2hklo0UF7OY2n/wXeGT2+sd4EngoW
-Iif1Jo1fyT++bhIKk0opxubM/HlMOKIR
-k1Gm7uC3txeV4R0r6B0UJw==
-uxw8ICp6pO7cN+yZQPS239cJHQx8ZPvQ
-F8CWtrMTFqoniUaZHKRtDg==
-O42GEYS2XrdrGTzkULBH0kpgEZ36UZf7
-lkGXVn+qv6wGpUvQ4LCbUQbfxHf7qINy
-Z8+G5B4yQAJEwaP0L1YpIsPLHHt4XU0w
-p2ksykmrwo4sihl+rIlDVaVct0+Wq2CHEEF4xA7BbNegwlRNlXVsGDiKp8v4EWLupiYV+OrJ7h95YV9F3XyyBQ==
-4TVdgXZNhk5uKjwx+NAMWfTPF+uOpY+N
-F8CWtrMTFqowgxhDjRXyhEpgEZ36UZf7
-8dihNLZO9dsX36WzpVuRF37u779IPQ1ApHp904IlTO0=
-qFhztcYdBhFSDqcM0GqgiEpgEZ36UZf7
-Dtl+1pXSqsCf7K9ZHfGUKeT5pyumoJAc
-ml/2hklo0UHyOdjBHhpw6LIcBy6P5pyfSmARnfpRl/s=
-M70fhXofuTuHyKDY6fnNSg==
-agwII1gQdty9lYvhKCiqzS8U3XrqgX2Qav3bY6gAyDY=
-kQHtQ28+jmRAgr/8kpwGtkoFpO2Z+GK8mk4WDpuB0fM=
-L1EmrYbiw1MHlWGXOa5WbQ==
-JC9KNSWPlz/yDK/cT4Wye5J2baIy6NOV
-ZXupFoR9xZZjPoDtlfNC/A==
-vs5IhqszS0FV5nxcKLHXX7RwSUIUaOzHYqTxfQMiC+k=
-LIhCJXufKxbf6yFB4KnNr7rtJS+DwsR+
-vs5IhqszS0FV5nxcKLHXX7RwSUIUaOzHHbSHS03vfmM=
-XLKpe1H4VQhm8TLMxgEyXHG+vSuxnv1tO6MyYWiOJ+8=
-SxCOqpR2m2vgqikXUwdVYSLuXWTUWavGdSu4/NSFMh2JDVVDa5aQ2qaDIhnMf3RgNSgeLpxHM1E=
-wYpoUOLxkWFyh8xi1Rb8FaKZXwCRnuzt
-xKjH098+V6WUhT2Mgp9IYw==
-wD/+T2Rb77DCStLw9D5GqEpgEZ36UZf7
-eOtp99ION5Ds8QGp8Y0fbaA/XJb5OMRF
-TTBoaK2XBA4Ul03O+JczYJkRlKkZ9goc
-Gl9t95Qgz7iDmNITYSpk9CnCJ2qqEZhF21nfxGCpJI4=
-deJ9ShdG0Iy3IgDj49Nd+wNeAFNXO6znEuIPRVt0zxrIFF7BEQ9/q5jT4dqI9dL0uKZSIUBrfqA=
-5b10ZecEq03DkIo5s7WKJO+9h847MVcISRS2rAck6VmAbjjMVsD+tagfqsNDuH7D0Zi/2VsQQhM=
-jkwAIBuL8J2rfWt+2fRjEHK76WBBMdTh
-wD/+T2Rb77DRxndKkqpYem2vzYM7pAHX
-JFoPNMqvscDYfrYzhvi2TUpgEZ36UZf7
-o586QSXa3yeSW7t/AXaZIPTPF+uOpY+N
-QuVFY0AsqDePuV7DZypuDJvIFLIFEYbK9AhSgsk0aTOyK9+CPwy73SvTg01va5zFEzbsQLwk3co+DpVh+1RB20pgEZ36UZf7
-8q2ztLDj5WrCOGEPa6tCFpTz+I5xZDsT
-HdMzbFa8esje00No8KDgnw==
-xbaeH6dIBS3RxndKkqpYel0Yre9PRlQPBiNf+1YVhVY=
-JC9KNSWPlz932m7E2QUuLb9PY5/aDDrQ
-KXjWK7CEAInDL9KKIPcR9w==
-Dtl+1pXSqsCdXBQ/c9gkD5Tz+I5xZDsT
-Z8+G5B4yQAJkIniXV51XYQbfxHf7qINy
-OiF4bqXkMEEAhZ46GKERaQ==
-6AdBr9ESXwxuAA4RzKQl7T8g5XqLhLp48PwpFWkMTalKYBGd+lGX+w==
-Q1zDVi3U7rI9l9Q+tlWf4Ee1cgYEdEeI/hgyPNS4IPeyXSyYJNIU/qAb9hNrEulyYTDxNHZVHIA=
-wD/+T2Rb77ANCqoCZftfGUpgEZ36UZf7
-6AdBr9ESXwx67Pnnr+kPStAxGsaAxJuz
-6AdBr9ESXwxuAA4RzKQl7Qx20j9Jd6MvshwHLo/mnJ9KYBGd+lGX+w==
-yE3028GRw4t2DqtTuKPPOg==
-SZ1VckZNWlv6YxRRpZKkEoKBWdL/M3D3
-U3FxTQC11De8fGTn0OiIddGYv9lbEEIT

+ 45 - 8
bigdata-web/src/test/java/org/diagbot/AddStandWordTest.java

@@ -28,25 +28,62 @@ public class AddStandWordTest {
         //        for (Map.Entry<String, List<Map<String, String>>> entry:entries) {
         //            System.out.println(entry.getKey() + "\t"+ entry.getValue());
         //        }
-//        getStandWordFeatureType();
-//        ApplicationCacheUtil.getKl_result_mapping_standword_map();
-        long startTime = System.currentTimeMillis();
+        //        getStandWordFeatureType();
+        //        ApplicationCacheUtil.getKl_result_mapping_standword_map();
+        /*long startTime = System.currentTimeMillis();
         ApplicationCacheUtil.getKl_result_mapping_standword_map();
         long endCacheTime = System.currentTimeMillis();
         long cacheTime = endCacheTime - startTime;
         System.out.println("处理标准词最终用了:" + cacheTime + "毫秒.");
         SearchData searchData = new SearchData();
-//        searchData.setSymptom("血压14/43mmhg,收缩压146mmhg,血压149/43mmhg");
-        searchData.setSymptom("心率120");
+//        searchData.setSymptom("血压14/43mmhg,收缩压140mmhg,血压149/43mmhg");
+        searchData.setSymptom("病程6月");
         long splitStartTime = System.currentTimeMillis();
         LexemePath<Lexeme> data = ParticipleUtil.participle(searchData.getSymptom());
         ParamsDataProxy paramsDataProxy = new ParamsDataProxy();
-        paramsDataProxy.addStandWord(data, ApplicationCacheUtil.kl_result_mapping_standword_map, searchData);
+        paramsDataProxy.addStandWord(data, ApplicationCacheUtil.kl_result_mapping_standword_map, searchData,"symptom");
         long endTime = System.currentTimeMillis();
         long splitSeconds = endTime - splitStartTime;
         long seconds = endTime - startTime;
         System.out.println("添加标准词使用了:"+splitSeconds + "毫秒.");
-        System.out.println("处理文本总共使用了:"+seconds + "毫秒.");
+        System.out.println("处理文本总共使用了:"+seconds + "毫秒.");*/
+        for (int j = 1; j < 11; j++) {
+
+
+            SearchData searchData = new SearchData();
+            ParamsDataProxy paramsDataProxy = new ParamsDataProxy();
+            searchData.setSymptom("安静时心率98次/分");
+            searchData.setOther("心率156次/分");
+            searchData.setVital("男性43岁");
+            searchData.setLis("Hachinski缺血积分2分");
+            searchData.setPacs("病程9个月");
+            searchData.setDiag("BMI12");
+            String[] items = { searchData.getSymptom(), searchData.getOther(), searchData.getVital()
+                    , searchData.getLis(), searchData.getPacs(), searchData.getDiag() };
+            String[] itemsType = { "symptom", "other", "vital", "lis", "pacs", "diag" };
+            long startTime = System.currentTimeMillis();
+            for (int i = 0; i < items.length; i++) {
+                if (items[i] != null) {
+                    LexemePath<Lexeme> featureData = ParticipleUtil.participle(items[i]);
+                    if (featureData != null) {
+                        paramsDataProxy.addStandWord(featureData, ApplicationCacheUtil.getKl_result_mapping_standword_map(), searchData, itemsType[i]);
+                    }
+                }
+            }
+            System.out.println(searchData.getSymptom());
+            System.out.println(searchData.getOther());
+            System.out.println(searchData.getVital());
+            System.out.println(searchData.getLis());
+            System.out.println(searchData.getPacs());
+            System.out.println(searchData.getDiag());
+            long endTime = System.currentTimeMillis();
+            System.out.println("处理文本总共使用了:" + (endTime - startTime) + "毫秒.");
+            System.out.println("---------------------------第" + j + "次处理---------------------------------");
+        }
+        //        String s = "\tsafGG\tAFASSADG";
+        //        System.out.println(s);
+        //        System.out.println(s.trim());
+
     }
 
     public static void getStandWordFeatureType() throws IOException {
@@ -83,7 +120,7 @@ public class AddStandWordTest {
                 }
             }
             int i = 1;
-            for (Lexeme lexeme:lexemes) {
+            for (Lexeme lexeme : lexemes) {
                 if (lexeme.getProperty().contains(",")) {
                     ApplicationCacheUtil.setProterty(lexeme);
                 }

+ 1 - 1
bigdata-web/src/test/java/org/diagbot/CacheFileManagerTest.java

@@ -26,7 +26,7 @@ public class CacheFileManagerTest {
     }
 
     public void contextMappingInitialized() {
-        MysqlJdbc nlpJdbc = new MysqlJdbc("root", "diagbot@20180822", "jdbc:mysql://192.168.2.235:3306/med-s?useUnicode=true&characterEncoding=UTF-8");
+        MysqlJdbc nlpJdbc = new MysqlJdbc("root", "lantone", "jdbc:mysql://192.168.2.121:3306/med?useUnicode=true&characterEncoding=UTF-8");
         Connection conn = nlpJdbc.connect();
         Statement st = null;
         ResultSet rs = null;

+ 36 - 0
common-push/pom.xml

@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>push</artifactId>
+        <groupId>org.diagbot</groupId>
+        <version>1.0.0</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>common-push</artifactId>
+
+    <name>common-push</name>
+    <!-- FIXME change it to the project's website -->
+    <url>http://www.example.com</url>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.diagbot</groupId>
+            <artifactId>public</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.diagbot</groupId>
+            <artifactId>graph</artifactId>
+            <version>1.0.0</version>
+            <scope>compile</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <finalName>common-push</finalName>
+    </build>
+</project>

+ 11 - 0
common-push/src/main/java/org/diagbot/common/push/Test.java

@@ -0,0 +1,11 @@
+package org.diagbot.common.push;
+
+/**
+ * @ClassName org.diagbot.common.push.Test
+ * @Description TODO
+ * @Author fyeman
+ * @Date 2019/8/5/005 17:07
+ * @Version 1.0
+ **/
+public class Test {
+}

+ 426 - 0
common-push/src/main/java/org/diagbot/common/push/cache/CacheFileManager.java

@@ -0,0 +1,426 @@
+package org.diagbot.common.push.cache;
+
+import org.diagbot.pub.jdbc.MysqlJdbc;
+import org.diagbot.pub.utils.PropertiesUtil;
+import org.diagbot.pub.utils.security.EncrypDES;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.util.StringUtils;
+
+import java.io.File;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.sql.Connection;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Statement;
+import java.util.*;
+
+/**
+ * Created by louhr on 2019/8/16.
+ */
+public class CacheFileManager {
+    Logger logger = LoggerFactory.getLogger(CacheFileManager.class);
+
+    private String user = "root";
+    private String password = "lantone";
+    private String url = "jdbc:mysql://192.168.2.236:3306/med?useUnicode=true&characterEncoding=UTF-8";
+
+    private String path = "";
+
+    public static void main(String[] args) {
+        CacheFileManager cacheFileManager = new CacheFileManager();
+        PropertiesUtil propertiesUtil = new PropertiesUtil("nlp.properties");
+        String p = propertiesUtil.getProperty("cache.file.dir");
+        File file = new File(p);
+        if (!file.exists()) {
+            file.mkdirs();
+        }
+        //自然语言处理
+        cacheFileManager.createNlpCacheFile(p);
+        //大数据
+        cacheFileManager.createBigDataCacheFile(p);
+        //图谱
+        cacheFileManager.createGraphCacheFile(p);
+    }
+
+    public CacheFileManager() {
+        PropertiesUtil propertiesUtil = new PropertiesUtil("nlp.properties");
+        String p = propertiesUtil.getProperty("cache.file.dir");
+        File file = new File(p);
+        if (!file.exists()) {
+            file.mkdirs();
+        }
+        logger.info("cache file path...." + p);
+        path = p;
+    }
+
+    public void createCacheFile() {
+        createNlpCacheFile(path);
+        createGraphCacheFile(path);
+        createBigDataCacheFile(path);
+    }
+
+    public void createNlpCacheFile() {
+        createNlpCacheFile(path);
+    }
+
+    public void createNlpCacheFile(String path) {
+        MysqlJdbc nlpJdbc = new MysqlJdbc(user, password, url);
+        Connection conn = nlpJdbc.connect();
+        Statement st = null;
+        ResultSet rs = null;
+        try {
+            EncrypDES encrypDES = new EncrypDES();
+            //所有词典库 不能用concat_group 大小写不区分
+            String sql = "select l_1.name l_1_name, l_1.type_id type_id, l_2.name l_2_name, l_1.concept_id from kl_library_info l_1\n" +
+                    "                    left join kl_library_info l_2 on l_1.concept_id = l_2.concept_id and l_2.is_concept = 1\n" +
+                    "left join kl_concept kc on l_1.concept_id = kc.id\n" +
+                    "where kc.is_deleted = 'N' ";
+            st = conn.createStatement();
+            rs = st.executeQuery(sql);
+            FileWriter fw = new FileWriter(path + "tc.dict");
+
+            Map<String, String> idMap = new HashMap<>(10);
+            Map<String, String> nameMap = new HashMap<>(10);
+            String r1;
+            String r2;
+            String r3;
+            while (rs.next()) {
+                r1 = rs.getString(1);
+                r2 = rs.getString(2);
+                r3 = rs.getString(4);
+                if (idMap.get(r1) == null) {
+                    idMap.put(r1, r2);
+                    nameMap.put(r1, r3);
+                } else if (idMap.get(r1) != null) {
+                    idMap.put(r1, idMap.get(r1) + "," + r2);
+                    nameMap.put(r1, nameMap.get(r1) + "," + r3);
+                }
+            }
+
+            List<Map.Entry<String, String>> libraryList = new ArrayList<Map.Entry<String, String>>(idMap.entrySet());
+            Collections.sort(libraryList, new Comparator<Map.Entry<String, String>>() {
+                public int compare(Map.Entry<String, String> o1, Map.Entry<String, String> o2) {
+                    return o1.getKey().compareTo(o2.getKey());
+                }
+            });
+            for (Map.Entry<String, String> entry : libraryList) {
+                fw.write(encrypDES.encrytor(entry.getKey() + "|9|"
+                        + entry.getValue() + "|" + nameMap.get(entry.getKey())));
+                fw.write("\n");
+            }
+
+            fw.close();
+
+            sql = "SELECT l_1.name l_1_name, l_2.name l_2_name, l_1.type_id FROM kl_library_info l_1 " +
+                    "left join kl_library_info l_2 on l_1.concept_id = l_2.concept_id and l_2.is_concept = '1' " +
+                    "where l_1.is_concept = '0'";
+            st = conn.createStatement();
+            rs = st.executeQuery(sql);
+
+            fw = new FileWriter(path + "synonym.dict");
+            while (rs.next()) {
+                r1 = rs.getString(1);
+                r2 = rs.getString(2);
+                r3 = rs.getString(3);
+                fw.write(encrypDES.encrytor(r1 + "|" + r2 + "|" + r3));
+                fw.write("\n");
+            }
+            fw.close();
+
+            sql = "SELECT l_1.name l_1_name, l_2.name l_2_name FROM kl_relation r " +
+                    "left join kl_concept c1 on r.start_id = c1.id " +
+                    "left join kl_concept c2 on r.end_id = c2.id " +
+                    "left join kl_library_info l_1 on l_1.id = c1.lib_id " +
+                    "left join kl_library_info l_2 on l_2.id = c2.lib_id where r.relation_id = 3";
+            st = conn.createStatement();
+            rs = st.executeQuery(sql);
+
+            libraryList = rsToMap(rs, false);
+
+            fw = new FileWriter(path + "chronic.dict");
+            for (Map.Entry<String, String> entry : libraryList) {
+                fw.write(encrypDES.encrytor(entry.getKey() + "|" + entry.getValue()));
+                fw.write("\n");
+            }
+            fw.close();
+
+            //推送词典
+            sql = "select k1.lib_name k1_lib_name, k2.lib_name k2_lib_name from kl_relation r " +
+                    "left join kl_concept k1 on k1.id = r.start_id " +
+                    "left join kl_concept k2 on k2.id = r.end_id " +
+                    "where r.relation_id = 19 and k1.is_deleted = 'N' and k2.is_deleted = 'N' and k1.lib_type = 1 and k2.lib_type = 1";
+            st = conn.createStatement();
+            rs = st.executeQuery(sql);
+            libraryList = rsToMap(rs, true);
+
+            fw = new FileWriter(path + "push-tc.dict");
+            for (Map.Entry<String, String> entry : libraryList) {
+                fw.write(encrypDES.encrytor(entry.getKey() + "|" + entry.getValue()));
+                fw.write("\n");
+            }
+            fw.close();
+
+            fw = new FileWriter(path + "classify.dict");
+            fw.close();
+        } catch (IOException ioe) {
+            ioe.printStackTrace();
+        } catch (SQLException sqle) {
+            sqle.printStackTrace();
+        } catch (Exception e) {
+            e.printStackTrace();
+        } finally {
+            nlpJdbc.close(rs, st, conn);
+        }
+    }
+
+    public void createGraphCacheFile() {
+        createGraphCacheFile(path);
+    }
+
+    public void createGraphCacheFile(String path) {
+        MysqlJdbc nlpJdbc = new MysqlJdbc(user, password, url);
+        Connection conn = nlpJdbc.connect();
+        Statement st = null;
+        ResultSet rs = null;
+        try {
+            //疾病I、II类
+            EncrypDES encrypDES = new EncrypDES();//加密对象
+            String sql = "SELECT con.lib_name, dis.classify from kl_disease dis, kl_concept con where dis.concept_id = con.id";
+            st = conn.createStatement();
+            rs = st.executeQuery(sql);
+            FileWriter fw = new FileWriter(path + "graph_diag_classify.dict");
+            String  r2 ,r3;
+            while (rs.next()) {
+                r2 = rs.getString(1);//疾病名称
+                r3 = rs.getString(2);//疾病类别
+                fw.write(encrypDES.encrytor(r2+ "|" + r3));
+                fw.write("\n");
+            }
+            fw.close();
+            //性别年龄
+            sql = "SELECT k1.lib_name, k1.lib_type, kcc.sex_type, kcc.min_age, kcc.max_age \n" +
+                    "FROM kl_concept_common kcc, kl_concept k1 \n" +
+                    "where kcc.concept_id = k1.id \n" +
+                    "and k1.lib_type in (18)";
+            st = conn.createStatement();
+            rs = st.executeQuery(sql);
+            fw = new FileWriter(path + "graph_sex_age_filter.dict");
+            String r1, r4, r5;
+            while (rs.next()) {
+                r1 = rs.getString(1);//术语名称
+                r2 = rs.getString(3);//sexType 1:男 2:女 3:都可以
+                r3 = rs.getString(4);//min_age
+                r4 = rs.getString(5);//max_age
+                fw.write(encrypDES.encrytor(r1 + "|" + r2 + "|" + r3+ "|" + r4));
+                fw.write("\n");
+            }
+            fw.close();
+            //体征结果转体征指标
+            sql = "SELECT\n" +
+                    "\ti1.lib_name name1,\n" +
+                    "\ti2.lib_name name2 \n" +
+                    "FROM\n" +
+                    "\t`kl_relation` l \n" +
+                    "\tLEFT JOIN kl_concept i1 ON l.start_id = i1.id \n" +
+                    "\tLEFT JOIN kl_concept i2 ON l.end_id = i2.id \n" +
+                    "where l.relation_id=19 AND i1.lib_type=35 AND i2.lib_type=33 AND l.is_deleted='N'";
+            st = conn.createStatement();
+            rs = st.executeQuery(sql);
+            fw = new FileWriter(path + "graph_vital_convert.dict");
+            while (rs.next()) {
+                r1 = rs.getString(1);//体征结果
+                r2 = rs.getString(2);//体征指标
+                fw.write(encrypDES.encrytor(r1 + "|" + r2));
+                fw.write("\n");
+            }
+            fw.close();
+            //疾病科室信息
+            sql = "SELECT k1.lib_name diag_name, k2.lib_name dept_name FROM kl_concept_common kcc, kl_concept k1, kl_concept k2 " +
+                    "where kcc.concept_id = k1.id and kcc.dept_id = k2.id " +
+                    "and k1.lib_type = 18 and kcc.dept_id  is not null";
+            st = conn.createStatement();
+            rs = st.executeQuery(sql);
+            List<Map.Entry<String, String>> libaryList = rsToMap(rs, true);
+            fw = new FileWriter(path + "graph_diag_2_dept.dict");
+            for (Map.Entry<String, String> entry : libaryList) {
+                fw.write(encrypDES.encrytor(entry.getKey() + "|" + entry.getValue()));
+                fw.write("\n");
+            }
+            fw.close();
+
+            sql = "SELECT g.diag_level1,g.diag_level2,g.diag_level3 FROM `kl_disease_normalize` g ";
+            st = conn.createStatement();
+            rs = st.executeQuery(sql);
+            fw = new FileWriter(path + "graph_diag_normalize.dict");
+            while (rs.next()) {
+                r1 = rs.getString(1);
+                r2 = rs.getString(2);
+                r3 = rs.getString(3);
+                fw.write(encrypDES.encrytor(r1+ "|" + r2+ "|" + r3));
+                fw.write("\n");
+            }
+            fw.close();
+        } catch (Exception e) {
+            e.printStackTrace();
+        } finally {
+            nlpJdbc.close(rs, st, conn);
+        }
+    }
+
+    public void createBigDataCacheFile() {
+        createBigDataCacheFile(path);
+    }
+
+    public void createBigDataCacheFile(String path) {
+        MysqlJdbc nlpJdbc = new MysqlJdbc(user, password, url);
+        Connection conn = nlpJdbc.connect();
+        Statement st = null;
+        ResultSet rs = null;
+        try {
+            EncrypDES encrypDES = new EncrypDES();
+            //疾病科室
+            String sql = "SELECT k1.lib_name diag_name, k2.lib_name dept_name FROM kl_concept_common kcc, kl_concept k1, kl_concept k2 " +
+                    "where kcc.concept_id = k1.id and kcc.dept_id = k2.id " +
+                    "and k1.lib_type = 18 and kcc.dept_id  is not null";
+            st = conn.createStatement();
+            rs = st.executeQuery(sql);
+            List<Map.Entry<String, String>> libraryList = rsToMap(rs, true);
+
+            FileWriter fw = new FileWriter(path + "bigdata_diag_2_dept.dict");
+            for (Map.Entry<String, String> entry : libraryList) {
+                fw.write(encrypDES.encrytor(entry.getKey() + "|" + entry.getValue()));
+                fw.write("\n");
+            }
+            fw.close();
+
+            //性别年龄
+            sql = "SELECT k1.lib_name, k1.lib_type, kcc.sex_type, kcc.min_age, kcc.max_age " +
+                    "FROM kl_concept_common kcc, kl_concept k1 " +
+                    "where kcc.concept_id = k1.id " +
+                    "and k1.lib_type in (1, 18)";
+            st = conn.createStatement();
+            rs = st.executeQuery(sql);
+            fw = new FileWriter(path + "bigdata_sex_age_filter.dict");
+
+            String r1, r2, r3, r4, r5;
+            while (rs.next()) {
+                r1 = rs.getString(1);
+                r2 = rs.getString(2);
+                r3 = rs.getString(3);
+                r4 = rs.getString(4);
+                r5 = rs.getString(5);
+                if ("18".equals(r2)) {
+                    r2 = "2";
+                }
+                fw.write(encrypDES.encrytor(r1 + "|" + r2 + "|" + r3 + "|" + r4 + "|" + r5));
+                fw.write("\n");
+            }
+            fw.close();
+
+            sql = "SELECT lib_name FROM kl_concept WHERE is_deleted = 'N' AND lib_type = 70 AND lib_name regexp '[0-9]'";
+            st = conn.createStatement();
+            rs = st.executeQuery(sql);
+
+            fw = new FileWriter(path + "bigdata_value_analyze.dict");
+            while (rs.next()) {
+                fw.write(encrypDES.encrytor(rs.getString(1)));
+                fw.write("\n");
+            }
+            fw.close();
+
+            //规则过滤信息
+            sql = "SELECT set_name, idx_name, min_operator, min_value, min_unit, max_operator, " +
+                    " max_value, max_unit, eq_operator, eq_value, eq_unit, remind FROM kl_rule ";
+            st = conn.createStatement();
+            rs = st.executeQuery(sql);
+            fw = new FileWriter(path + "rule_filter.dict");
+            String r6, r7, r8, r9, r10, r11, r12;
+            while (rs.next()) {
+                r1 = rs.getString(1);
+                r2 = rs.getString(2);
+                r3 = rs.getString(3);
+                r4 = rs.getString(4);
+                r5 = rs.getString(5);
+                r6 = rs.getString(6);
+                r7 = rs.getString(7);
+                r8 = rs.getString(8);
+                r9 = rs.getString(9);
+                r10 = rs.getString(10);
+                r11 = rs.getString(11);
+                r12 = rs.getString(12);
+                fw.write(encrypDES.encrytor(r1+ "|" + r2 + "|" + r3 + "|" + r4 + "|" + r5
+                        + "|" + r6 + "|" + r7 + "|" + r8 + "|" + r9 + "|" + r10 + "|" + r11 + "|" + r12));
+                fw.write("\n");
+            }
+            fw.close();
+
+//            //规则过滤信息
+//            sql = "SELECT idx_name, set_name, set_status, min_value, max_value, standard_value, " +
+//                    " , unit, concept_text, crisis_status, remind FROM kl_rule_new ";
+//            st = conn.createStatement();
+//            rs = st.executeQuery(sql);
+//            fw = new FileWriter(path + "bigdata_rule_filter.dict");
+//            String r10;
+//            while (rs.next()) {
+//                r1 = rs.getString(1);
+//                r2 = rs.getString(2);
+//                r3 = rs.getString(3);
+//                r4 = rs.getString(4);
+//                r5 = rs.getString(5);
+//                r6 = rs.getString(6);
+//                r7 = rs.getString(7);
+//                r8 = rs.getString(8);
+//                r9 = rs.getString(9);
+//                r10 = rs.getString(10);
+//                r1 = StringUtils.isEmpty(r1)?"":r1;
+//                r2 = StringUtils.isEmpty(r1)?"":r2;
+//                r3 = StringUtils.isEmpty(r1)?"":r3;
+//                r4 = StringUtils.isEmpty(r1)?"":r4;
+//                r5 = StringUtils.isEmpty(r1)?"":r5;
+//                r6 = StringUtils.isEmpty(r1)?"":r6;
+//                r7 = StringUtils.isEmpty(r1)?"":r7;
+//                r8 = StringUtils.isEmpty(r1)?"":r8;
+//                r9 = StringUtils.isEmpty(r1)?"":r9;
+//                r10 = StringUtils.isEmpty(r1)?"":r10;
+//                fw.write(encrypDES.encrytor(r1+ "|" + r2 + "|" + r3 + "|" + r4 + "|" + r5
+//                        + "|" + r6 + "|" + r7 + "|" + r8 + "|" + r9 + "|" + r10));
+//                fw.write("\n");
+//            }
+//            fw.close();
+        } catch (IOException ioe) {
+            ioe.printStackTrace();
+        } catch (SQLException sqle) {
+            sqle.printStackTrace();
+        }  catch (Exception e) {
+            e.printStackTrace();
+        } finally {
+            nlpJdbc.close(rs, st, conn);
+        }
+    }
+
+    private List<Map.Entry<String, String>> rsToMap(ResultSet rs, boolean isJoin) throws SQLException{
+        String r1 = "";
+        String r2 = "";
+        Map<String, String> libraryMap = new HashMap<>(10);
+        while (rs.next()) {
+            r1 = rs.getString(1);
+            r2 = rs.getString(2);
+            if (libraryMap.get(r1) == null) {
+                libraryMap.put(r1, r2);
+            } else if (isJoin && libraryMap.get(r1) != null) {
+                libraryMap.put(r1, libraryMap.get(r1) + "," + r2);
+            }
+        }
+
+        List<Map.Entry<String, String>> libraryList = new ArrayList<Map.Entry<String, String>>(libraryMap.entrySet());
+        Collections.sort(libraryList, new Comparator<Map.Entry<String, String>>() {
+            public int compare(Map.Entry<String, String> o1, Map.Entry<String, String> o2) {
+                return o1.getKey().compareTo(o2.getKey());
+            }
+        });
+
+        return libraryList;
+    }
+}

+ 524 - 0
common-push/src/main/java/org/diagbot/common/push/filter/ClassifyDiag.java

@@ -0,0 +1,524 @@
+package org.diagbot.common.push.filter;
+
+import com.alibaba.fastjson.JSONObject;
+import org.apache.commons.lang3.StringUtils;
+import org.diagbot.common.work.FeatureRate;
+import org.diagbot.common.work.ResponseData;
+import org.diagbot.graph.util.CacheUtil;
+
+import java.text.DecimalFormat;
+import java.util.*;
+import java.util.stream.Stream;
+
+/**
+ * Created by kwz on 2019/8/5.
+ */
+public class ClassifyDiag {
+    //诊断-->部门
+    Map<String, String>  diagDepartCache     = CacheUtil.getDiagDepartCache();
+    //get diagClassifyCache
+    Map<String, String>  diagClassifyCache   = CacheUtil.getDiagClassifyCache();
+    //每个诊断所在的级别缓存
+    Map<String, Integer> diagClassifyJiCache = CacheUtil.getDiagClassifyJiCache();
+
+   /* public static void main(String[] args) {
+
+        List<String> disList = new LinkedList<>();
+        String[] disArray = {"急性胰腺炎","冠心病","急性冠状动脉综合征","急性非ST段抬高型心肌梗死","急性ST段抬高型心肌梗死"
+        ,"三度房室传导阻滞","心力衰竭","急性心力衰竭"};
+         disList = Arrays.asList(disArray);
+        System.out.println("输入的诊断"+disList);
+        List<FeatureRate> inintFeature = new ArrayList<>();
+        Double inintNumber = 0.95;
+        String rate = "";
+        for (String dis:disList) {
+            FeatureRate featureRate = new FeatureRate();
+            featureRate.setFeatureName(dis);
+            inintNumber = inintNumber - 0.1;
+            rate = String.valueOf(inintNumber);
+            featureRate.setRate(rate);
+            inintFeature.add(featureRate);
+        }
+
+        ClassifyDiag classifyDiag = new ClassifyDiag();
+        List<FeatureRate> classify = classifyDiag.diagClassify(inintFeature);
+        System.out.println("hao hai you");
+        for (FeatureRate d:classify) {
+            System.out.println(d.getFeatureName()+"\t"+d.getRate()+"\t"+d.getExtraProperty());
+        }
+
+    }*/
+
+    /**
+     * 根据诊断依据规则过滤诊断
+     * @param graphResponseData 把过滤的诊断包装在这个对象里
+     * @param graphFeatures 过滤前的诊断结果
+     * @return 返回过滤后的诊断结果
+     */
+    public List<FeatureRate> filterDiag(ResponseData graphResponseData,List<FeatureRate> graphFeatures){
+        //根据诊断依据规则过滤掉的诊断列表
+        List<String> excludeDiag = graphResponseData.getExcludeDiag();
+        //将需要排除的诊断从列表中删除
+        List<FeatureRate> updateFeatures = new ArrayList<>();
+        if(excludeDiag != null){
+            for(int j = 0;j<graphFeatures.size();j++){
+                if(excludeDiag.indexOf(graphFeatures.get(j).getFeatureName()) == -1){
+                    updateFeatures.add(graphFeatures.get(j));
+                }
+            }
+            return updateFeatures;
+        }else {
+            return graphFeatures;
+        }
+
+    }
+
+    /**
+     * 诊断归一
+     * @param updateFeatures 归一前的诊断
+     * @return 归一后的诊断
+     */
+    public List<FeatureRate> diagClassify(List<FeatureRate> updateFeatures){
+        List<FeatureRate> finalDiagList = new LinkedList<>();//最终返回
+        List<String> highDiagList = new LinkedList<>();//警惕集合
+        List<String> queDiagList = new LinkedList<>();//确诊集合
+        List<String> bigDiagList = new LinkedList<>();//可能诊断集合
+        if(updateFeatures != null && updateFeatures.size()>0){
+            for(FeatureRate featureRate:updateFeatures){
+                String featureName = featureRate.getFeatureName();
+                String desc = featureRate.getDesc();
+                Map<String,Object> d = new HashMap<>();
+                if(desc != null){
+                    JSONObject jsonObject = JSONObject.parseObject(desc);
+                    d = jsonObject;
+                    if(d.keySet().size() == 1 && "警惕".equals(d.keySet().toArray()[0])){
+                        highDiagList.add(featureName);
+                    }else {
+                        queDiagList.add(featureName);
+                    }
+                }else {
+                    bigDiagList.add(featureName);
+                }
+            }
+        }
+        //先把警惕的加进去
+        if(highDiagList.size()>0){
+            for(int j =0;j<updateFeatures.size();j++){
+                FeatureRate featureRate = updateFeatures.get(j);
+                String featureName = featureRate.getFeatureName();
+                int i = highDiagList.indexOf(featureName);
+                if(i >= 0){
+                    finalDiagList.add(featureRate);
+                }
+            }
+        }
+        /**
+         * 这里处理一下可能诊断剔除的功能
+         * 如果图谱推出的诊断和可能诊断有层级关系,就把对应的可能诊断剔除
+         */
+        Set<String> queSet =null;
+        List<String> newBIgDiagList = this.removeKeng(queDiagList, bigDiagList);
+        System.out.println("图谱归一前数据 :"+queDiagList);
+        if(queDiagList != null && queDiagList.size()>0){
+            //图谱归一 ,图谱sign =0,大数据sign = 1
+            queSet = this.diagProcess(queDiagList,0);
+            System.out.println("图谱归一后的数据    :"+queSet);
+            if(queSet != null && queSet.size()>0){
+                for (String queDis:queSet) {
+                    if(queDiagList.indexOf(queDis)>=0){ //可以找到,就取出来,用原来的
+                        FeatureRate feature = this.getFeature(updateFeatures, queDis);
+                        feature.setExtraProperty(diagDepartCache.get(queDis));
+                        finalDiagList.add(feature);
+                    }else {
+                        FeatureRate featureRate = new FeatureRate();
+                        featureRate.setFeatureName(queDis);
+                        featureRate.setDesc("{\"确诊\":\"\"}");
+                        featureRate.setExtraProperty(diagDepartCache.get(queDis));
+                        featureRate.setSource("neo4j");
+                        finalDiagList.add(featureRate);
+                    }
+                }
+            }
+        }
+
+
+        if(newBIgDiagList!= null && newBIgDiagList.size()>0){
+            //大数据的可能诊断归一和排序
+            List<FeatureRate> featureRates = this.sortFeatureList(newBIgDiagList, updateFeatures);
+            //把可能诊断中和图谱相同的诊断去除
+            if(featureRates != null && featureRates.size()>0 && queSet !=null){
+                for (FeatureRate f:featureRates) {
+                    if(queSet.contains(f.getFeatureName())){
+                        featureRates.remove(f);
+                        continue;
+                    }
+                }
+            }
+            finalDiagList.addAll(featureRates);
+        }
+
+        return finalDiagList;
+
+    }
+
+    /**
+     * 诊断排序(诊断分为I类和II类,I类在前,II类在后,没有分类的诊断认为是I类)
+     * @param updateFeatureRates  //入参(通过过滤条件过滤后)
+     * @return
+     */
+    public List<FeatureRate> sortDiag(List<FeatureRate> updateFeatureRates){
+        Map<String, String> diagSortCache = CacheUtil.getDiagSortCache();
+        List<String> finalDiagList = new LinkedList<>();
+        List<String> neoDiagList = new LinkedList<>();
+        List<String> bigDataIDiagList = new LinkedList<>();
+        List<String> bigDataIIDiagList = new LinkedList<>();
+        List<FeatureRate> finalDiagFeature = new LinkedList<>();
+        if(updateFeatureRates != null || updateFeatureRates.size()>0){
+            for (FeatureRate feature:updateFeatureRates) {
+                String featureName = feature.getFeatureName();
+                String source = feature.getSource();
+                if("neo4j".equals(source)){
+                    neoDiagList.add(featureName);
+                }else {
+                    String s = diagSortCache.get(featureName);
+                    if(StringUtils.isNotEmpty(s)){
+                        if("Ⅰ".equals(s)){
+                            bigDataIDiagList.add(featureName);
+                        }else if("Ⅱ".equals(s)){
+                            bigDataIIDiagList.add(featureName);
+                        }
+                    }else {
+                        bigDataIDiagList.add(featureName);
+                    }
+                }
+            }
+        }
+        finalDiagList.addAll(neoDiagList);
+        finalDiagList.addAll(bigDataIDiagList);
+        finalDiagList.addAll(bigDataIIDiagList);
+        if(finalDiagList != null && finalDiagList.size()>0){
+            for (String diag:finalDiagList){
+                for (FeatureRate f:updateFeatureRates) {
+                    if(diag.equals(f.getFeatureName())){
+                        finalDiagFeature.add(f);
+                        break;
+                    }
+                }
+            }
+        }
+        return finalDiagFeature;
+    }
+
+    /**
+     * 去除可能诊断和确诊有关系的诊断
+     * @param queDiagList
+     * @param bigDiagList
+     * @return
+     */
+    public List<String> removeKeng(List<String> queDiagList,List<String> bigDiagList){
+        List<String> bigList = new ArrayList<>();
+        Set<String> queAll = new HashSet<>();
+        if(queDiagList.size()>0 && bigDiagList.size()>0){
+            for (String dis:queDiagList) {
+                String s = diagClassifyCache.get(dis);
+                if(s != null){
+                    queAll.add(s);
+                }
+                queAll.add(dis);
+                List<Object> key = this.getKey(diagClassifyCache, dis);
+                if(key != null && key.size()>0){
+                    for (Object o:key) {
+                        queAll.add(o.toString());
+                        List<Object> key1 = this.getKey(diagClassifyCache, o.toString());
+                        if(key1 !=null && key1.size()>0){
+                            for (Object o1:key1
+                                 ) {
+                                queAll.add(o1.toString());
+                            }
+                        }
+                    }
+
+                }
+
+            }
+        }
+        System.out.println(queAll);
+        String[] strings = queAll.stream().toArray(String[]::new);
+        if(bigDiagList != null && bigDiagList.size()>0){
+            for (String dis:bigDiagList) {
+                if(Arrays.asList(strings).indexOf(dis) == -1){
+                    bigList.add(dis);
+                }
+            }
+        }
+        return bigList;
+    }
+
+
+
+
+
+    /**
+     * 诊断归一和排序
+     * @param disList
+     * @return
+     */
+    public Set<String> diagProcess(List<String> disList,int sign){
+        Set<String> first = new LinkedHashSet<>();
+        Set<String> second= new LinkedHashSet<>();
+        Set<String> third= new LinkedHashSet<>();
+        Set<String> other= new LinkedHashSet<>();
+
+        /**
+         * 分级
+         * 初始化每个病出现的次数为0
+         */
+        Map<String, Integer> children_cnt = new HashMap<>();
+        for (String dis:disList) {
+            Integer ji = diagClassifyJiCache.get(dis);
+            if(ji != null){
+                if(1 == ji){
+                    first.add(dis);
+                    children_cnt.put(dis,0);
+                }else if(2 == ji){
+                    second.add(dis);
+                    children_cnt.put(dis,0);
+                }else if(3 == ji){
+                    third.add(dis);
+                    children_cnt.put(dis,0);
+                }
+            }else {
+                other.add(dis);
+            }
+        }
+        /**
+         * 从孙子找父亲,根据父亲找爷爷
+         */
+        if(third != null && third.size()>0){
+            for (String dis:third) {
+                String s = diagClassifyCache.get(dis);
+                Integer count = children_cnt.get(s);
+                if(s != null){
+                    children_cnt.put(s,(count == null)?1:count+1);
+                    second.add(s);
+                }
+
+            }
+        }
+
+        if(second != null && second.size()>0){
+            for (String dis:second) {
+                String s = diagClassifyCache.get(dis);
+                Integer count = children_cnt.get(s);
+                if(s != null){
+                    children_cnt.put(s,(count == null)?1:count+1);
+                    first.add(s);
+                }
+            }
+        }
+        List<String> pushDiag = new ArrayList<>();
+        //从顶级往下级依次看
+        for (String dis:first) {
+            Integer count = children_cnt.get(dis);
+            if(count == 0){
+                pushDiag.add(dis);
+            }else if(count == 1){
+                List<Object> key = this.getKey(diagClassifyCache, dis);
+                for (String diss:second) {
+                    Integer c2 = children_cnt.get(diss);
+                    if(key.contains(diss)){
+                        if(c2 == 0){
+                            pushDiag.add(diss);
+                        }else if(c2 == 1){
+                            List<Object> key1 = this.getKey(diagClassifyCache, diss);
+                            for (String disss:third) {
+                                if(key1.contains(disss)){
+                                    pushDiag.add(disss);
+                                }
+                            }
+                        }else if(c2 >1){
+                            pushDiag.add(diss);
+                        }
+                    }
+
+                }
+            }else if(count >1){
+                pushDiag.add(dis);
+            }
+
+        }
+        pushDiag.addAll(other); //归一后的
+
+        Set<String> finalList = new LinkedHashSet<>();
+        if(sign == 0){
+            finalList.addAll(pushDiag);
+        }else if(sign == 1){
+            for (String dis:disList) {
+                int i = pushDiag.indexOf(dis);
+                if(i >= 0){
+                    finalList.add(dis);
+
+                }else {
+                    List<Object> testList= new ArrayList<>();
+                    String s = diagClassifyCache.get(dis);
+                    if(StringUtils.isNotEmpty(s)){
+                        testList.add(s);
+                    }
+                    List<Object> key = this.getKey(diagClassifyCache, dis);
+                    boolean b = testList.addAll(key);
+                    for (Object dis1:testList) {
+                        if(pushDiag.indexOf(dis1)>=0){
+                            finalList.add(dis1.toString());
+
+                        }
+                    }
+                }
+            }
+        }
+
+        return finalList;
+
+    }
+
+    /**
+     * 根据rate排序
+     * @param diss 大数据可能诊断列表
+     * @param updates 所有推送的诊断
+     * @return 排好序并且归一的可能诊断列表
+     */
+    public List<FeatureRate> sortFeatureList(List<String> diss,List<FeatureRate> updates){
+        DecimalFormat df = new DecimalFormat("0.####");
+       List<FeatureRate> sortFeatures = new LinkedList<>();
+        Set<String> strings = this.diagProcess(diss,1);
+
+        Map<String,Double> disRate = new HashMap<>();
+        //归一确诊
+        if(diss!= null &&diss.size()>0){
+            //归一后的确诊(图谱出来的)
+
+            if(strings != null && strings.size()>0){
+                for (String queDis:strings) {
+                    List<Object> testCollect = new ArrayList<>();
+//                    FeatureRate feature = classifyDiag.getFeature(inintFeature, queDis);
+                    //如果能找到就把相关联的rate加起来
+                    testCollect.add(queDis);
+
+                    String s = null;
+                    s= diagClassifyCache.get(queDis);
+                    if(s != null){
+                        testCollect.add(s);
+                        s = diagClassifyCache.get(s);
+                        if(s != null){
+                            testCollect.add(s);
+                        }
+                    }
+                    List<Object> key =null;
+                    key = this.getKey(diagClassifyCache, queDis);
+                    testCollect.addAll(key);
+                    if(key != null && key.size()>0){
+                        for (Object o:key) {
+                            key = this.getKey(diagClassifyCache,o.toString());
+                            if(key!= null){
+                                testCollect.addAll(key);
+                            }
+                        }
+                    }
+                    Double count = 0.0;
+                    for (String dis:diss) {
+                        if(testCollect.indexOf(dis) >= 0){
+                            FeatureRate feature1 = this.getFeature(updates, dis);
+                            String rate1 = feature1.getRate();
+                            count = count+Double.parseDouble(rate1);
+                        }
+                    }
+                    disRate.put(queDis,count);
+                }
+            }
+
+        }
+        //根据rate排序
+        List<Map.Entry<String,Double>> list = new ArrayList<>(disRate.entrySet());
+        Collections.sort(list, new Comparator<Map.Entry<String, Double>>() {
+            @Override
+            public int compare(Map.Entry<String, Double> o1, Map.Entry<String, Double> o2) {
+                return o2.getValue().compareTo(o1.getValue());
+            }
+        });
+        for (Map.Entry<String,Double> s:list) {
+            System.out.println(s.getKey()+"\t"+s.getValue());
+            FeatureRate featureRate = new FeatureRate();
+            featureRate.setRate(df.format(s.getValue()));
+            featureRate.setFeatureName(s.getKey());
+            featureRate.setExtraProperty(diagDepartCache.get(s.getKey()));
+            sortFeatures.add(featureRate);
+        }
+
+        return sortFeatures;
+    }
+
+    /**
+     * 根据诊断名找到这个feature
+     * @param updateFeatures
+     * @param disName
+     * @return
+     */
+    public FeatureRate getFeature(List<FeatureRate> updateFeatures,String disName){
+        FeatureRate f = new FeatureRate();
+        for (FeatureRate fe:updateFeatures){
+            if(disName.equals(fe.getFeatureName())){
+                f = fe;
+            }
+        }
+        return f;
+    }
+
+    /**
+     * dis找大类
+     * @param inputs
+     * @return
+     */
+    public List<String> getDisList(List<String> inputs){
+        List<String> newDiagList = new ArrayList<>();
+        if(inputs!= null && inputs.size()>0){
+            for (String dis:inputs) {
+                String s = diagClassifyCache.get(dis);
+                if(StringUtils.isNotEmpty(s)){
+                    newDiagList.add(s);
+                }else {
+                    newDiagList.add(dis);
+                }
+
+            }
+        }
+        return newDiagList;
+    }
+
+    /**
+     * 统计列表中每个字符出现的次数
+     * @param inputs 输入列表
+     * @return
+     */
+    public Map<String,Integer> fildCount(List<String> inputs){
+        Map<String,Integer> map = new HashMap<>();
+        for (String dis:inputs) {
+            Integer count = map.get(dis);
+            map.put(dis,(count == null)?1:count+1);
+        }
+        return map;
+    }
+
+    public List<Object>  getKey(Map map, Object value){
+        Set set = map.entrySet(); //通过entrySet()方法把map中的每个键值对变成对应成Set集合中的一个对象
+        Iterator<Map.Entry<Object, Object>> iterator = set.iterator();
+        List<Object> arrayList = new ArrayList();
+        while(iterator.hasNext()){
+            //Map.Entry是一种类型,指向map中的一个键值对组成的对象
+            Map.Entry<Object, Object> entry = iterator.next();
+            if(entry.getValue().equals(value)){
+                arrayList.add(entry.getKey());
+            }
+        }
+        return arrayList;
+    }
+
+}

+ 79 - 0
common-push/src/main/java/org/diagbot/common/push/filter/PreResult.java

@@ -0,0 +1,79 @@
+package org.diagbot.common.push.filter;
+
+/**
+ * Created by louhr on 2019/8/31.
+ */
+public class PreResult {
+    private String detailName;
+    private String uniqueName;
+    private Double maxValue;
+    private Double minValue;
+    private String name;
+    private String otherValue;
+    private String units;
+    private Double value;
+
+    public String getDetailName() {
+        return detailName;
+    }
+
+    public void setDetailName(String detailName) {
+        this.detailName = detailName;
+    }
+
+    public String getUniqueName() {
+        return uniqueName;
+    }
+
+    public void setUniqueName(String uniqueName) {
+        this.uniqueName = uniqueName;
+    }
+
+    public Double getMaxValue() {
+        return maxValue;
+    }
+
+    public void setMaxValue(Double maxValue) {
+        this.maxValue = maxValue;
+    }
+
+    public Double getMinValue() {
+        return minValue;
+    }
+
+    public void setMinValue(Double minValue) {
+        this.minValue = minValue;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getOtherValue() {
+        return otherValue;
+    }
+
+    public void setOtherValue(String otherValue) {
+        this.otherValue = otherValue;
+    }
+
+    public String getUnits() {
+        return units;
+    }
+
+    public void setUnits(String units) {
+        this.units = units;
+    }
+
+    public Double getValue() {
+        return value;
+    }
+
+    public void setValue(Double value) {
+        this.value = value;
+    }
+}

+ 45 - 0
common-push/src/main/java/org/diagbot/common/push/filter/PretreatmentFilter.java

@@ -0,0 +1,45 @@
+package org.diagbot.common.push.filter;
+
+
+import org.diagbot.common.push.filter.pretreat.Pretreatment;
+import org.diagbot.common.push.filter.pretreat.PretreatmentSymptom;
+import org.diagbot.common.push.filter.pretreat.PretreatmentVital;
+import org.diagbot.common.work.SearchData;
+import org.springframework.util.StringUtils;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class PretreatmentFilter {
+    public void crisisFilter(SearchData searchData) throws java.io.IOException {
+        //将数值类型内容全部转换为标准术语  依据kl_rule提供规则
+
+        List<PreResult> allPreResultList = new ArrayList<>();
+        //症状数据
+        if (!StringUtils.isEmpty(searchData.getSymptom())) {
+            searchData.setSymptom(add2PreResultList(new PretreatmentSymptom(), searchData.getSymptom(), allPreResultList));
+        }
+        //体征数据
+        if (!StringUtils.isEmpty(searchData.getVital())) {
+            searchData.setVital(add2PreResultList(new PretreatmentVital(), searchData.getVital(), allPreResultList));
+        }
+        //lis文本非结构化数据
+        if (!StringUtils.isEmpty(searchData.getLis())) {
+            searchData.setLis(add2PreResultList(new PretreatmentVital(), searchData.getLis(), allPreResultList));
+        }
+        //pacs数据
+        if (!StringUtils.isEmpty(searchData.getPacs())) {
+            searchData.setPacs(add2PreResultList(new PretreatmentVital(), searchData.getPacs(), allPreResultList));
+        }
+    }
+
+    private String add2PreResultList(Pretreatment pretreatment, String content, List<PreResult> allPreResultList) throws java.io.IOException {
+        List<PreResult> preResultList = pretreatment.analyze(content);
+        if (preResultList != null) {
+            allPreResultList.addAll(preResultList);
+
+
+        }
+        return content;
+    }
+}

+ 88 - 0
common-push/src/main/java/org/diagbot/common/push/filter/pretreat/Pretreatment.java

@@ -0,0 +1,88 @@
+package org.diagbot.common.push.filter.pretreat;
+
+import org.diagbot.common.push.filter.PreResult;
+import org.diagbot.nlp.participle.ParticipleUtil;
+import org.diagbot.nlp.participle.word.Lexeme;
+import org.diagbot.nlp.participle.word.LexemePath;
+import org.diagbot.nlp.util.NegativeEnum;
+import org.diagbot.nlp.util.NlpUtil;
+import org.springframework.util.StringUtils;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Created by louhr on 2019/8/31.
+ */
+public abstract class Pretreatment {
+    protected NegativeEnum[] nees_time_and_unit = new NegativeEnum[]{NegativeEnum.EVENT_TIME, NegativeEnum.UNIT};
+
+    protected int cursor = 0;
+
+    public abstract List<PreResult> analyze(String content) throws java.io.IOException;
+
+    abstract PreResult createPreResult(LexemePath<Lexeme> lexemes, Lexeme lexeme, int index);
+
+    protected List<PreResult> analyzeDefault(String content) throws java.io.IOException{
+        LexemePath<Lexeme> lexemes = ParticipleUtil.participle(content);
+
+        List<PreResult> preResultList = new ArrayList<>();
+        for (int i = 0; i < lexemes.size(); i++) {
+            Lexeme l = lexemes.get(i);
+            if (NlpUtil.isFeature(l.getProperty(), nees_time_and_unit)) {
+                PreResult result = data2Object(lexemes, l, i, l.getProperty());
+                if (result != null) {
+                    preResultList.add(result);
+                }
+            }
+        }
+        return preResultList;
+    }
+
+    protected PreResult data2Object(LexemePath<Lexeme> lexemes, Lexeme lexeme, int index, String property) {
+        if (index < 2) {
+            return null;
+        }
+        return createPreResult(lexemes, lexeme, index);
+    }
+
+    public PreResult createDefaultPreResult(LexemePath<Lexeme> lexemes, Lexeme lexeme, int index) {
+        double value = findNumberValue(lexemes, lexeme, index);
+        if (value == -1) return null;
+        //继续往前找本体
+        String text = findBodyValue(lexemes, lexeme, index);
+        if (StringUtils.isEmpty(text)) {
+            return null;
+        }
+        PreResult result = new PreResult();
+        result.setValue(value);
+        result.setUnits(lexeme.getText());
+        result.setDetailName(text);
+        return result;
+    }
+
+    protected double findNumberValue(LexemePath<Lexeme> lexemes, Lexeme lexeme, int index) {
+        if (index < 1) return -1;
+        cursor = index - 1;
+        Lexeme leftLexeme = lexemes.get(cursor);
+        if ("×".equals(leftLexeme.getText())) {
+            if  (cursor <= 0) return -1;
+            cursor--;
+            leftLexeme = lexemes.get(cursor);
+        }
+        if (NlpUtil.isNumberString(leftLexeme)) {
+            return NlpUtil.numberText2value(leftLexeme);
+        }
+        return -1;
+    }
+
+    protected String findBodyValue(LexemePath<Lexeme> lexemes, Lexeme lexeme, int index) {
+        if (cursor > 0) cursor--;
+        Lexeme leftLexeme = lexemes.get(cursor);
+        if (NlpUtil.isFeature(leftLexeme.getProperty(), new NegativeEnum[]{NegativeEnum.VITAL_INDEX,
+                NegativeEnum.VITAL_INDEX_VALUE, NegativeEnum.VITAL_RESULT, NegativeEnum.SYMPTOM})) {
+            return leftLexeme.getText();
+        }
+        return null;
+    }
+}

+ 41 - 0
common-push/src/main/java/org/diagbot/common/push/filter/pretreat/PretreatmentLis.java

@@ -0,0 +1,41 @@
+package org.diagbot.common.push.filter.pretreat;
+
+import org.diagbot.common.push.filter.PreResult;
+import org.diagbot.nlp.participle.word.Lexeme;
+import org.diagbot.nlp.participle.word.LexemePath;
+import org.diagbot.nlp.util.NegativeEnum;
+import org.diagbot.nlp.util.NlpUtil;
+import org.springframework.util.StringUtils;
+
+import java.util.List;
+
+public class PretreatmentLis extends Pretreatment {
+    public List<PreResult> analyze(String content) throws java.io.IOException{
+        return super.analyzeDefault(content);
+    }
+
+    public PreResult createPreResult(LexemePath<Lexeme> lexemes, Lexeme lexeme, int index) {
+        PreResult result = new PreResult();
+        double value = findNumberValue(lexemes, lexeme, index);
+        if (value == -1) return null;
+        //继续往前找化验明细项
+        if (cursor > 0) cursor--;
+        Lexeme leftLexeme = lexemes.get(cursor);
+        if (NlpUtil.isFeature(leftLexeme.getProperty(), new NegativeEnum[]{NegativeEnum.LIS_NAME})) {
+            result.setDetailName(leftLexeme.getText());
+        } else {
+            return null;
+        }
+        //查找化验套餐
+        int position = cursor - 1;
+        while (position > -1) {
+            leftLexeme = lexemes.get(position);
+            if (NlpUtil.isFeature(leftLexeme.getProperty(), new NegativeEnum[]{NegativeEnum.LIS_TYPE})) {
+                result.setName(leftLexeme.getText());
+                break;
+            }
+            position--;
+        }
+        return result;
+    }
+}

+ 17 - 0
common-push/src/main/java/org/diagbot/common/push/filter/pretreat/PretreatmentSymptom.java

@@ -0,0 +1,17 @@
+package org.diagbot.common.push.filter.pretreat;
+
+import org.diagbot.common.push.filter.PreResult;
+import org.diagbot.nlp.participle.word.Lexeme;
+import org.diagbot.nlp.participle.word.LexemePath;
+
+import java.util.List;
+
+public class PretreatmentSymptom extends Pretreatment {
+    public List<PreResult> analyze(String content) throws java.io.IOException{
+        return super.analyzeDefault(content);
+    }
+
+    public PreResult createPreResult(LexemePath<Lexeme> lexemes, Lexeme lexeme, int index) {
+        return super.createDefaultPreResult(lexemes, lexeme, index);
+    }
+}

+ 17 - 0
common-push/src/main/java/org/diagbot/common/push/filter/pretreat/PretreatmentVital.java

@@ -0,0 +1,17 @@
+package org.diagbot.common.push.filter.pretreat;
+
+import org.diagbot.common.push.filter.PreResult;
+import org.diagbot.nlp.participle.word.Lexeme;
+import org.diagbot.nlp.participle.word.LexemePath;
+
+import java.util.List;
+
+public class PretreatmentVital extends Pretreatment {
+    public List<PreResult> analyze(String content) throws java.io.IOException{
+        return super.analyzeDefault(content);
+    }
+
+    public PreResult createPreResult(LexemePath<Lexeme> lexemes, Lexeme lexeme, int index) {
+        return super.createDefaultPreResult(lexemes, lexeme, index);
+    }
+}

+ 8 - 0
common-service/src/main/java/org/diagbot/common/javabean/MedicalIndication.java

@@ -7,6 +7,7 @@ import java.util.List;
  */
 public class MedicalIndication {
     private String name;
+    private String rule;
     private List<MedicalIndicationDetail> details;
 
     public String getName() {
@@ -17,6 +18,12 @@ public class MedicalIndication {
         this.name = name;
     }
 
+    public String getRule() {
+        return rule;
+    }
+
+    public void setRule(String rule) { this.rule = rule; }
+
     public List<MedicalIndicationDetail> getDetails() {
         return details;
     }
@@ -24,4 +31,5 @@ public class MedicalIndication {
     public void setDetails(List<MedicalIndicationDetail> details) {
         this.details = details;
     }
+
 }

+ 1 - 1
common-service/src/main/java/org/diagbot/common/javabean/MedicalIndicationDetail.java

@@ -3,7 +3,7 @@ package org.diagbot.common.javabean;
 import com.alibaba.fastjson.JSONObject;
 
 public class MedicalIndicationDetail {
-    private Integer type;//1-量表,2-公式,3-其他指标
+    private Integer type;//1-量表,2-公式,3-其他指标,4-危急值
     private JSONObject content;
 
     public Integer getType() {

+ 59 - 0
common-service/src/main/java/org/diagbot/common/javabean/Rule.java

@@ -0,0 +1,59 @@
+package org.diagbot.common.javabean;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 触发规则
+ * @author Mark Huang
+ * @since 27/08/2019
+ */
+@Getter
+@Setter
+public class Rule {
+    // 套餐名称
+    private String set_name;
+    // 指标名称
+    private String idx_name;
+    // 最小值操作符
+    private String min_operator;
+    // 最小值
+    private String min_value;
+    // 最小值单位
+    private String min_unit;
+    // 最大值操作符
+    private String max_operator;
+    // 最大值
+    private String max_value;
+    // 最大值单位
+    private String max_unit;
+    // 相等操作符
+    private String eq_operator;
+    // 等于值
+    private String eq_value;
+    // 等于值单位
+    private String eq_unit;
+    // 推送名称
+    private String remind;
+
+    public Rule() { }
+
+    public Rule(String[] elements) {
+//        Rule rule = new Rule();
+
+        if (elements.length == 12) {
+            this.set_name = (null == elements[0])?"":elements[0];
+            this.idx_name = (null == elements[1])?"":elements[1];
+            this.min_operator = (null == elements[2])?"":elements[2];
+            this.min_value = (null == elements[3])?"":elements[3];
+            this.min_unit = (null == elements[4])?"":elements[4];
+            this.max_operator = (null == elements[5])?"":elements[5];
+            this.max_value = (null == elements[6])?"":elements[6];
+            this.max_unit = (null == elements[7])?"":elements[7];
+            this.eq_operator = (null == elements[8])?"":elements[8];
+            this.eq_value = (null == elements[9])?"":elements[9];
+            this.eq_unit = (null == elements[10])?"":elements[10];
+            this.remind = (null == elements[11])?"":elements[11];
+        }
+    }
+}

+ 9 - 0
common-service/src/main/java/org/diagbot/common/work/FeatureRate.java

@@ -8,6 +8,7 @@ public class FeatureRate {
     private String extraProperty;
     private String desc;
     private String rate;
+    private String source;
 
     public String getFeatureName() {
         return featureName;
@@ -40,4 +41,12 @@ public class FeatureRate {
     public void setDesc(String desc) {
         this.desc = desc;
     }
+
+    public String getSource() {
+        return source;
+    }
+
+    public void setSource(String source) {
+        this.source = source;
+    }
 }

+ 19 - 0
common-service/src/main/java/org/diagbot/common/work/ResponseData.java

@@ -21,12 +21,15 @@ public class ResponseData {
     private List<FeatureRate> pacs = new ArrayList<>(10);
     private List<FeatureRate> history = new ArrayList<>(10);
 
+    private List<FeatureRate> beforeCombineDis = new ArrayList<>(10);
+
     private Map<String, Filnlly> treat = new HashMap<>();
     private List<FeatureRate> graphWords = new ArrayList<>(10);
     private List<MedicalIndication> medicalIndications;//量表和指标推送
 //    private Map<String,JSONObject> managementEvaluation; //管理评估
     private Map managementEvaluation;
     private List<String> diffDiag;//鉴别诊断
+    private List<String> excludeDiag; //排除诊断
 
     public List<String> getDiffDiag() {
         return diffDiag;
@@ -36,6 +39,14 @@ public class ResponseData {
         this.diffDiag = diffDiag;
     }
 
+    public List<String> getExcludeDiag() {
+        return excludeDiag;
+    }
+
+    public void setExcludeDiag(List<String> excludeDiag) {
+        this.excludeDiag = excludeDiag;
+    }
+
     public Map getManagementEvaluation() {
         return managementEvaluation;
     }
@@ -141,4 +152,12 @@ public class ResponseData {
     public void setHistory(List<FeatureRate> history) {
         this.history = history;
     }
+
+    public List<FeatureRate> getBeforeCombineDis() {
+        return beforeCombineDis;
+    }
+
+    public void setBeforeCombineDis(List<FeatureRate> beforeCombineDis) {
+        this.beforeCombineDis = beforeCombineDis;
+    }
 }

+ 30 - 0
common-service/src/main/java/org/diagbot/common/work/SearchData.java

@@ -32,6 +32,12 @@ public class SearchData {
     protected String diag = "";
     protected String past = "";
     protected String other = "";
+    //当前开单lis项目
+    protected String lisOrder = "";
+    //当前开单pacs项目
+    protected String pacsOrder = "";
+    //当前开单其他 预留
+    protected String otherOrder = "";
     //大数据推送诊断结果信息
     protected List<FeatureRate> pushDiags = new ArrayList<>();
 
@@ -262,4 +268,28 @@ public class SearchData {
     public void setGraphInputs(Map<String, Map<String, String>> graphInputs) {
         this.graphInputs = graphInputs;
     }
+
+    public String getLisOrder() {
+        return lisOrder;
+    }
+
+    public void setLisOrder(String lisOrder) {
+        this.lisOrder = lisOrder;
+    }
+
+    public String getPacsOrder() {
+        return pacsOrder;
+    }
+
+    public void setPacsOrder(String pacsOrder) {
+        this.pacsOrder = pacsOrder;
+    }
+
+    public String getOtherOrder() {
+        return otherOrder;
+    }
+
+    public void setOtherOrder(String otherOrder) {
+        this.otherOrder = otherOrder;
+    }
 }

+ 5 - 2
graph-web/src/main/java/org/diagbot/graphWeb/controller/GraphController.java

@@ -10,6 +10,7 @@ import org.diagbot.graphWeb.work.GraphCalculate;
 import org.diagbot.graphWeb.work.HighRiskCalculate;
 import org.diagbot.common.work.ResponseData;
 import org.diagbot.common.work.SearchData;
+import org.diagbot.graphWeb.work.LisPacsCalculate;
 import org.diagbot.pub.api.Response;
 import org.diagbot.pub.utils.PropertiesUtil;
 import org.springframework.stereotype.Controller;
@@ -48,8 +49,10 @@ public class GraphController {
     @ResponseBody
     public Response<ResponseData> lisPacsData(HttpServletRequest request, @RequestBody SearchData searchData) throws Exception {
         Response<ResponseData> response = new Response();
-        GraphCalculate graphCalculate = new GraphCalculate();
-        ResponseData responseData = graphCalculate.getLisPacs(request, searchData);
+        LisPacsCalculate lisPacsCalculate = new LisPacsCalculate();
+        ResponseData responseData = lisPacsCalculate.getLisPacs(request, searchData);
+//        GraphCalculate graphCalculate = new GraphCalculate();
+//        ResponseData responseData = graphCalculate.getLisPacs(request, searchData);
         response.setData(responseData);
         return response;
     }

+ 7 - 4
graph-web/src/main/java/org/diagbot/graphWeb/work/DiseaseCalculate.java

@@ -43,10 +43,10 @@ public class DiseaseCalculate {
         responseData.setMedicalIndications(medicalIndications);
 
         //走管理评估
-        Map managementEvaluation = diseaseResponse.getManagementEvaluation();
-        Map test = this.getMan(managementEvaluation);
-
-        responseData.setManagementEvaluation(test);
+//        Map managementEvaluation = diseaseResponse.getManagementEvaluation();
+//        Map test = this.getMan(managementEvaluation);
+//
+//        responseData.setManagementEvaluation(test);
         responseData.setTreat(treat);
         responseData.setDis(diseaseName);
         return responseData;
@@ -115,6 +115,9 @@ public class DiseaseCalculate {
                                 newMedicitionsList.add(newMedication);
                             }
                         }
+                        if(bigdrugsName.equals(subdrugsName)){
+                            subdrugsName = "";
+                        }
                         drugs.setBigdrugsName(bigdrugsName);
                         drugs.setSubdrugsName(subdrugsName);
                         drugs.setDrugsForbidden(drugsForbidden);

+ 76 - 0
graph-web/src/main/java/org/diagbot/graphWeb/work/FilterSortDiag.java

@@ -0,0 +1,76 @@
+package org.diagbot.graphWeb.work;
+
+import org.apache.commons.lang3.StringUtils;
+import org.diagbot.common.work.FeatureRate;
+import org.diagbot.common.work.ResponseData;
+import org.diagbot.graph.jdbc.Neo4jAPI;
+import org.diagbot.graph.util.CacheUtil;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.*;
+
+/**
+ * 诊断的过滤和排序
+ */
+public class FilterSortDiag {
+    Logger logger = LoggerFactory.getLogger(FilterSortDiag.class);
+
+    /**
+     * 过滤诊断
+     */
+    public List<FeatureRate> filterDiag(ResponseData graphResponseData, List<FeatureRate> graphFeatureRates) throws Exception {
+        List<String> removeDiagList = graphResponseData.getExcludeDiag();
+        //将需要排除的诊断从列表中删除
+        List<FeatureRate> updateFeatureRates = new ArrayList<>();
+        for (int j = 0; j < graphFeatureRates.size(); j++) {
+            if (removeDiagList.indexOf(graphFeatureRates.get(j).getFeatureName()) == -1) {
+                updateFeatureRates.add(graphFeatureRates.get(j));
+            }
+        }
+        return updateFeatureRates;
+    }
+
+    public List<FeatureRate> sortDiag(List<FeatureRate> updateFeatureRates){
+        Map<String, String> diagSortCache = CacheUtil.getDiagSortCache();
+        List<String> finalDiagList = new LinkedList<>();
+        List<String> neoDiagList = new LinkedList<>();
+        List<String> bigDataIDiagList = new LinkedList<>();
+        List<String> bigDataIIDiagList = new LinkedList<>();
+        List<FeatureRate> finalDiagFeature = new LinkedList<>();
+        if(updateFeatureRates != null || updateFeatureRates.size()>0){
+            for (FeatureRate feature:updateFeatureRates) {
+                String featureName = feature.getFeatureName();
+                String source = feature.getSource();
+                if("neo4j".equals(source)){
+                    neoDiagList.add(featureName);
+                }else {
+                    String s = diagSortCache.get(featureName);
+                    if(StringUtils.isNotEmpty(s)){
+                        if("Ⅰ".equals(s)){
+                            bigDataIDiagList.add(featureName);
+                        }else if("Ⅱ".equals(s)){
+                            bigDataIIDiagList.add(featureName);
+                        }
+                    }else {
+                        bigDataIDiagList.add(featureName);
+                    }
+                }
+            }
+        }
+        finalDiagList.addAll(neoDiagList);
+        finalDiagList.addAll(bigDataIDiagList);
+        finalDiagList.addAll(bigDataIIDiagList);
+        if(finalDiagList != null && finalDiagList.size()>0){
+            for (String diag:finalDiagList){
+                for (FeatureRate f:updateFeatureRates) {
+                    if(diag.equals(f.getFeatureName())){
+                        finalDiagFeature.add(f);
+                        break;
+                    }
+                }
+            }
+        }
+        return finalDiagFeature;
+    }
+}

+ 79 - 10
graph-web/src/main/java/org/diagbot/graphWeb/work/GraphCalculate.java

@@ -25,6 +25,7 @@ import org.slf4j.LoggerFactory;
 
 public class GraphCalculate {
     Logger logger = LoggerFactory.getLogger(GraphCalculate.class);
+    private static Neo4jAPI neo4jAPI ;
 
     /**
      * 返回诊断和治疗
@@ -35,6 +36,10 @@ public class GraphCalculate {
      * @throws Exception
      */
     public ResponseData calculate(HttpServletRequest request, SearchData searchData) throws Exception {
+
+        long starttime = System.currentTimeMillis();
+        System.out.println("Start at: " + starttime);
+
         ResponseData responseData = new ResponseData();
 //        ParamsDataProxy paramsDataProxy = new ParamsDataProxy();
 //        paramsDataProxy.createSearchData(request, searchData);
@@ -42,8 +47,7 @@ public class GraphCalculate {
         int age = searchData.getAge();
         String sex = searchData.getSex();
         logger.info("前端传来的年龄为 :"+age+" 前端传来的性别为 :"+sex);
-        //获取缓存
-        Map<String, String> lexionCache = CacheUtil.getLexionCache();
+
         Map<String, Map<String, String>> sexAgeCache = CacheUtil.getSexAgeCache();
         Map<String, Map<String, String>> inputs = searchData.getGraphInputs();
         Set<String> ss = new HashSet<>();
@@ -58,19 +62,28 @@ public class GraphCalculate {
             }
         }
         logger.info("从分词系统接收到的词 :" + ss);
-        String[] featureTypes = searchData.getFeatureType().split(",");
-        List<String> featureTypeList = Arrays.asList(featureTypes);
+        System.out.println("Participle takes: " + (System.currentTimeMillis()-starttime)/1000d + 's');
+
+        List<String> featureTypeList = Arrays.asList(searchData.getFeatureTypes());
         logger.info("featureTypeList : " + featureTypeList);
         inputList.addAll(ss);
-        Neo4jAPI neo4jAPI = new Neo4jAPI(DriverManager.newDrive());
+        if(neo4jAPI == null){
+            neo4jAPI = new Neo4jAPI(DriverManager.newDrive());
+        }
         logger.info("图谱开始推送诊断!!!!!!!!!!!");
         String webDiag = searchData.getDiag();
         logger.info("页面诊断为 :"+webDiag);
         //计算诊断
         Map<String, Map<String,String>> condition =null;
+        Map<String, Map<String, String>> excludelist = null;
         if(featureTypeList.contains("2")){
             condition = neo4jAPI.getNewCondition((String[]) inputList.toArray(new String[inputList.size()]),webDiag );
+
+            // 查找需要排除的诊断
+            excludelist = neo4jAPI.getExcludeDiag(inputList);
+            responseData.setExcludeDiag(Arrays.asList(excludelist.keySet().stream().toArray(String[]::new)));
         }
+
         List<FeatureRate> featureRates = new ArrayList<>();
         if(condition != null){
             for (Map.Entry<String, Map<String,String>> d : condition.entrySet()) {
@@ -85,11 +98,11 @@ public class GraphCalculate {
                         if(min_age <age && age<=max_age){
                             FeatureRate featureRate = new FeatureRate();
                             featureRate.setFeatureName(dis);
-                            featureRate.setExtraProperty("");
                             Map<String, String> value = d.getValue();
                             String s = JSON.toJSONString(value);
                             featureRate.setDesc(s);
-                            featureRate.setRate("neo4j");
+//                            featureRate.setRate("neo4j");
+                            featureRate.setSource("neo4j");
                             featureRates.add(featureRate);
                         }
 
@@ -138,22 +151,78 @@ public class GraphCalculate {
                 responseData.setManagementEvaluation(mangementEvaluation1);
             }
         }
-
+        String pacsOrder = searchData.getPacsOrder();
         //指标推送
         if (featureTypeList.contains("22") ) {
+            List<MedicalIndication> pacsMi = getPacsMi(pacsOrder, inputList,webDiag);
             //查找指标
             Set<String> indSet = neo4jAPI.getInd((String[]) inputList.toArray(new String[inputList.size()]));
             logger.info("featureTypeList 包含22,走指标推送!!!,图谱推出的指标为:" + indSet);
-            List<MedicalIndication> idn = neo4jAPI.getIdn(indSet, age, sex);
-            responseData.setMedicalIndications(idn);
+            if(indSet.contains("肾功能不全")){
+                List<MedicalIndication> idn = neo4jAPI.getIdn(indSet, age, sex);
+                pacsMi.addAll(idn);
+                responseData.setMedicalIndications(pacsMi);
+            }
+            responseData.setMedicalIndications(pacsMi);
 
         }
+
         //诊断推送
         responseData.setDis(featureRates);
         responseData.setInputs(searchData.getInputs());
+
+        System.out.println("Total takes: " + (System.currentTimeMillis()-starttime)/1000d + 's');
         return responseData;
     }
+    public List<MedicalIndication> getPacsMi(String pacsOrder,List<String> inputList,String webDiag){
+        if(StringUtils.isNotEmpty(webDiag)){
+            String[] webDiagsplits = webDiag.split(",|,|、|;|:|;");
+            for (String wd:webDiagsplits
+                 ) {
+                inputList.add(wd);
+            }
+        }
+
+        List<MedicalIndication> pacsMi = new ArrayList<>();
+        Map<String, String> newInd = neo4jAPI.getNewInd((String[]) inputList.toArray(new String[inputList.size()]));
+        if(StringUtils.isNotEmpty(pacsOrder)){
+            String[] pacsOrders = pacsOrder.split(",|,");
+            for (String pacs:pacsOrders) {
+                if(newInd.containsKey(pacs)){
+                    String causes = newInd.get(pacs);
+                    MedicalIndication m = new MedicalIndication();
+                    List<MedicalIndicationDetail> mds = new ArrayList<>();
+                    MedicalIndicationDetail medicalIndicationDetail = new MedicalIndicationDetail();
+                    medicalIndicationDetail.setType(4);
+                    JSONObject jsonObject = new JSONObject();
+                    jsonObject.put("name", causes);
+                    jsonObject.put("controlType",2);
+                    medicalIndicationDetail.setContent(jsonObject);
+                    mds.add(medicalIndicationDetail);
+                    m.setName("不建议做:"+pacs);
+                    m.setDetails(mds);
+                    pacsMi.add(m);
+                }
+            }
+        }
+        return pacsMi;
+    }
+//    诊断过滤
+    public void filterDis(List<FeatureRate> graphFeatureRates,String sex,Integer age) throws Exception {
+        if(neo4jAPI == null){
+            neo4jAPI = new Neo4jAPI(DriverManager.newDrive());
+        }
+        List<String> disList = new ArrayList<>();
+        if(graphFeatureRates != null && graphFeatureRates.size()>0){
+            for (FeatureRate f:graphFeatureRates) {
+                disList.add("\""+f.getFeatureName()+"\"");
+            }
+        }
+//        第一步先过滤性别和年龄
+        Set<String> filterSexAgeList = neo4jAPI.filterDisFromSexAge(disList,sex,age);
+
 
+    }
     /**
      * 返回LIS,PACS
      *

+ 13 - 1
graph-web/src/main/java/org/diagbot/graphWeb/work/LisPacsCalculate.java

@@ -8,6 +8,8 @@ import org.diagbot.pub.utils.PropertiesUtil;
 import org.diagbot.pub.utils.http.HttpApi;
 
 import javax.servlet.http.HttpServletRequest;
+import java.util.ArrayList;
+import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -24,7 +26,17 @@ public class LisPacsCalculate {
         Map data = (Map<String, Map>)lisPacsResponse.getData();
         responseData.setLabs((List)data.get("labs"));
         responseData.setPacs((List)data.get("pacs"));
-
+        List<FeatureRate> vitalFeature = new ArrayList<>();
+        List<LinkedHashMap> vitals =(List) data.get("vitals");
+        if(vitals != null){
+            for (LinkedHashMap v:vitals) {
+                String featureName = v.get("featureName").toString();
+                FeatureRate featureRate = new FeatureRate();
+                featureRate.setFeatureName(featureName);
+                vitalFeature.add(featureRate);
+            }
+        }
+        responseData.setVitals(vitalFeature);
         return responseData;
     }
 }

+ 19 - 19
graph-web/src/main/resources/application.yml

@@ -11,25 +11,25 @@ spring:
       force: true
       charset: UTF-8
       enabled: true
-#  datasource:       # mybatis 配置,使用druid数据源
-#    url: jdbc:mysql://192.168.2.235:3306/graph-web?useUnicode=true&characterEncoding=UTF-8
-#    username: root
-#    password: diagbot@20180822
-#    type: com.alibaba.druid.pool.DruidDataSource
-#    driver-class-name: com.mysql.jdbc.Driver
-#    filters: stat
-#    maxActive: 20
-#    initialSize: 1
-#    maxWait: 60000
-#    minIdle: 1
-#    timeBetweenEvictionRunsMillis: 60000
-#    minEvictableIdleTimeMillis: 300000
-#    validationQuery: select 'x'
-#    testWhileIdle: true
-#    testOnBorrow: false
-#    testOnReturn: false
-#    poolPreparedStatements: true
-#    maxOpenPreparedStatements: 20
+  datasource:       # mybatis 配置,使用druid数据源
+    url: jdbc:mysql://1.1.1.1:3306/graph-web?useUnicode=true&characterEncoding=UTF-8
+    username: root
+    password: diagbot@20180822
+    type: com.alibaba.druid.pool.DruidDataSource
+    driver-class-name: com.mysql.jdbc.Driver
+    filters: stat
+    maxActive: 20
+    initialSize: 1
+    maxWait: 60000
+    minIdle: 1
+    timeBetweenEvictionRunsMillis: 60000
+    minEvictableIdleTimeMillis: 300000
+    validationQuery: select 'x'
+    testWhileIdle: true
+    testOnBorrow: false
+    testOnReturn: false
+    poolPreparedStatements: true
+    maxOpenPreparedStatements: 20
 
 logging:          # 日志
   level.root: info

+ 1 - 1
graph/src/main/java/org/diagbot/graph/jdbc/DriverManager.java

@@ -21,7 +21,7 @@ public class DriverManager {
     public static Driver newDrive() throws Exception {
         //            driver = GraphDatabase.driver("bolt://192.168.3.112:7687", AuthTokens.basic("neo4j", "123456"),
         if( driver == null){
-            driver = GraphDatabase.driver(propertiesUtil.getProperty("bolt232.uri"), AuthTokens.basic(propertiesUtil.getProperty("bolt232.user"), propertiesUtil.getProperty("bolt232.passwd")),
+            driver = GraphDatabase.driver(propertiesUtil.getProperty("bolt.uri"), AuthTokens.basic(propertiesUtil.getProperty("bolt.user"), propertiesUtil.getProperty("bolt.passwd")),
                     Config.build().withMaxConnectionLifetime(ConnLifeTime, TimeUnit.MINUTES)
                             .withMaxTransactionRetryTime(TransRetryTime, TimeUnit.SECONDS)
                             .withMaxConnectionPoolSize(ConnPoolSize)

+ 276 - 24
graph/src/main/java/org/diagbot/graph/jdbc/Neo4jAPI.java

@@ -9,6 +9,7 @@ import org.assertj.core.util.Lists;
 import org.diagbot.common.javabean.*;
 import org.diagbot.common.work.*;
 import org.diagbot.pub.utils.PropertiesUtil;
+import org.neo4j.driver.internal.value.NodeValue;
 import org.neo4j.driver.v1.*;
 import org.neo4j.driver.v1.types.Node;
 import org.neo4j.driver.v1.types.Path;
@@ -793,6 +794,8 @@ public class Neo4jAPI {
      */
     public Map<String, Map<String, String>> getNewCondition(String[] keys, String webDiag) {
         Map<String, Map<String, String>> diseaseCondition = new LinkedHashMap<>();
+        Map<String, Map<String, String>> diseaseCondition1 = new LinkedHashMap<>(16, 0.75f, true);
+        Map<String,Map<String,String>> neoPushMap = new HashMap<>();
         List<String> newList = new ArrayList<>();
         List<String> fildList = new ArrayList<>();
         List<String> startList = new ArrayList<>();
@@ -833,6 +836,7 @@ public class Neo4jAPI {
 
                 }
             }
+            String que="";
             //第三步查找确诊
             query = propertiesUtil.getProperty("searchDis").replace("startList", startList.toString());
             logger.info("查询确诊的语句 \n" + query);
@@ -841,17 +845,111 @@ public class Neo4jAPI {
                 Record record = result.next();
                 String quezhenName = record.get("name").toString().replace("\"", "");
                 String conditionType = record.get("relationType").toString().replace("\"", "");
-                if ("确诊".equals(conditionType)) {
-                    quezhen.add(quezhenName);
-                } else if ("拟诊".equals(conditionType)) {
-                    quezhen.add(quezhenName);
+                /*if("拟诊".equals(conditionType) || "确诊".equals(conditionType)){
+                    que = "确诊";
+                }else {
+                    que = conditionType;
+                }*/
+                que = conditionType;
+                Map<String, String> queMap = neoPushMap.get(quezhenName);
+                if(queMap != null && queMap.size()>0){
+                    if(queMap.keySet().contains("拟诊") && "确诊".equals(que) ){
+                        queMap.remove("拟诊");
+                        queMap.put("确诊","");
+                        neoPushMap.put(quezhenName,queMap);
+                    }else if(que.equals("警惕")){
+                        queMap.put("警惕","");
+                        neoPushMap.put(quezhenName,queMap);
+                    } else if(que.equals("拟诊")){
+                        queMap.put("拟诊","");
+                        neoPushMap.put(quezhenName,queMap);
+                    }
+                }else {
+                    Map<String,String> newMap = new HashMap<>();
+                    newMap.put(que,"");
+                    neoPushMap.put(quezhenName,newMap);
+                }
+               /* if(queMap != null){
+                    queMap.put(que, "");
+                    neoPushMap.put(quezhenName,queMap);
+                }else {
+                    Map<String,String> newMap = new HashMap<>();
+                    newMap.put(que,"");
+                    neoPushMap.put(quezhenName,newMap);
+                }*/
+            }
+            Map<String,Map<String,String>> queHighMap = new HashMap<>();
+            Map<String,Map<String,String>> highMap = new HashMap<>();
+            Map<String,Map<String,String>> quezhenMap = new HashMap<>();
+            for (Map.Entry<String,Map<String,String>> l:neoPushMap.entrySet()) {
+                String dis = l.getKey();
+                Set<String> typeSet = l.getValue().keySet();
+                Map<String,String> con = new HashMap<>();
+                /*if(typeSet.size() == 2 && typeSet.contains("确诊") && typeSet.contains("警惕")){
+                    queHighMap.put(dis,new HashMap<>());
+                }
+                if(typeSet.size() == 1 && typeSet.contains("确诊")){
+                    quezhenMap.put(dis,new HashMap<>());
+                }
+                if(typeSet.size() == 1 && typeSet.contains("警惕")){
+                    highMap.put(dis,new HashMap<>());
+                }*/
+                if(typeSet.size() == 2){
+                    for (String type:typeSet) {
+                        con.put(type,"");
+                    }
+                    queHighMap.put(dis,con);
+                }
+                if(typeSet.size() == 1 && (typeSet.contains("确诊") || typeSet.contains("拟诊"))){
+                    for (String type:typeSet) {
+                        con.put(type,"");
+                    }
+                    quezhenMap.put(dis,con);
+                }
+                if(typeSet.size() == 1 && typeSet.contains("警惕")){
+                    for (String type:typeSet) {
+                        con.put(type,"");
+                    }
+                    highMap.put(dis,con);
                 }
             }
-            for (String qu : quezhen) {
-                Map<String, String> dis_res = new HashMap<>();
-                dis_res.put("确诊", "");
-                diseaseCondition.put(qu, dis_res);
-                logger.info("图谱推出的诊断为: " + qu);
+            if(queHighMap != null && queHighMap.size()>0){
+                Set<String> queHighSet = queHighMap.keySet();
+                for (String dis:queHighSet) {
+                    Map<String,String> k = new HashMap<>();
+                    k.put("确诊","");
+                    k.put("警惕","");
+//                    diseaseCondition.put(dis,k);
+                    diseaseCondition.put(dis,queHighMap.get(dis));
+                }
+                if(quezhenMap != null && quezhenMap.size()>0){
+                    Set<String> queDis = quezhenMap.keySet();
+                    for (String dis:queDis) {
+                        Map<String,String> k = new HashMap<>();
+                        k.put("确诊","");
+//                        diseaseCondition.put(dis,k);
+                        diseaseCondition.put(dis,quezhenMap.get(dis));
+                    }
+                }
+            }else {
+                if(quezhenMap != null && quezhenMap.size()>0){
+                    Set<String> queDis = quezhenMap.keySet();
+                    for (String dis:queDis) {
+                        Map<String,String> k = new HashMap<>();
+                        k.put("确诊","");
+//                        diseaseCondition.put(dis,k);
+                        diseaseCondition.put(dis,quezhenMap.get(dis));
+                    }
+                }
+                if(highMap != null && highMap.size()>0){
+                    Set<String> highSet = highMap.keySet();
+                    for (String dis:highSet) {
+                        Map<String,String> k = new HashMap<>();
+                        k.put("警惕","");
+//                        diseaseCondition.put(dis,k);
+                        diseaseCondition.put(dis,highMap.get(dis));
+                    }
+                }
             }
             Set<String> queSets = diseaseCondition.keySet();
             if (webDiag != null && webDiag.trim() != "") {
@@ -878,29 +976,56 @@ public class Neo4jAPI {
                     }
                 }
             }
-            //判断急诊
-            Set<String> disSet = diseaseCondition.keySet();
             List<String> newDis = new ArrayList<>();
-            if(disSet.size()>0){
-                for (String dis:disSet) {
+            //判断急诊
+            for (Map.Entry<String, Map<String, String>> fs:diseaseCondition.entrySet()) {
+                String dis = fs.getKey();
+                Set<String> leiSet = fs.getValue().keySet();
+                if(leiSet.contains("确诊") || leiSet.contains("拟诊")){
                     newDis.add("\""+dis+"\"");
                 }
             }
             query =propertiesUtil.getProperty("searchEmergency").replace("disList",newDis.toString());
             logger.info("判断图谱推出的诊断中是否有急诊,判断语句为:\n"+query);
             result = session.run(query);
-            while (result.hasNext()) {
+                while (result.hasNext()) {
                 Record record = result.next();
                 String emDis = record.get("emDis").toString();
-                Map<String, String> stringStringMap = diseaseCondition.get(emDis.replace("\"", ""));
-                stringStringMap.put("急诊", "");
-                diseaseCondition.put(emDis.replace("\"", ""), stringStringMap);
+                int em = record.get("em").asInt();//急诊
+                Map<String, String> stringStringMap = neoPushMap.get(emDis.replace("\"", ""));
+                if(em == 1){
+                    stringStringMap.put("急诊", "");
+                }
+                    diseaseCondition.put(emDis.replace("\"", ""), stringStringMap);
+            }
+
+            Set<String> ll = new LinkedHashSet<>();
+            Set<String> kk = new LinkedHashSet<>();
+            for (Map.Entry<String,Map<String,String>> l:diseaseCondition.entrySet()) {
+                if(l.getValue().keySet().contains("确诊")){
+                    ll.add(l.getKey());
+                }else {
+                    kk.add(l.getKey());
+                }
+            }
+            ll.addAll(kk);
+            for (String dis:ll) {
+                Map<String, String> stringStringMap = diseaseCondition.get(dis);
+                for (Map.Entry<String,String>sd:stringStringMap.entrySet()) {
+                    if("拟诊".equals(sd.getKey())){
+                        stringStringMap.remove(sd.getKey());
+                        stringStringMap.put("确诊","");
+                        break;
+                    }
+                }
+
+                diseaseCondition1.put(dis,stringStringMap);
             }
         } catch (Exception e) {
             e.printStackTrace();
         } finally {
             CloseSession(session);
-            return diseaseCondition;
+            return diseaseCondition1;
         }
     }
 
@@ -1021,7 +1146,54 @@ public class Neo4jAPI {
         }
     }
 
-
+    /**
+     * 指标推送,检查预警
+     */
+    public Map<String,String> getNewInd(String[] keys) {
+        //查找指标推送
+        Map<String ,String> indMap = new HashMap<>();
+        List<String> fildList = new ArrayList<>();
+        for (String fild : keys) {
+            fildList.add("\"" + fild.trim() + "\"");
+        }
+        logger.info("根据 " + fildList + " 这些词推送指标!!!");
+        Session session = null;
+        StatementResult result = null;
+        String query = "";
+        try {
+            session = driver.session(AccessMode.WRITE);
+            //第一步查询输入的词所在number
+            query = "match(t:Temporary)-[r:属于]->(n:NewCondition)-[r1:诊断依据]->(n1:NewCondition)-[r2:拟诊]->(n2:NewIndicators) \n" +
+                    "where t.name in "+fildList+" return n2.name as name";
+            System.out.println(query);
+            result = session.run(query);
+            while (result.hasNext()) {
+                Record record = result.next();
+                String newIndName = record.get("name").toString();
+                StringBuffer s = new StringBuffer();
+                query = "match(n2:NewIndicators)-[r:表现]->(t:Temporary) where n2.name="+newIndName+" return collect(t.name) as names";
+                StatementResult sr = session.run(query);
+                while (sr.hasNext()){
+                    Record next = sr.next();
+                    List<Object> names = next.get("names").asList();
+                    if(names.size()>0){
+                        for (Object o:names) {
+
+                            if(fildList.indexOf("\""+o.toString()+"\"") >= 0){
+                                s.append(o.toString().replace("\"", ""));
+                            }
+                        }
+                    }
+                }
+                indMap.put(newIndName.replace("\"", ""),s.toString());
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        } finally {
+            CloseSession(session);
+            return indMap;
+        }
+    }
     /**
      * 多疾病下治疗方案
      *
@@ -1353,7 +1525,11 @@ public class Neo4jAPI {
                             //                            Map<String, String> bigSubDrugs = new DrugsPattern().bigSubDrugs(drugsName);
                             Map<String, String> bigSubDrugs = drugsPattern.bigSubDrugs(drugsName);
                             drugs.setBigdrugsName(bigSubDrugs.get("big"));
-                            drugs.setSubdrugsName(bigSubDrugs.get("sub"));
+                            drugs.setSubdrugsName("");
+                            // 如果大类和小类相等,则不推小类
+                            if (!bigSubDrugs.get("sub").equals(drugs.getBigdrugsName())) {
+                                drugs.setSubdrugsName(bigSubDrugs.get("sub"));
+                            }
                             LinkedList<Medicition> medicitionsList = new LinkedList<>();
                             LinkedHashMap<String, String> meditionRate = w.getValue();
                             if ("忌用".equals(drugsUseMap.get(bigSubDrugs.get("big"))) || "忌用".equals(drugsUseMap.get(bigSubDrugs.get("sub")))) {
@@ -1531,6 +1707,11 @@ public class Neo4jAPI {
                         ageJsonObject.put("uint", uint.replace("\"", ""));
                         if ("年龄".equals(item.replace("\"", ""))) {
                             ageJsonObject.put("value", age);
+                            ageJsonObject.put("isShow",0);
+                        }else if("性别".equals(item.replace("\"", ""))){
+                            ageJsonObject.put("isShow",0);
+                        }else {
+                            ageJsonObject.put("isShow",1);
                         }
                         if (!"0".equals(controlType)) {
                             ageJsonObject.put("details", details.replace("\"", ""));
@@ -1550,9 +1731,9 @@ public class Neo4jAPI {
                                 manJson.put("detailName", name.replace("\"", ""));
                                 manJson.put("value", value1.replace("\"", ""));
                                 manJson.put("state", state);
-                                if ("男".equals(name.replace("\"", "")) && "M".equals(sex)) {
+                                if ("男".equals(name.replace("\"", "")) && "1".equals(sex)) {
                                     manJson.put("state", 1);
-                                } else if ("女".equals(name.replace("\"", "")) && "F".equals(sex)) {
+                                } else if ("女".equals(name.replace("\"", "")) && "2".equals(sex)) {
                                     manJson.put("state", 1);
                                 }
                                 sexList.add(manJson);
@@ -2557,7 +2738,7 @@ public class Neo4jAPI {
 
         } catch (Exception ex) {
             ex.printStackTrace();
-            System.out.println("返回带得分需要计算的量表时出了问题!---->getScaleCalc");
+            logger.error("返回带得分需要计算的量表出了问题!---->getScaleCalc2");
         } finally {
             CloseSession(session);
             return scaleStructure;
@@ -2616,6 +2797,10 @@ public class Neo4jAPI {
                     scaleStructure.put("scaleName", scaleName);
                 }
 
+                if (index.contains("-")) {
+                    index = index.split("-")[0];
+                }
+
                 JSONObject detail = new JSONObject();
                 detail.put("detailName", feature);
                 detail.put("state", 0);
@@ -2649,10 +2834,77 @@ public class Neo4jAPI {
             }
         } catch (Exception ex) {
             ex.printStackTrace();
-            System.out.println("返回不带得分不需要计算的量表出了问题!---->getScaleNoCalc");
+            logger.error("返回不带得分不需要计算的量表出了问题!---->getScaleNoCalc");
         } finally {
             CloseSession(session);
             return scaleStructure;
         }
     }
+
+    /**
+     * 查询需要排除的疾病
+     * @param info
+     * @return
+     */
+    public Map<String, Map<String, String>> getExcludeDiag(List<String> info) {
+        Session session = null;
+        String infostr = Pattern.compile("([,*])").matcher(info.toString()).replaceAll("\"$0\"");
+        infostr = infostr.replace("[", "[\"");
+        infostr = infostr.replace("]", "\"]");
+        infostr = infostr.replaceAll(" ", "");
+
+        Map<String, Map<String, String>> diaglist = new HashMap<>();
+        try{
+            session = driver.session(AccessMode.READ);
+            String query = "unwind " + infostr + " as lis " +
+                    "match (ex)-[q:排除依据]-(c)-[r:排除]->(d:Disease) where ex.name = lis return d";
+            System.out.println(query);
+            StatementResult dlist = session.run(query);
+
+            while (dlist.hasNext()) {
+                Record rec = dlist.next();
+                Node nd = rec.get("d").asNode();
+                String name = nd.get("name").toString().replaceAll("\"","");
+                diaglist.put(name, new HashMap<>());
+            }
+        } catch (Exception ex) {
+            ex.printStackTrace();
+        } finally {
+            CloseSession(session);
+            return diaglist;
+        }
+    }
+    /**
+     * 根据年龄和性别排除的疾病
+     */
+    public Set<String> filterDisFromSexAge(List<String> dis,String sexIn,Integer ageIn){
+        Set<String> filterDisList = new HashSet<>();
+        Session session = null;
+        try {
+            session = driver.session(AccessMode.READ);
+            String query = "match(d:Disease) where d.name in "+dis+" return d.name as dis,d.sex as sex,d.minAge as minAge,d.maxAge as maxAge";
+            StatementResult dlist = session.run(query);
+            while (dlist.hasNext()) {
+                Record rec = dlist.next();
+                String disName = rec.get("dis").toString().replace("\"", "");
+                String sex = rec.get("sex").toString();
+                int minAge = rec.get("minAge").asInt();
+                int maxAge = rec.get("maxAge").asInt();
+                if("1".equals(sex) || "2".equals(sex)){
+                    if(!sexIn.equals(sex)){
+                        filterDisList.add(disName);
+                    }
+                }
+                if(ageIn < minAge || ageIn >maxAge){
+                    filterDisList.add(disName);
+                }
+            }
+        } catch (Exception ex) {
+            ex.printStackTrace();
+        } finally {
+            CloseSession(session);
+            return filterDisList;
+        }
+
+    }
 }

+ 154 - 25
graph/src/main/java/org/diagbot/graph/util/CacheUtil.java

@@ -1,5 +1,6 @@
 package org.diagbot.graph.util;
 
+import org.apache.commons.lang3.StringUtils;
 import org.diagbot.nlp.participle.cfg.Configuration;
 import org.diagbot.nlp.participle.cfg.DefaultConfig;
 
@@ -8,40 +9,168 @@ import java.util.List;
 import java.util.Map;
 
 public class CacheUtil {
-    public static Map<String,String> lexionMap=null;
     public static Map<String,Map<String,String>> sexAgeMap=null;
-    public static Map<String,String> getLexionCache(){
-        String path = "lexicon.dict";
+    public static Map<String,String> vitalMap=null;
+    public static Map<String,String> disgSortMap=null;
+    public static Map<String,String> diagClassifyMap = null;
+    public static Map<String,Integer> diagClassifyJiMap = null;
+    //诊断科室衍射
+    public static Map<String, String> doc_result_mapping_diag_map = null;
+
+    //疾病科室,获取缓存
+    public static Map<String,String> getDiagDepartCache(){
+        if (doc_result_mapping_diag_map == null) {
+            createDiagDepartCache();
+        }
+        return doc_result_mapping_diag_map;
+    }
+
+    public static Map<String,String> createDiagDepartCache(){
+        Configuration configuration = new DefaultConfig();
+        doc_result_mapping_diag_map = new HashMap<>();
+        List<String> contentList = configuration.readFileContents("graph_diag_2_dept.dict");
+        for (String s:contentList) {
+            String[] splits = s.split("\\|");
+            doc_result_mapping_diag_map.put(splits[0],splits[1]);
+        }
+        return doc_result_mapping_diag_map;
+    }
+
+    //疾病分级解析,获取缓存
+    public static Map<String,Integer> getDiagClassifyJiCache(){
+        if (diagClassifyJiMap == null) {
+            createDiagClassifyJiCache();
+        }
+        return diagClassifyJiMap;
+    }
+
+    public static Map<String,Integer> createDiagClassifyJiCache(){
         Configuration configuration = new DefaultConfig();
-        if(lexionMap == null){
-            lexionMap = new HashMap<>();
-            List<String> contentList = configuration.readFileContents(path);
-            for (String s:contentList) {
-                String[] splits = s.split("\\|");
-                lexionMap.put(splits[0],splits[1]);
+        diagClassifyJiMap = new HashMap<>();
+        List<String> contentList = configuration.readFileContents("graph_diag_normalize.dict");
+        String diagName =null,bigdiagName=null;
+        String[] diagSort =null;String[] split = null;
+        for (String s:contentList) {
+            String[] splits = s.split("\\|");
+            if (splits.length >= 2) {
+                diagName = splits[0].trim();//疾病本体
+                bigdiagName = splits[1].trim();//疾病大类
+                split = bigdiagName.split("\\、");
+                for (String dis:split) {
+                    diagClassifyJiMap.put(dis, 2);
+                }
+                diagClassifyJiMap.put(diagName,1);
+                if (splits.length == 3) {
+                    diagSort = splits[2].split("\\、");
+                    for (String dis : diagSort) {
+                        if (StringUtils.isNotEmpty(dis.trim())) {
+                            diagClassifyJiMap.put(dis.trim(), 3);
+                        }
+                    }
+                }
             }
+        }
+        return diagClassifyJiMap;
+    }
 
+    //疾病归一解析,获取缓存
+    public static Map<String,String> getDiagClassifyCache(){
+        if (diagClassifyMap == null) {
+            createDiagClassifyCache();
         }
-        return lexionMap;
+        return diagClassifyMap;
     }
-    public static Map<String,Map<String,String>> getSexAgeCache(){
-        String path = "sexAge.dict";
+
+    public static Map<String,String> createDiagClassifyCache(){
         Configuration configuration = new DefaultConfig();
-        if(sexAgeMap == null){
-            sexAgeMap = new HashMap<>();
-            List<String> contentList = configuration.readFileContents(path);
-            for (String s:contentList) {
-                Map<String,String> contentMap = new HashMap<>();
-                String[] splits = s.split("\\|");
-                String sexTyep = splits[1];
-                String min_age = splits[2];
-                String max_age = splits[3];
-                contentMap.put("sexType",sexTyep);
-                contentMap.put("min_age",min_age);
-                contentMap.put("max_age",max_age);
-                sexAgeMap.put(splits[0],contentMap);
+        diagClassifyMap = new HashMap<>();
+        List<String> contentList = configuration.readFileContents("graph_diag_normalize.dict");
+        String diagName =null,bigdiagName=null;
+        String[] diagSort =null;String[] split =null;
+        for (String s:contentList) {
+            String[] splits = s.split("\\|");
+            if (splits.length >= 2) {
+                diagName = splits[0].trim();//疾病本体
+                bigdiagName = splits[1].trim();//疾病大类
+                split = bigdiagName.split("\\、");
+                for (String dis:split
+                        ) {
+                    diagClassifyMap.put(dis, diagName);
+                }
+
+                if (splits.length == 3) {
+                    diagSort = splits[2].split("\\、");
+                    for (String dis : diagSort) {
+                        if (StringUtils.isNotEmpty(dis.trim())) {
+                            diagClassifyMap.put(dis.trim(), bigdiagName);
+                        }
+                    }
+                }
             }
         }
+        return diagClassifyMap;
+    }
+
+    public static Map<String,String> getDiagSortCache(){
+        if(disgSortMap == null){
+            createDiagSortCache();
+        }
+        return disgSortMap;
+    }
+    public static Map<String,String> createDiagSortCache(){
+        disgSortMap = new HashMap<>();
+
+        Configuration configuration = new DefaultConfig();
+        List<String> contentList = configuration.readFileContents("graph_diag_classify.dict");
+        for (String s:contentList) {
+            String[] splits = s.split("\\|");
+            String diagName = splits[0];
+            String diagType = splits[1];
+            disgSortMap.put(diagName,diagType);
+        }
+        return disgSortMap;
+    }
+
+    public static Map<String,Map<String,String>> getSexAgeCache(){
+        if (sexAgeMap == null) {
+            createSexAgeCache();
+        }
         return sexAgeMap;
     }
+
+    public static Map<String,Map<String,String>> createSexAgeCache(){
+        Configuration configuration = new DefaultConfig();
+        sexAgeMap = new HashMap<>();
+        List<String> contentList = configuration.readFileContents("graph_sex_age_filter.dict");
+        for (String s:contentList) {
+            Map<String,String> contentMap = new HashMap<>();
+            String[] splits = s.split("\\|");
+            String sexTyep = splits[1];
+            String min_age = splits[2];
+            String max_age = splits[3];
+            contentMap.put("sexType",sexTyep);
+            contentMap.put("min_age",min_age);
+            contentMap.put("max_age",max_age);
+            sexAgeMap.put(splits[0],contentMap);
+        }
+        return sexAgeMap;
+    }
+
+    public static Map<String,String> getVitalCache(){
+        if (vitalMap == null) {
+            createVitalCache();
+        }
+        return vitalMap;
+    }
+
+    public static Map<String,String> createVitalCache(){
+        Configuration configuration = new DefaultConfig();
+        vitalMap = new HashMap<>();
+        List<String> contentList = configuration.readFileContents("graph_vital_convert.dict");
+        for (String s:contentList) {
+            String[] splits = s.split("\\|");
+            vitalMap.put(splits[0],splits[1]);
+        }
+        return vitalMap;
+    }
 }

+ 4 - 8
graph/src/main/resources/bolt.properties

@@ -9,10 +9,6 @@ bolt.uri=bolt://192.1.3.116
 bolt.user=neo4j
 bolt.passwd=root
 
-#\u533B\u5B66\u672F\u8BED\u4F7F\u7528
-bolt232.uri=bolt://192.1.3.116
-bolt232.user=neo4j
-bolt232.passwd=root
 
 #\u6D4B\u8BD5\u4F7F\u7528
 bolt112.uri=bolt://192.1.3.116
@@ -71,7 +67,7 @@ with m.name as condition, count(distinct r) as sd,m.path as jundgement\n \
 where sd>=jundgement\n \
 return condition
 #\u67E5\u627E\u786E\u8BCA
-searchDis=match (n:Condition)-[r:\u786E\u8BCA|:\u62DF\u8BCA]->(m:Disease)\n \
+searchDis=match (n:Condition)-[r:\u786E\u8BCA|:\u62DF\u8BCA|:\u8B66\u60D5]->(m:Disease)\n \
 where n.name in startList\n \
 with distinct m,r\n \
 return m.name as name, labels(m)[0] as label,type(r) as relationType;
@@ -87,11 +83,11 @@ searchBigSubDrugs=match (n:Disease{name:diseaseName})-[r0:\u63A8\u8350]->(m:Drug
 #\u67E5\u627E\u9274\u522B\u8BCA\u65AD\u7684\u8BED\u53E5
 searchDifferentialDiagnose=match(d:Disease)-[r:\u9274\u522B\u8BCA\u65AD]->(h) where d.name='mainDis' return collect(h.name) as coll
 
-#\u5224\u65AD\u662F\u5426\u4E3A\u6025\u8BCA\u7684\u8BED\u53E5
-searchEmergency=match(d:Disease) where d.name in disList and d.emergency=1 return d.name as emDis
+#\u5224\u65AD\u662F\u5426\u4E3A\u6025\u8BCA,\u8B66\u60D5\u7684\u8BED\u53E5
+searchEmergency=match(d:Disease) where d.name in disList return d.name as emDis,d.emergency as em
 
 #\u67E5\u627E\u6307\u6807\u7684\u8BED\u53E5
-searchIndication=match (n:Condition)-[r:\u786E\u8BCA|:\u62DF\u8BCA]->(m:Indicators)\n \
+    searchIndication=match (n:Condition)-[r:\u786E\u8BCA|:\u62DF\u8BCA]->(m:Indicators)\n \
 where n.name in fildList\n \
 with distinct m,r\n \
 return m.name as name

+ 0 - 70
graph/src/main/resources/lexicon.dict

@@ -1,70 +0,0 @@
-s7W6RG6fbY4F7hCN+9GcDQ==
-BEwho/Vy3FcLGsZzyz/lrA==
-teL+mOFs+P5xK95yiefr1A==
-4WmmlIMFQw5dunQJNQOl9Mwy2IRdVfW7
-9n8MOrfpOzBse1YGr4PBqQ==
-bRdFLLf/QBQiAZd/xjyj2A==
-lSAF5F4PkDDgn5PMcGOHAQ==
-bI3YhExhf0ygnBv7GDMx4itzoMTPCpME
-9zvpXMKfsnfx3IKU2o+7zA==
-+BpdcftYCemAzuLCdJndHw==
-sqLl47cHFtetc3AdSoYwrQ==
-6BWOhrPv7J9Cj5vlDdVnBg==
-BXy7J2Qb4CXZhTO+q7f7Lf7jaz6wvHMH
-mrGmgHlOA2+2LlGVCW+2VQ==
-HkDJvzXre9AZ0B6jFd0rnw==
-BMjsBRH09HZlgTSR49CWoQ==
-K84K5InRTJH+1WlqU+tc90pgEZ36UZf7
-kJHwz4yDQvBKYBGd+lGX+w==
-+/iMWRrE/x++AlTuumOl8Q==
-yMIQPPgAnitefGaE90oS7A==
-DxBSa3FWWI0GI1/7VhWFVg==
-e5AUaAGRyItcJWT47mI/zw==
-TBEKZfNYdDAg4XtzH2iEsg==
-u0ELyb4t2lpWVlgi5Q4bKg==
-qHbaJZG3uf1NbYsDV8prZA==
-s5V0HutCSLYaBuBBF/Rq7rDyYRB1LPgT5opE3Fvtcpc=
-Iq7jb+VkzbVKYBGd+lGX+w==
-OsBp5KngCTRsQ1lgzfXoww==
-pg/hIoBF96D4FgUZuL7Odw==
-7vjnQx+bY41lsbwpSGyTBA==
-OqbB5fi11VfgcQlEe5DD+g==
-mmn7OCfRGCIEBLNEPwIttg==
-SRpf2O8GDiXbwAhKPF9MrZRs+QR/TraH
-lBMjruy+wjFKYBGd+lGX+w==
-ORpbdnw5IPSmtWtITrC/NQ==
-2soIQt/8ypDQGKRoU3BIkA==
-152PZYqH1ltlsbwpSGyTBA==
-cdavJOjogbpWVlgi5Q4bKg==
-LRN4dXCzoSUohhmaI9fLo2quUiUsJ2os/uGB4mDfi8Q=
-jb7cwm2aycBKYBGd+lGX+w==
-752lihMtImRtrXkjKvRwuQ==
-acfDmX94GIOMwEbR9wcFYg==
-QEGtWQkCHzxCj5vlDdVnBg==
-j6O2WShA+6xKYBGd+lGX+w==
-Om054uvU7T/J8AHLUkpbHg==
-cT0V76bKbStXYt7WbhcZXA==
-FbMgeI9IkO5LawQxODdEdpQbfNX9OvEj
-Qx1FtMXVFI1lf8WqY4kn6JQbfNX9OvEj
-4JmXbdcpagMbPUodBoCDFw==
-kjlisLDTfaNO2NL8TalLMg==
-dK/xyBvi7aP5XurM68XXvZQbfNX9OvEj
-WNOryxc9xnKTYO4WfhUMJ5Rs+QR/TraH
-JFdbafCC7S6fvvtXA3KqgQ==
-OefsKaBNTZj74WCSZlzDhQ47c03sgd0T
-qSj+i5YMSUDZKCVbszjsWSmuGyZkv2+0
-E4nTZm/cEARKYBGd+lGX+w==
-bBhhPMkI2shrAzg5abL/Xg==
-vC/g6hg25OE63hTezlzQHg==
-1P1mt9OJzQcORyCgk2k6ew==
-SdxW7VUIlOSW0Ig3/ZQrnQ==
-4AYbwy/G2ny/MOtJaBopwg==
-H8M+KMEP5AQh3ECueWip2w==
-TCyc2GYXyTOvZQhdm1P06w==
-2Sgj895/6q1KYBGd+lGX+w==
-YCDTg/uaEkbXe38IBCUIjQ==
-mFo8rO3m/XWvIrKw4P4pRg==
-ChZ5zGIydShKYBGd+lGX+w==
-eqlnQUtv63pKYBGd+lGX+w==
-4UDrddpEYJzRmL/ZWxBCEw==
-Q4Dnkx8QdKqTYO4WfhUMJ5Rs+QR/TraH

File diff suppressed because it is too large
+ 0 - 21296
graph/src/main/resources/sexAge.dict


+ 148 - 1
graph/src/test/java/org/diagbot/graph/CacheFile.java

@@ -6,12 +6,100 @@ import org.diagbot.pub.utils.security.EncrypDES;
 import java.io.FileWriter;
 import java.sql.Connection;
 import java.sql.ResultSet;
+import java.sql.SQLException;
 import java.sql.Statement;
+import java.util.*;
 
 public class CacheFile {
     public static void main(String[] args) {
         CacheFile cacheFile = new CacheFile();
-        cacheFile.sexAge();
+        cacheFile.diagClassifyMaping();
+
+    }
+    //疾病 -- 科室
+    public void diagDepartMaping(){
+        MysqlJdbc nlpJdbc = new MysqlJdbc("root", "diagbot@20180822", "jdbc:mysql://192.168.2.235:3306/med-s?useUnicode=true&characterEncoding=UTF-8");
+        Connection conn = nlpJdbc.connect();
+        Statement st = null;
+        ResultSet rs = null;
+        try {
+            EncrypDES encrypDES = new EncrypDES();//加密对象
+            String path = this.getClass().getClassLoader().getResource("").getPath();
+            path = path.substring(0, path.indexOf("target"));
+            String sql = "SELECT k1.lib_name diag_name, k2.lib_name dept_name FROM kl_concept_common kcc, kl_concept k1, kl_concept k2 " +
+                    "where kcc.concept_id = k1.id and kcc.dept_id = k2.id " +
+                    "and k1.lib_type = 18 and kcc.dept_id  is not null";
+            st = conn.createStatement();
+            rs = st.executeQuery(sql);
+            List<Map.Entry<String, String>> libaryList = rsToMap(rs, true);
+            FileWriter fw = new FileWriter(path + "src/main/resources/doc_result_mapping_diag.dict");
+            for (Map.Entry<String, String> entry : libaryList) {
+                fw.write(encrypDES.encrytor(entry.getKey() + "|" + entry.getValue()));
+                fw.write("\n");
+            }
+            fw.close();
+        } catch (Exception e) {
+            e.printStackTrace();
+        } finally {
+            nlpJdbc.close(rs, st, conn);
+        }
+    }
+    //疾病分类归一
+    public void diagClassifyMaping(){
+        MysqlJdbc nlpJdbc = new MysqlJdbc("root", "lantone", "jdbc:mysql://192.168.2.121:3306/med?useUnicode=true&characterEncoding=UTF-8");
+        Connection conn = nlpJdbc.connect();
+        Statement st = null;
+        ResultSet rs = null;
+        try {
+            EncrypDES encrypDES = new EncrypDES();//加密对象
+            String path = this.getClass().getClassLoader().getResource("").getPath();
+            path = path.substring(0, path.indexOf("target"));
+            String sql = "SELECT g.diag_name,g.diag_bigName_classify,g.diag_subName_classify FROM `doc_bigsub_classify_diag` g ";
+            st = conn.createStatement();
+            rs = st.executeQuery(sql);
+            FileWriter fw = new FileWriter(path + "src/main/resources/diagClassify.dict");
+            String  r1 ,r2,r3;
+            while (rs.next()) {
+                r1 = rs.getString(1);//本类名
+                r2 = rs.getString(2);//大类名
+                r3 = rs.getString(3);//小类名
+                fw.write(encrypDES.encrytor(r1+ "|" + r2+ "|" + r3));
+                fw.write("\n");
+            }
+            fw.close();
+        } catch (Exception e) {
+            e.printStackTrace();
+        } finally {
+            nlpJdbc.close(rs, st, conn);
+        }
+    }
+    //诊断大小类对应
+    public void diagSort(){
+        MysqlJdbc nlpJdbc = new MysqlJdbc("root", "diagbot@20180822", "jdbc:mysql://192.168.2.235:3306/med-s?useUnicode=true&characterEncoding=UTF-8");
+        Connection conn = nlpJdbc.connect();
+        Statement st = null;
+        ResultSet rs = null;
+        try {
+            EncrypDES encrypDES = new EncrypDES();//加密对象
+            String path = this.getClass().getClassLoader().getResource("").getPath();
+            path = path.substring(0, path.indexOf("target"));
+            String sql = "SELECT diag_name_big,diag_name_type from doc_result_sort_diag";
+            st = conn.createStatement();
+            rs = st.executeQuery(sql);
+            FileWriter fw = new FileWriter(path + "src/main/resources/diagSort.dict");
+            String  r2 ,r3;
+            while (rs.next()) {
+                r2 = rs.getString(1);//大类名
+                r3 = rs.getString(2);//小类名
+                fw.write(encrypDES.encrytor(r2+ "|" + r3));
+                fw.write("\n");
+            }
+            fw.close();
+        } catch (Exception e) {
+            e.printStackTrace();
+        } finally {
+            nlpJdbc.close(rs, st, conn);
+        }
     }
     //诊断和性别,年龄的对应
     public void sexAge(){
@@ -75,4 +163,63 @@ public class CacheFile {
             nlpJdbc.close(rs, st, conn);
         }
     }
+    //体征及体征结果
+    public void vitalMaping()  {
+        MysqlJdbc nlpJdbc = new MysqlJdbc("root", "diagbot@20180822", "jdbc:mysql://192.168.2.235:3306/med-s?useUnicode=true&characterEncoding=UTF-8");
+        Connection conn = nlpJdbc.connect();
+        Statement st = null;
+        ResultSet rs = null;
+        try {
+            EncrypDES encrypDES = new EncrypDES();//加密对象
+            String path = this.getClass().getClassLoader().getResource("").getPath();
+            path = path.substring(0, path.indexOf("target"));
+            String sql = "SELECT\n" +
+                    "\ti1.lib_name name1,\n" +
+                    "\ti2.lib_name name2 \n" +
+                    "FROM\n" +
+                    "\t`kl_relation` l \n" +
+                    "\tLEFT JOIN kl_concept i1 ON l.start_id = i1.id \n" +
+                    "\tLEFT JOIN kl_concept i2 ON l.end_id = i2.id \n" +
+                    "where l.relation_id=19 AND i1.lib_type=35 AND i2.lib_type=33";
+            st = conn.createStatement();
+            rs = st.executeQuery(sql);
+            FileWriter fw = new FileWriter(path + "src/main/resources/vital.dict");
+            String r1, r2;
+            while (rs.next()) {
+                r1 = rs.getString(1);//体征结果
+                r2 = rs.getString(2);//体征指标
+                fw.write(encrypDES.encrytor(r1 + "|" + r2));
+                fw.write("\n");
+            }
+            fw.close();
+        } catch (Exception e) {
+            e.printStackTrace();
+        } finally {
+            nlpJdbc.close(rs, st, conn);
+        }
+    }
+
+    private List<Map.Entry<String, String>> rsToMap(ResultSet rs, boolean isJoin) throws SQLException {
+        String r1 = "";
+        String r2 = "";
+        Map<String, String> libraryMap = new HashMap<>(10);
+        while (rs.next()) {
+            r1 = rs.getString(1);
+            r2 = rs.getString(2);
+            if (libraryMap.get(r1) == null) {
+                libraryMap.put(r1, r2);
+            } else if (isJoin && libraryMap.get(r1) != null) {
+                libraryMap.put(r1, libraryMap.get(r1) + "," + r2);
+            }
+        }
+
+        List<Map.Entry<String, String>> libraryList = new ArrayList<Map.Entry<String, String>>(libraryMap.entrySet());
+        Collections.sort(libraryList, new Comparator<Map.Entry<String, String>>() {
+            public int compare(Map.Entry<String, String> o1, Map.Entry<String, String> o2) {
+                return o1.getKey().compareTo(o2.getKey());
+            }
+        });
+
+        return libraryList;
+    }
 }

+ 55 - 0
graph/src/test/java/org/diagbot/graph/DemoTest.java

@@ -0,0 +1,55 @@
+package org.diagbot.graph;
+
+import org.apache.commons.lang3.StringUtils;
+import org.junit.Test;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 测试类
+ */
+public class DemoTest {
+    /**
+     * 测试map,如果map为空返回什么
+     */
+    @Test
+   public void MapTest(){
+        Map<String,String> k = new HashMap<>();
+        if(k.size()>0){
+            System.out.println("map不为空!!");
+        }else {
+            System.out.println("map为空!!!");
+        }
+        System.out.println(k.get("dd"));
+   }
+
+    /**
+     * 测试list
+     */
+   @Test
+   public void ListTest(){
+       List<String> testList = null;
+       testList = new ArrayList<>();
+       if(testList.size()>0){
+           System.out.println("list不为空!!!");
+       }else {
+           System.out.println("list为空!!!");
+       }
+   }
+
+    /**
+     * 测试string
+     */
+   @Test
+   public void stringTest(){
+       String k="";
+       if(StringUtils.isNotEmpty(k)){
+           System.out.println("k不为空!!!");
+       }else {
+           System.out.println("k为空!!!");
+       }
+   }
+}

+ 4 - 1
graphdb/src/main/java/org/diagbot/repository/BaseNodeRepository.java

@@ -21,7 +21,10 @@ public interface BaseNodeRepository extends Neo4jRepository<BaseNode, Long> {
     //get high risk
     @Query("match(d:Disease) where d.name in {0} return d.name as name, d.high_risk as risk")
     List<Map<String, Object>> getHighRisk(List diagList);
-
+    //get VITAL
+    @Query("unwind {0} as row \n" +
+            " match (d:Disease)-[r1:表现]->(m:Vital) where d.name=row return m.name as name")
+    List<Map<String,Object>> getVitalList(List diagList);
     //get LIS PACS
     @Query("unwind {0} as row \n" +
             " match (d:Disease)-[r1:推荐]->(m) where d.name=row return  labels(m)[0] as label,m.name as name")

+ 66 - 11
graphdb/src/main/java/org/diagbot/service/impl/KnowledgeServiceImpl.java

@@ -239,7 +239,7 @@ public class KnowledgeServiceImpl implements KnowledgeService {
         logger.info("分词系统传来的词: " + ss);
         logger.info("图谱开始根据传来的分词计算诊断.....");
         //开始推送诊断逻辑,包括推送疑诊,急诊,鉴别诊断
-        if (featureTypeList != null && featureTypeList.contains("7")) {
+        if (featureTypeList != null && featureTypeList.contains("2")) {
             //第一,二步查询输入的词所在number
             Set<String> fildInNumber = this.getNumber(ss);
             //第三步查找疑诊
@@ -298,11 +298,11 @@ public class KnowledgeServiceImpl implements KnowledgeService {
                 for (Map.Entry<String, Map<String, String>> d : diseaseCondition.entrySet()) {
                     FeatureRate featureRate = new FeatureRate();
                     featureRate.setFeatureName(d.getKey());
-                    featureRate.setExtraProperty("");
+                    featureRate.setExtraProperty("neo4j");
                     Map<String, String> value = d.getValue();
                     String s = JSON.toJSONString(value);
                     featureRate.setDesc(s);
-                    featureRate.setRate("neo4j");
+//                    featureRate.setRate("neo4j");
                     featureRates.add(featureRate);
                 }
             }
@@ -312,7 +312,7 @@ public class KnowledgeServiceImpl implements KnowledgeService {
         logger.info("图谱计算出来的诊断(包含疑诊,急诊,鉴别诊断)为: " + que);
 
         //推送治疗,包含不良反应
-        if (webDiag != null && webDiag.trim() != "" && featureTypeList.contains("8")) {
+        if (webDiag != null && webDiag.trim() != "" && featureTypeList.contains("6")) {
             logger.info("界面有诊断,并且features包含8,可以走治疗方案");
             //查找页面诊断里是否有不良反应(慢病的情况下)
             Map<String, List<String>> disUE = new HashMap<>();
@@ -371,14 +371,14 @@ public class KnowledgeServiceImpl implements KnowledgeService {
     }
 
     /**
-     * 获取化验和辅检
+     * 获取化验和辅检,体征结果
      * @param searchData
      * @return
      */
     @Override
     public Map<String, List<FeatureRate>> getLisPacs(SearchData searchData) {
         String[] featureArray = StringUtils.split(searchData.getFeatureType(), ",");
-        List<String> featureList = Arrays.asList(featureArray);
+        List<String> featureList = Arrays.asList(searchData.getFeatureTypes());
         Map<String, List<FeatureRate>> lisPacsFeature = new HashMap<>();
         String webDiag = searchData.getDiag();
         List<String> webDiagList = null;
@@ -390,7 +390,7 @@ public class KnowledgeServiceImpl implements KnowledgeService {
         List<String> bigdataDiagList = new LinkedList<>();//大数据诊断
         if (bigdataDiagFeature.size() > 0) {
             for (FeatureRate fe : bigdataDiagFeature) {
-                if ("neo4j".equals(fe.getRate()) && fe.getDesc().contains("确诊")) {
+                if ("neo4j".equals(fe.getSource()) && fe.getDesc().contains("确诊")) {
                     neo4jDiagList.add(fe.getFeatureName());
                 } else if (fe.getDesc() == null) {
                     bigdataDiagList.add(fe.getFeatureName());
@@ -414,20 +414,24 @@ public class KnowledgeServiceImpl implements KnowledgeService {
             }
         }
         logger.info("界面诊断为: " + webDiagList);
-        Map<String, LinkedHashSet<String>> weblisPacs = null;
-        Map<String, LinkedHashSet<String>> neo4jlisPacs = null;
-        Map<String, LinkedHashSet<String>> biglisPacs = null;
+        Map<String, LinkedHashSet<String>> weblisPacs = null,webVital = null;
+        Map<String, LinkedHashSet<String>> neo4jlisPacs = null,neo4jVital = null;
+        Map<String, LinkedHashSet<String>> biglisPacs = null,bigVital = null;
         if (webDiagList != null && webDiagList.size() > 0) {
             weblisPacs = processLisPacs(webDiagList);
+            webVital = processVital(webDiagList);
         }
         if (neo4jDiagList != null && neo4jDiagList.size() > 0) {
             neo4jlisPacs = processLisPacs(neo4jDiagList);
+            neo4jVital = processVital(neo4jDiagList);
         }
         if (bigdataDiagList != null && bigdataDiagList.size() > 0) {
             biglisPacs = processLisPacs(bigdataDiagList);
+            bigVital = processVital(bigdataDiagList);
         }
         Set<String> lis = new LinkedHashSet<>();
         Set<String> pacs = new LinkedHashSet<>();
+        Set<String> vitalReultSet = new LinkedHashSet<>();
         Set<String> webLis = null;
         Set<String> webPacs = null;
         Set<String> neoLis = null;
@@ -446,6 +450,7 @@ public class KnowledgeServiceImpl implements KnowledgeService {
             if(webPacs != null){
                 pacs.addAll(webPacs);
             }
+            vitalReultSet.addAll(webVital.get("VITAL_RESULT"));
         }
         if(neo4jlisPacs != null){
             neoLis = neo4jlisPacs.get("LIS");
@@ -456,6 +461,7 @@ public class KnowledgeServiceImpl implements KnowledgeService {
             if(neoPacs != null){
                 pacs.addAll(neoPacs);
             }
+            vitalReultSet.addAll(neo4jVital.get("VITAL_RESULT"));
         }
         if(biglisPacs != null){
             bigLis = biglisPacs.get("LIS");
@@ -466,11 +472,14 @@ public class KnowledgeServiceImpl implements KnowledgeService {
             if(bigPacs != null){
                 pacs.addAll(bigPacs);
             }
+            vitalReultSet.addAll(bigVital.get("VITAL_RESULT"));
         }
         logger.info("推出的合并lis为: " + lis);
         logger.info("推出的合并pacs为: " + pacs);
+        logger.info("推出的合并体征结果为: " + vitalReultSet);
         ArrayList<FeatureRate> lisFeature = new ArrayList<>();
         ArrayList<FeatureRate> pacsFeature = new ArrayList<>();
+        ArrayList<FeatureRate> vitalFeature = new ArrayList<>();
         if (lis != null && lis.size() > 0 && featureList.contains("4")) {
             List<String> newLis = new ArrayList<>();
             if(lis.size()>searchData.getLength()){
@@ -489,14 +498,42 @@ public class KnowledgeServiceImpl implements KnowledgeService {
             }
         }
         if (pacs != null && pacs.size() > 0 && featureList.contains("5")) {
-            for (String p : pacs) {
+            List<String> newPacs = new ArrayList<>();
+            if(pacs.size()>searchData.getLength()){
+                for (String l:pacs) {
+                    if(newPacs.size()<searchData.getLength()){
+                        newPacs.add(l);
+                    }
+                }
+            }else {
+                newPacs.addAll(pacs);
+            }
+            for (String p : newPacs) {
                 FeatureRate featureRate = new FeatureRate();
                 featureRate.setFeatureName(p);
                 pacsFeature.add(featureRate);
             }
         }
+        if(vitalReultSet.size() > 0){
+            List<String> newVitalRes = new ArrayList<>();
+            if(vitalReultSet.size()>searchData.getLength()){
+                for (String l:vitalReultSet) {
+                    if(newVitalRes.size()<searchData.getLength()){
+                        newVitalRes.add(l);
+                    }
+                }
+            }else {
+                newVitalRes.addAll(vitalReultSet);
+            }
+            for (String p : newVitalRes) {
+                FeatureRate featureRate = new FeatureRate();
+                featureRate.setFeatureName(p);
+                vitalFeature.add(featureRate);
+            }
+        }
         lisPacsFeature.put("lisList", lisFeature);
         lisPacsFeature.put("pacsList", pacsFeature);
+        lisPacsFeature.put("vitalResultList",vitalFeature);
 
         return lisPacsFeature;
     }
@@ -520,6 +557,24 @@ public class KnowledgeServiceImpl implements KnowledgeService {
         return fildInNumber;
     }
 
+    /**
+     * 查询体征
+     * @param webDiagList
+     * @return
+     */
+    public Map<String, LinkedHashSet<String>> processVital(List<String> webDiagList) {
+        Map<String, LinkedHashSet<String>> vitalMap = new HashMap<>();
+        LinkedHashSet<String> vitalResultArray = new LinkedHashSet<>();//体征结果
+        List<Map<String, Object>> vitalList = baseNodeRepository.getVitalList(webDiagList);
+        if (vitalList != null && vitalList.size() > 0) {
+            for (Map<String, Object> f : vitalList) {
+                String name = f.get("name").toString();
+                vitalResultArray.add(name);
+            }
+        }
+        vitalMap.put("VITAL_RESULT", vitalResultArray);
+        return vitalMap;
+    }
     /**
      * 根据内容推出不良反应集合
      *

+ 1 - 0
graphdb/src/main/java/org/diagbot/vo/domain/FeatureRate.java

@@ -10,4 +10,5 @@ public class FeatureRate {
     private String extraProperty;
     private String desc;
     private String rate;
+    private String source;
 }

+ 2 - 0
graphdb/src/main/java/org/diagbot/web/KnowledgeController.java

@@ -155,8 +155,10 @@ public class KnowledgeController {
         Map<String, List<FeatureRate>> lisPacs = knowledgeService.getLisPacs(searchData);
         List<FeatureRate> lisList = lisPacs.get("lisList");
         List<FeatureRate> pacsList = lisPacs.get("pacsList");
+        List<FeatureRate> vitalResultList = lisPacs.get("vitalResultList");
         responseData.setLabs(lisList);
         responseData.setPacs(pacsList);
+        responseData.setVitals(vitalResultList);
         kk.setData(responseData);
         return kk;
     }

+ 5 - 1
nlp-web/src/main/java/org/diagbot/nlp/controller/FeatureController.java

@@ -154,7 +154,10 @@ public class FeatureController extends BaseController<Feature, FeatureWrapper, L
                             content = info.getPresent();
                             propel = propelSymptom;
                             break;
-
+                        case TIME:
+                            content = info.getPresent();
+                            propel = propelSymptom;
+                            break;
                         case FEATURE:
                             content = info.getPresent();
                             propel = propelSymptom;
@@ -177,6 +180,7 @@ public class FeatureController extends BaseController<Feature, FeatureWrapper, L
                             break;
                     }
                     featureList = sa.start(content, FeatureType.parse(featureType));
+
                     if (featureList == null) {
                         continue;
                     }

+ 1 - 1
nlp-web/src/main/resources/application.yml

@@ -12,7 +12,7 @@ spring:
       charset: UTF-8
       enabled: true
   datasource:       # mybatis 配置,使用druid数据源
-    url: jdbc:mysql://192.1.3.116:3306/med-s?useUnicode=true&characterEncoding=UTF-8
+    url: jdbc:mysql://1.1.1.1:3306/med-s?useUnicode=true&characterEncoding=UTF-8
     username: root
     password: langtong
     type: com.alibaba.druid.pool.DruidDataSource

+ 4 - 0
nlp/src/main/java/org/diagbot/nlp/feature/FeatureAnalyze.java

@@ -89,6 +89,10 @@ public class FeatureAnalyze {
                     } else {
                         l.setConcept(l.getConcept() + "," + NlpCache.standard_info_synonym_map.get(props[i]).get(l.getText()));
                     }
+                    //如果是症状或体征,进行标准术语转换
+                    if (props[i].equals(Constants.feature_type_symptom)) {
+                        l.setText(NlpCache.standard_info_synonym_map.get(props[i]).get(l.getText()));
+                    }
                 }
             }
         }

+ 7 - 1
nlp/src/main/java/org/diagbot/nlp/feature/FeatureType.java

@@ -13,7 +13,9 @@ public enum FeatureType {
     PACS(Constants.feature_type_pacs),
     FEATURE(Constants.feature_type_feature),
     TREAT(Constants.feature_type_treat),
-    HISTORY(Constants.feature_type_history);
+    HISTORY(Constants.feature_type_history),
+    VITAL_INDEX(Constants.feature_type_vital_index),
+    TIME(Constants.feature_type_time);
 
     FeatureType(String value) {
         this.value = value;
@@ -47,6 +49,10 @@ public enum FeatureType {
                 return FeatureType.HISTORY;
             case Constants.feature_type_feature:
                 return FeatureType.FEATURE;
+            case Constants.feature_type_vital_index:
+                return FeatureType.VITAL;
+            case Constants.feature_type_time:
+                return FeatureType.TIME;
         }
         return FeatureType.SYMPTOM;
     }

+ 8 - 10
nlp/src/main/java/org/diagbot/nlp/feature/extract/CaseToken.java

@@ -100,16 +100,14 @@ public abstract class CaseToken {
             }
         }
         if (!hasFeature) {
-//            if (sn <= 6) {
-                Map<String, Object> fMap = new HashMap<>(10);
-                fMap.put("feature_name", lexeme.getText());
-                fMap.put("feature_type", featureType);
-                fMap.put("negative", key);
-                fMap.put("sn", String.valueOf(sn++));
-                fMap.put("property", lexeme.getProperty());
-                fMap.put("concept", lexeme.getConcept());
-                featuresList.add(fMap);
-//            }
+            Map<String, Object> fMap = new HashMap<>(10);
+            fMap.put("feature_name", lexeme.getText());
+            fMap.put("feature_type", featureType);
+            fMap.put("negative", key);
+            fMap.put("sn", String.valueOf(sn++));
+            fMap.put("property", lexeme.getProperty());
+            fMap.put("concept", lexeme.getConcept());
+            featuresList.add(fMap);
         }
     }
 }

+ 6 - 0
nlp/src/main/java/org/diagbot/nlp/feature/extract/CaseTokenFactory.java

@@ -14,6 +14,7 @@ public class CaseTokenFactory {
     private static CaseTokenVital caseTokenVital = null;
     private static CaseTokenLIS caseTokenLis = null;
     private static CaseTokenPACS caseTokenPacs = null;
+    private static CaseTokenTime caseTokenTime = null;
 
     public static CaseToken getInstance(FeatureType featureType) throws java.lang.InstantiationException, java.lang.IllegalAccessException {
         try {
@@ -48,6 +49,11 @@ public class CaseTokenFactory {
                         caseTokenDiag = new CaseTokenDiag();
                     }
                     return caseTokenDiag;
+                case TIME:
+                    if (caseTokenTime == null) {
+                        caseTokenTime = new CaseTokenTime();
+                    }
+                    return caseTokenTime;
             }
         }catch (Exception ille) {
             throw ille;

+ 111 - 0
nlp/src/main/java/org/diagbot/nlp/feature/extract/CaseTokenTime.java

@@ -0,0 +1,111 @@
+package org.diagbot.nlp.feature.extract;
+
+import org.diagbot.nlp.participle.word.Lexeme;
+import org.diagbot.nlp.participle.word.LexemePath;
+import org.diagbot.nlp.util.Constants;
+import org.diagbot.nlp.util.NegativeEnum;
+import org.diagbot.nlp.util.NlpUtil;
+
+import java.math.BigDecimal;
+import java.util.*;
+
+public class CaseTokenTime extends CaseToken {
+    {
+        stop_symbol = NlpUtil.extendsSymbol(stop_symbol, new String[]{",", ",", ":", ":"});
+    }
+
+    private List numtextList = new ArrayList(Arrays.asList("数", "多", "半", "一", "二", "三", "四", "五", "六", "七", "八", "九", "十"));
+    private Map<String, String> numtextMap = new HashMap<String, String>(){{
+        put("一","1");
+        put("二","2");
+        put("三","3");
+        put("四","4");
+        put("五","5");
+        put("六","6");
+        put("七","7");
+        put("八","8");
+        put("九","9");
+        put("十","10");
+    }};
+
+    public List<Map<String, Object>> analyze(LexemePath<Lexeme> lexemePath) throws Exception {
+        super.sn = 0;
+        int max_offset = 10;        //只取前10个词元中的时间信息
+        //词性
+        String property = null;
+        NegativeEnum[] nees = new NegativeEnum[]{NegativeEnum.EVENT_TIME};
+        List<Map<String, Object>> featuresList = new ArrayList<>();
+
+        Lexeme leftLexeme = null;
+
+        double time_value = 0.0;
+        for (int index = 0; index < lexemePath.size(); index++) {
+            Lexeme lexeme = lexemePath.get(index);
+            property = lexeme.getProperty();
+            if (NlpUtil.isFeature(property, nees)) {          //特征词 化验
+                if (index > 0) {
+                    leftLexeme = lexemePath.get(index - 1);
+                } else {
+                    break;
+                }
+                if (numtextList.contains(leftLexeme.getText())) {
+                    if ("数".equals(leftLexeme.getText()) || "多".equals(leftLexeme.getText())) {     //数年直接按5年处理
+                        time_value = 5;
+                    } else if ("半".equals(leftLexeme.getText())) {
+                        time_value = 0.5;
+                    } else {
+                        time_value = Double.valueOf(numtextMap.get(leftLexeme.getText()));
+                    }
+                } else {
+                    try {
+                        time_value = Double.valueOf(leftLexeme.getText());
+                    } catch (Exception nfe) {
+                        if (leftLexeme.getText().indexOf("-") > -1) {
+                            try {
+                                time_value = Double.valueOf(leftLexeme.getText().split("-")[0]);
+                            } catch (Exception e) {
+                            }
+                        }
+                    }
+                }
+
+                if (time_value > 0) {
+                    if ("年".equals(lexeme.getText()) || "年余".equals(lexeme.getText())) {
+                        if (time_value > 100) {
+                            time_value = 2018 - time_value;
+                        }
+                        time_value = time_value * 365;
+                    } else if ("月".equals(lexeme.getText()) || "月余".equals(lexeme.getText())) {
+                        time_value = time_value * 30;
+                    } else if ("天".equals(lexeme.getText()) || "天余".equals(lexeme.getText()) || "日".equals(lexeme.getText())) {
+                        time_value = time_value;
+                    } else if ("周".equals(lexeme.getText()) || "周余".equals(lexeme.getText())) {
+                        time_value = time_value * 7;
+                    } else if ("小时".equals(lexeme.getText())) {
+                        time_value = time_value / 24;
+                    } else if ("分钟".equals(lexeme.getText())) {
+                        time_value = time_value / (24 * 60);
+                    }
+                }
+
+                if (time_value > 0) {
+                    BigDecimal bd = new BigDecimal(time_value);
+                    time_value = bd.setScale(2,BigDecimal.ROUND_HALF_UP).doubleValue();
+
+                    Map<String, Object> fMap = new HashMap<>(10);
+                    fMap.put("feature_name", time_value);
+                    fMap.put("feature_type", Constants.feature_type_time);
+                    fMap.put("negative", "有");
+                    fMap.put("sn", String.valueOf(sn++));
+                    fMap.put("property", lexeme.getProperty());
+                    fMap.put("concept", lexeme.getConcept());
+
+                    fMap.put("time_label", "1");
+                    featuresList.add(fMap);
+                }
+                break;
+            }
+        }
+        return featuresList;
+    }
+}

+ 13 - 0
nlp/src/main/java/org/diagbot/nlp/participle/cfg/DefaultConfig.java

@@ -1,6 +1,7 @@
 package org.diagbot.nlp.participle.cfg;
 
 import org.diagbot.nlp.participle.word.Segment;
+import org.diagbot.pub.utils.PropertiesUtil;
 import org.diagbot.pub.utils.security.EncrypDES;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -22,6 +23,13 @@ public class DefaultConfig implements Configuration {
 
     Segment segment;
 
+    private String path_prefix = "";
+
+    public DefaultConfig() {
+        PropertiesUtil propertiesUtil = new PropertiesUtil("nlp.properties");
+        path_prefix = propertiesUtil.getProperty("cache.file.dir");
+    }
+
     public Segment loadMainDict(String path) {
         List<String> fileContents = readFileContents(path);
         logger.info("读取文件" + path + "结果:" + fileContents.size() + "行");
@@ -78,11 +86,15 @@ public class DefaultConfig implements Configuration {
     }
 
     public List<String> readFileContents(String path) {
+        if (!StringUtils.isEmpty(path_prefix)) path = path_prefix + path;
         InputStream is = null;
         List<String> fileContents = new ArrayList<String>(10);
         try {
             if (StringUtils.isEmpty(path)) path = DEFAULT_PATH;
             is = this.getClass().getClassLoader().getResourceAsStream(path);
+            File file = new File(path);
+//            File file = new File(this.getClass().getResource(path).getFile());
+            is = new FileInputStream(file);
             if (is == null) {
                 throw new RuntimeException(path + ".......文件未找到!!");
             }
@@ -117,6 +129,7 @@ public class DefaultConfig implements Configuration {
     }
 
     public void writeFileContents(List<String> contents, String path, String separator) {
+        if (!StringUtils.isEmpty(path_prefix)) path = path_prefix + path;
         try {
             FileWriter fw = new FileWriter(path);
             for (String content : contents) {

+ 4 - 2
nlp/src/main/java/org/diagbot/nlp/util/Constants.java

@@ -16,6 +16,8 @@ public class Constants {
     public final static String feature_type_treat = "6";       //治疗
     public final static String feature_type_history = "7";       //历史
     public final static String feature_type_feature = "9"; //症状描述中的特征信息 如部位、性质等
+    public final static String feature_type_time = "10";    //提取时间
+    public final static String feature_type_vital_index = "42"; //体征指标
 
     public static NegativeEnum[] symptom_type = new NegativeEnum[]{NegativeEnum.SYMPTOM, NegativeEnum.SYMPTOM_INDEX, NegativeEnum.SYMPTOM_PERFORMANCE};
     public static NegativeEnum[] unit_time_type = new NegativeEnum[]{NegativeEnum.EVENT_TIME, NegativeEnum.UNIT};
@@ -47,7 +49,7 @@ public class Constants {
             "神清","神志清","睡眠可","精神可","精神佳","二便无殊","体重无明显减轻","睡眠一般","小便无殊","大便无殊","胃纳可","食欲可"
     };
 
-    public final static String word_property_timestamp = "74";
+    public final static String word_property_timestamp = "40";
     public final static String word_property_symptom = "1";
     public final static String word_property_bodypart = "3";
     public final static String word_property_prop = "4";
@@ -55,7 +57,7 @@ public class Constants {
     public final static String word_property_degree = "6";
     public final static String word_property_neg = "7";
     public final static String word_property_med = "53";
-    public final static String word_property_medcom = "54";
+    public final static String word_property_med_com = "54";
     public final static String word_property_treat = "11";
     public final static String word_property_LIS = "12";
     public final static String word_property_LIS_Detail = "13";

+ 1 - 1
nlp/src/main/java/org/diagbot/nlp/util/DictUtil.java

@@ -29,7 +29,7 @@ public class DictUtil {
     }
 
     public void writeToDict(String path) {
-        MysqlJdbc nlpJdbc = new MysqlJdbc("root", "diagbot@20180822", "jdbc:mysql://192.1.3.116:3306/med-s?useUnicode=true&characterEncoding=UTF-8");
+        MysqlJdbc nlpJdbc = new MysqlJdbc("root", "lantone", "jdbc:mysql://192.168.2.121:3306/med?useUnicode=true&characterEncoding=UTF-8");
         Connection conn = nlpJdbc.connect();
         Statement st = null;
         ResultSet rs = null;

+ 3 - 2
nlp/src/main/java/org/diagbot/nlp/util/NlpCache.java

@@ -31,12 +31,12 @@ public class NlpCache {
 
     public static void createSegmentCache() {
         Configuration configuration = new DefaultConfig();
-        segment_cache = configuration.loadMainDict("tc.dict");
+        segment_cache = configuration.loadMainDict( "tc.dict");
     }
 
     public static void createPushCache() {
         Configuration configuration = new DefaultConfig();
-        standard_info_push_map = configuration.loadMapDict("push-tc.dict");
+        standard_info_push_map = configuration.loadMapDict( "push-tc.dict");
     }
 
     public static void createSynonymCache() {
@@ -59,6 +59,7 @@ public class NlpCache {
 
     public static void createClassifyCache() {
         Configuration configuration = new DefaultConfig();
+
         standard_info_classify_map = configuration.loadMapDict("classify.dict");
     }
 

+ 40 - 1
nlp/src/main/java/org/diagbot/nlp/util/NlpUtil.java

@@ -2,7 +2,7 @@ package org.diagbot.nlp.util;
 
 import org.diagbot.nlp.participle.word.Lexeme;
 
-import java.util.Arrays;
+import java.util.*;
 
 /**
  * @Auther: fyeman
@@ -11,6 +11,20 @@ import java.util.Arrays;
  */
 public class NlpUtil {
 
+    private static List numtextList = new ArrayList(Arrays.asList("数", "多", "半", "一", "二", "三", "四", "五", "六", "七", "八", "九", "十"));
+    private static  Map<String, String> numtextMap = new HashMap<String, String>(){{
+        put("一","1");
+        put("二","2");
+        put("三","3");
+        put("四","4");
+        put("五","5");
+        put("六","6");
+        put("七","7");
+        put("八","8");
+        put("九","9");
+        put("十","10");
+    }};
+
     public static String[] extendsSymbol(String[] origin, String[] extend_symbols) {
         String[] symbols = new String[origin.length + extend_symbols.length];
         System.arraycopy(origin, 0, symbols, 0, origin.length);
@@ -33,6 +47,31 @@ public class NlpUtil {
         return false;
     }
 
+    public static double numberText2value(Lexeme l) {
+        double value = 0.0;
+        if (numtextList.contains(l.getText())) {
+            if ("数".equals(l.getText()) || "多".equals(l.getText())) {     //数年直接按5年处理
+                value = 5;
+            } else if ("半".equals(l.getText())) {
+                value = 0.5;
+            } else {
+                value = Double.valueOf(numtextMap.get(l.getText()));
+            }
+        } else {
+            try {
+                value = Double.valueOf(l.getText());
+            } catch (Exception nfe) {
+                if (l.getText().indexOf("-") > -1) {
+                    try {
+                        value = Double.valueOf(l.getText().split("-")[0]);
+                    } catch (Exception e) {
+                    }
+                }
+            }
+        }
+        return value;
+    }
+
     public static boolean isFeature(String property, NegativeEnum[] features) {
         if (property == null) {
             return false;

+ 0 - 1
nlp/src/main/resources/chronic.dict

@@ -1 +0,0 @@
-kQHtQ28+jmR5grdNyynjjEpgEZ36UZf7

+ 0 - 0
nlp/src/main/resources/classify.dict


+ 3 - 0
nlp/src/main/resources/nlp.properties

@@ -0,0 +1,3 @@
+#Êý¾ÝÎļþ´æ·Å·¾¶
+cache.file.dir=/opt/diagbot-push/cache_file/
+#cache.file.dir=d:\\cache_file\\

File diff suppressed because it is too large
+ 0 - 2630
nlp/src/main/resources/push-tc.dict


+ 0 - 79
nlp/src/main/resources/relation.dict

@@ -1,79 +0,0 @@
-RNMak3cFWH4=
-ddolNu+ruoI=
-crSKo8ZJQWw=
-GLI7v4oJneU=
-z9odaTsZTe4=
-UtapbxnvICk=
-zCUYt/gJFTA=
-Zz6Ubw81PD0=
-yclD2AmKHJg=
-h4pBhb+B4Lk=
-8hKk85iZesU=
-0hgDIdsSBy4=
-rbTBQUekfEs=
-fxkh89TwKsc=
-ENBQhPq5htU=
-nK40VLls5Zw=
-hlUmDNbK6a4=
-rHRYnTdjAKA=
-5JujAdVP5E8=
-X2j2cnCysms=
-YEYDcVHi1BI=
-YLWWPYmlo7s=
-28BY78TjZOw=
-1zF5xvlmigE=
-5iH5AYe9ogQ=
-c1L+syscJqI=
-dCLIxiAaEPQ=
-nLmMNwLd9hU=
-KO6x8jrh1Go=
-PGU7FXe4EVw=
-Vt65EYLJtik=
-MowtsJaT+Eg=
-15XjiZKWWOQ=
-tvD9gnRGuE0=
-TS5FqQfA3Bo=
-8OTyr31+HZE=
-qdFv0AhEzho=
-W8g6uyvyhXY=
-33mX5o5YCuI=
-eN8E9yHmcuQ=
-Wrhyd5KGRwU=
-oXEQgo+FISY=
-In0GOQRAoNc=
-WeQ7RhGnT3E=
-izBKC43U5Do=
-yIxj3i9brYw=
-6/AAsiRaYHk=
-d6U7t3U9wHI=
-N6s43nxbRgM=
-o15aELxdA/0=
-csWORUAoN0g=
-IheffyTAFTQ=
-URoSRuJSqzQ=
-Hu0VMvGeJYM=
-qi/diuSUvPk=
-2lkFuZbZfSo=
-sVfatV4286o=
-JxjFv6u9Xg0=
-GHAXRYXi1X4=
-3PiS9MWTEcU=
-h0qS3XYvg7w=
-exAkRV4R8YY=
-VIiXu9Fzbfg=
-u6Lr+Jfr3PY=
-Slw/FnB9o4g=
-r7bymlovf1w=
-bSkSwBpuGHs=
-Xoa3vcFiseU=
-TXb4vMJd3ok=
-+XVC3EsH+pQ=
-J36KtM8/eqU=
-rc7iV++H97Y=
-itwdzE4pvKw=
-yuYZf2CANH0=
-2J2g4AT+OI4=
-cKsJV2K7OCI=
-yXcIkexvskc=
-W5cHtxiabQI=
-GDA1Yq67XoE=

File diff suppressed because it is too large
+ 0 - 16344
nlp/src/main/resources/synonym.dict


File diff suppressed because it is too large
+ 0 - 345541
nlp/src/main/resources/tc.dict


+ 7 - 1
nlp/src/test/java/org/diagbot/nlp/test/ConceptTest.java

@@ -42,13 +42,14 @@ public class ConceptTest {
     private static final String zdyjqd_path = "E:\\git\\docs\\医学知识库\\诊断依据\\全部依据\\其他有问题的词\\诊断依据问题词0701.xlsx";
     private static final String pacsresult_path = "E:\\git\\docs\\医学知识库\\诊断依据\\全部依据\\其他有问题的词\\诊断依据问题词0702.xlsx";
     private static final String lisresult_path = "E:\\git\\docs\\医学知识库\\化验\\化验结果_诊断依据0702.xlsx";
+    private static final String vital_result_index_path = "E:\\git\\docs\\医学知识库\\体征\\体征结果映射关系.xlsx";
 
     public static void main(String[] args) {
         try {
 //            insertSymptom();
 //            insertPushSymptom();
 //            insertPart();
-            insertVital();
+//            insertVital();
 //            insertLis();
 //            insertLisResult();
 //            insertPacs();
@@ -65,6 +66,7 @@ public class ConceptTest {
 //            insertZdyjQt();
 
 //            insertRelationSymptom();
+            insertVitalResultIndex();
 
         } catch (Exception e) {
             e.printStackTrace();
@@ -186,6 +188,10 @@ public class ConceptTest {
         insertOneColumn(lisresult_path, 4, "14", "化验结果");
     }
 
+    public static void insertVitalResultIndex() throws Exception {
+        insertOneColumn(vital_result_index_path, 1, "33", "体征指标");
+    }
+
     public static void insertOneColumn(String path, int columnIndex, String typeId, String typeName) throws Exception {
         insertOneColumn(0, path, columnIndex, typeId, typeName);
     }

+ 8 - 0
pom.xml

@@ -21,6 +21,7 @@
         <module>nlp-web</module>
         <module>push-web</module>
         <module>graphdb</module>
+        <module>common-push</module>
     </modules>
 
     <properties>
@@ -252,6 +253,13 @@
             <artifactId>fastjson</artifactId>
             <version>1.2.46</version>
         </dependency>
+
+        <!-- https://mvnrepository.com/artifact/org.mongodb/bson -->
+        <dependency>
+            <groupId>org.mongodb</groupId>
+            <artifactId>bson</artifactId>
+            <version>3.10.1</version>
+        </dependency>
     </dependencies>
 
     <!-- .properties xml进行打包 -->

+ 12 - 2
public/src/main/java/org/diagbot/pub/jdbc/MysqlJdbc.java

@@ -131,6 +131,7 @@ public class MysqlJdbc {
             StringBuffer sb = new StringBuffer();
 
             int first_index = 0;
+            String val = "";
             for (int cursor = 0; cursor < data.size(); cursor ++) {
                 if (first_index > 0) {
                     sb.append(",");
@@ -142,7 +143,11 @@ public class MysqlJdbc {
                     }
                     if (data.get(cursor).get(columns[i]) != null) {
                         sb.append("'");
-                        sb.append(data.get(cursor).get(columns[i]));
+                        val = data.get(cursor).get(columns[i]).toString();
+                        if (val.indexOf("'") > -1) {
+                            val = val.replace("'", "\\'");
+                        }
+                        sb.append(val);
                         sb.append("'");
                     } else {
                         sb.append("''");
@@ -177,6 +182,7 @@ public class MysqlJdbc {
             conn.setAutoCommit(false);
             st = conn.createStatement();
             int batchIndex = 0;
+            String val = "";
             for (int cursor = 0; cursor < data.size(); cursor ++) {
                 String sql = joinInsetSql(table, columns);
                 sql += "(";
@@ -186,7 +192,11 @@ public class MysqlJdbc {
                     }
                     if (data.get(cursor).get(columns[i]) != null) {
                         sql += "'";
-                        sql += data.get(cursor).get(columns[i]);
+                        val = data.get(cursor).get(columns[i]).toString();
+                        if (val.indexOf("'") > -1) {
+                            val = val.replace("'", "\\'");
+                        }
+                        sql += val;
                         sql += "'";
                     } else {
                         sql += null;

+ 6 - 0
push-web/pom.xml

@@ -49,6 +49,12 @@
 			<version>1.0.0</version>
 		</dependency>
 
+		<dependency>
+			<groupId>org.diagbot</groupId>
+			<artifactId>common-push</artifactId>
+			<version>1.0.0</version>
+		</dependency>
+
 		<dependency>
 			<groupId>org.diagbot</groupId>
 			<artifactId>bigdata-web</artifactId>

+ 5 - 0
push-web/src/main/java/org/diagbot/push/config/InterceptorConfig.java

@@ -1,6 +1,7 @@
 package org.diagbot.push.config;
 
 import org.diagbot.bigdata.common.RegionInterceptor;
+import org.diagbot.common.push.cache.CacheFileManager;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.web.servlet.config.annotation.InterceptorRegistration;
 import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
@@ -20,5 +21,9 @@ public class InterceptorConfig implements WebMvcConfigurer {
         //登录拦截的管理器
         InterceptorRegistration registration = registry.addInterceptor(new RegionInterceptor());     //拦截的对象会进入这个类中进行判断
         registration.addPathPatterns("/**");                    //所有路径都被拦截
+
+        //生成数据文件
+        CacheFileManager cacheFileManager = new CacheFileManager();
+        cacheFileManager.createCacheFile();
     }
 }

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

@@ -1,14 +1,18 @@
 package org.diagbot.push.controller;
 
+import org.apache.commons.lang3.StringUtils;
 import org.diagbot.bigdata.work.AlgorithmCore;
 import org.diagbot.common.javabean.Drugs;
 import org.diagbot.common.javabean.Filnlly;
 import org.diagbot.common.javabean.MedicalIndication;
 import org.diagbot.common.javabean.Medicition;
+import org.diagbot.common.push.filter.ClassifyDiag;
 import org.diagbot.common.work.FeatureRate;
 import org.diagbot.common.work.ResponseData;
 import org.diagbot.common.work.SearchData;
+import org.diagbot.graph.util.CacheUtil;
 import org.diagbot.graphWeb.work.DiseaseCalculate;
+import org.diagbot.graphWeb.work.FilterSortDiag;
 import org.diagbot.graphWeb.work.GraphCalculate;
 import org.diagbot.graphWeb.work.LisPacsCalculate;
 import org.diagbot.nlp.util.Constants;
@@ -25,6 +29,7 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.ResponseBody;
+import org.diagbot.push.convert.PreProcess;
 
 import javax.servlet.http.HttpServletRequest;
 import java.util.*;
@@ -116,11 +121,15 @@ public class AlgorithmController extends BaseController {
     }
 
     public Response<ResponseData> combine(HttpServletRequest request, SearchData searchData) throws Exception {
+        logger.info("开始规则转换......");
+        PreProcess prepro = new PreProcess();
+        searchData = prepro.processClinicalData(searchData);
+        ResponseData RuleResponseData = prepro.applyrules(searchData);
+
         logger.info("开始推送服务......");
         Response<ResponseData> response = new Response();
         AlgorithmCore core = new AlgorithmCore();
-        ResponseData bigDataResponseData = core.algorithm(request, searchData);
-        LisPacsCalculate lisPacsCalculate = new LisPacsCalculate();
+        ResponseData bigDataResponseData = core.algorithm(request, searchData, RuleResponseData);
 
         GraphCalculate graphCalculate = new GraphCalculate();
         ResponseData graphResponseData = graphCalculate.calculate(request, searchData);
@@ -141,37 +150,72 @@ public class AlgorithmController extends BaseController {
             }
             List<FeatureRate> graphFeatureRates = graphResponseData.getDis();
             graphFeatureRates.addAll(disFeatureRates);
-            //大数据推送疾病数据用知识图谱替换
             bigDataResponseData.setDis(graphFeatureRates);
         }
-
+        //归一之前诊断信息
+        bigDataResponseData.setBeforeCombineDis(bigDataResponseData.getDis());
         //推送出的诊断信息作为参数传入知识图谱
         List<FeatureRate> pushDiags = new ArrayList<>();
-        for (FeatureRate fr : bigDataResponseData.getDis()) {
-            pushDiags.add(fr);
-            logger.info("合并知识图谱、大数据后推送的诊断信息....: " + fr.getFeatureName());
-        }
+        pushDiags.addAll(bigDataResponseData.getDis());
         searchData.setPushDiags(pushDiags);
-
         bigDataResponseData.setTreat(graphResponseData.getTreat());
         //量表和指标推送
         List<MedicalIndication> medicalIndications = graphResponseData.getMedicalIndications();
         if (medicalIndications != null && medicalIndications.size() > 0) {
             logger.info("指标推送!!!!!!!!!");
-            bigDataResponseData.setMedicalIndications(medicalIndications);
+           bigDataResponseData.getMedicalIndications().addAll(medicalIndications);
         }
         //推送管理评估
         bigDataResponseData.setManagementEvaluation(graphResponseData.getManagementEvaluation());
         //知识图谱直接替换大数据中的检验检查数据
-//        if(searchData.getDiag() !=null || searchData.getPushDiags() != null){
+        LisPacsCalculate lisPacsCalculate = new LisPacsCalculate();
         graphResponseData = lisPacsCalculate.getLisPacs(request, searchData);
+
         bigDataResponseData.setLabs(graphResponseData.getLabs());
         bigDataResponseData.setPacs(graphResponseData.getPacs());
-//        }
+
+        //体征结果和指标推送
+        Map<String, String> vitalCache = CacheUtil.getVitalCache();
+        List<String> featureList = Arrays.asList(searchData.getFeatureTypes());
+        List<FeatureRate> vitals = graphResponseData.getVitals();
+        if(featureList.contains(Constants.feature_type_vital_index) && this.getVital(vitalCache,vitals).size() > 0){
+            bigDataResponseData.setVitals(this.getVital(vitalCache,vitals));
+
+        }
+        if(featureList.contains(Constants.feature_type_vital) && vitals.size() > 0){
+            bigDataResponseData.setVitals(vitals);
+        }
+
+        //把所有的诊断拿出来经过过滤层过滤
+        ClassifyDiag classifyDiag = new ClassifyDiag();
+        List<FeatureRate> upfes = classifyDiag.filterDiag(graphResponseData, pushDiags);
+        List<FeatureRate> classify = classifyDiag.diagClassify(upfes);
+        List<FeatureRate> featureRates = classifyDiag.sortDiag(classify);
+        bigDataResponseData.setDis(featureRates);
         response.setData(bigDataResponseData);
         return response;
     }
 
+    public List<FeatureRate> getVital(Map<String, String> vitalCache,List<FeatureRate> vitals){
+        Set<String> vitalSet = new LinkedHashSet<>();
+        List<FeatureRate> vitalList = new ArrayList<>();
+        if(vitals != null){
+            for (FeatureRate f:vitals) {
+                String s = vitalCache.get(f.getFeatureName());
+                if(StringUtils.isNotEmpty(s)){
+                    vitalSet.add(s);
+                }
+            }
+        }
+        if(vitalSet != null){
+            for (String vi:vitalSet) {
+                FeatureRate featureRate= new FeatureRate();
+                featureRate.setFeatureName(vi);
+                vitalList.add(featureRate);
+            }
+        }
+        return vitalList;
+    }
     public Response<ResponseData> algorithm(HttpServletRequest request, SearchData searchData) throws Exception {
         Response<ResponseData> response = new Response();
 

+ 49 - 0
push-web/src/main/java/org/diagbot/push/controller/CacheFileManagerController.java

@@ -0,0 +1,49 @@
+package org.diagbot.push.controller;
+
+import org.diagbot.bigdata.common.ApplicationCacheUtil;
+import org.diagbot.common.push.cache.CacheFileManager;
+import org.diagbot.common.work.ResponseData;
+import org.diagbot.graph.util.CacheUtil;
+import org.diagbot.nlp.util.NlpCache;
+import org.diagbot.pub.api.Response;
+import org.diagbot.pub.web.BaseController;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import javax.servlet.http.HttpServletRequest;
+
+/**
+ * Created by louhr on 2019/8/16.
+ */
+@Controller
+@RequestMapping("/cache_file_manager")
+public class CacheFileManagerController extends BaseController {
+
+    @RequestMapping(value = "/create_file")
+    @ResponseBody
+    public Response<ResponseData> create(HttpServletRequest request) throws Exception {
+        Response<ResponseData> response = new Response<ResponseData>();
+        CacheFileManager cacheFileManager = new CacheFileManager();
+        cacheFileManager.createCacheFile();
+        //自然语言处理缓存更新
+        NlpCache.createSegmentCache();
+        NlpCache.createPushCache();
+        NlpCache.createClassifyCache();
+        NlpCache.createChronicCache();
+        NlpCache.createSynonymCache();
+        //更新图谱缓存
+        CacheUtil.createDiagSortCache();
+        CacheUtil.createSexAgeCache();
+        CacheUtil.createVitalCache();
+        CacheUtil.createDiagClassifyCache();
+        CacheUtil.createDiagClassifyJiCache();
+        CacheUtil.createDiagDepartCache();
+        //更新大数据缓存
+        ApplicationCacheUtil.createDoc_result_mapping_diag_map();
+        ApplicationCacheUtil.createDoc_result_mapping_filter_map();
+        ApplicationCacheUtil.createKl_result_mapping_standword_map();
+        ApplicationCacheUtil.create_rule_filter_map();
+        return response;
+    }
+}

+ 16 - 0
push-web/src/main/java/org/diagbot/push/controller/ParticipleController.java

@@ -1,8 +1,13 @@
 package org.diagbot.push.controller;
 
+import org.diagbot.nlp.participle.ParticipleUtil;
+import org.diagbot.pub.api.Response;
 import org.diagbot.pub.web.BaseController;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import java.io.IOException;
 
 @Controller
 @RequestMapping("/participle")
@@ -14,4 +19,15 @@ public class ParticipleController extends BaseController {
     public String index() {
         return listView;
     }
+
+    @ResponseBody
+    @RequestMapping("/split_and_highlight")
+    public Response splitAndHighlight(String content) throws IOException {
+        Response response = new Response();
+        long start = System.currentTimeMillis();
+        response.setData(ParticipleUtil.participleAndHighlight(content));
+        long end = System.currentTimeMillis();
+        System.out.println("总耗时:........." + (end - start));
+        return response;
+    }
 }

+ 19 - 0
push-web/src/main/java/org/diagbot/push/controller/RelationController.java

@@ -1,8 +1,14 @@
 package org.diagbot.push.controller;
 
+import org.diagbot.nlp.relation.analyze.StructureAnalyze;
+import org.diagbot.nlp.relation.util.OutputInfo;
+import org.diagbot.pub.api.Response;
 import org.diagbot.pub.web.BaseController;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import java.util.List;
 
 /**
  * @ClassName org.diagbot.push.controller.RelationController
@@ -26,4 +32,17 @@ public class RelationController extends BaseController {
     public String list() {
         return "/pages/label/list.html";
     }
+
+    @RequestMapping({"/extraction"})
+    @ResponseBody
+    public Response extraction(String content) throws Exception {
+        Response response = new Response();
+        response.start();
+//        RelationAnalyze relationAnalyze = new RelationAnalyze();
+//        List<OutputInfo> outputInfos = relationAnalyze.analyze(content, FeatureType.parse("1"));
+        StructureAnalyze structureAnalyze = new StructureAnalyze();
+        List<OutputInfo> outputInfos = structureAnalyze.extract(content);
+        response.setData(outputInfos);
+        return response;
+    }
 }

+ 375 - 0
push-web/src/main/java/org/diagbot/push/convert/PreProcess.java

@@ -0,0 +1,375 @@
+package org.diagbot.push.convert;
+
+import com.alibaba.fastjson.JSONObject;
+import org.diagbot.bigdata.common.ApplicationCacheUtil;
+import org.diagbot.common.javabean.MedicalIndication;
+import org.diagbot.common.javabean.MedicalIndicationDetail;
+import org.diagbot.common.javabean.Rule;
+import org.diagbot.common.work.LisDetail;
+import org.diagbot.common.work.ResponseData;
+import org.diagbot.common.work.SearchData;
+import org.diagbot.nlp.participle.ParticipleUtil;
+import org.diagbot.nlp.participle.word.Lexeme;
+import org.diagbot.nlp.participle.word.LexemePath;
+import org.diagbot.nlp.util.Constants;
+
+import java.util.*;
+import java.util.stream.Collectors;
+
+public class PreProcess {
+
+    private static String up = "升高";
+    private static String down = "降低";
+    private static String normal = "正常";
+
+    private static String pos = "阳性";
+    private static String neg = "阴性";
+
+    private List<Map<String, Object>> vitlist = new ArrayList<>();
+    private List<Map<String, Object>> pacslist = new ArrayList<>();
+    private String[] vitkeyset = {"index", "value", "unit"};
+    private String[] bptype = {"血压","收缩压","舒张压","/"};
+
+    /**
+     * 处理临床数据
+     *
+     * @param searchdata
+     * @return ResponseData
+     */
+    public SearchData processClinicalData(SearchData searchdata) {
+        SearchData sData = searchdata;
+
+        sData.setLisArr(processLis(sData.getLisArr()));
+
+        if (sData.getLisArr().size() > 0) {
+            List<String> otherVal = sData.getLisArr().stream().map(lisArr -> lisArr.getOtherValue()).collect(Collectors.toList());
+            sData.setLis(String.join(",", otherVal));
+        }
+
+        return sData;
+    }
+
+    public ResponseData applyrules(SearchData sData) {
+
+        ResponseData ruleResponse = new ResponseData();
+
+        List<MedicalIndication> reminder;
+        try {
+            Map<String, List<Rule>> rule = ApplicationCacheUtil.get_rule_filter_map();
+
+            // 用规则处理化验结果
+            reminder = applytolis(sData.getLisArr(), rule);
+
+            // 用规则处理辅检结果
+            reminder.addAll(applytopacs(sData.getPacs(), rule));
+
+            // 用规则处理体征结果
+            reminder.addAll(applytovital(sData.getVital(), rule));
+
+            ruleResponse.setMedicalIndications(reminder);
+
+        } catch (Exception ex) {
+            ex.printStackTrace();
+        } finally {
+            return ruleResponse;
+        }
+    }
+
+    private List<MedicalIndication> applytolis(List<LisDetail> lisarr, Map<String, List<Rule>> rule) {
+
+        List<MedicalIndication> reminder = new ArrayList<>();
+        try {
+            String name;
+            String detail;
+
+            for (LisDetail lis : lisarr) {
+                detail = lis.getDetailName();
+//                name = lis.getName();
+                String key = detail;
+                if (rule.get(key) != null) {
+                    reminder.addAll(comparelis(rule.get(key), lis));
+                }
+            }
+
+        } catch (Exception ex) {
+            ex.printStackTrace();
+        } finally {
+            return reminder;
+        }
+    }
+
+    private List<MedicalIndication> applytopacs(String pacs, Map<String, List<Rule>> rule) {
+        List<MedicalIndication> reminder = new ArrayList<>();
+
+        try {
+            Set<String> pacsResultList = new HashSet<>();
+            Lexeme lexeme;
+            LexemePath<Lexeme> lexemes = ParticipleUtil.participle(pacs);
+            for (int i = 0; i < lexemes.size(); i++) {
+                lexeme = lexemes.get(i);
+                List<String> propetys = Arrays.asList(lexeme.getProperty().split(","));
+                if (lexeme.getText().trim().length() > 0) {
+                    if(propetys.contains(Constants.word_property_PACS_Result)){
+                        pacsResultList.add(lexeme.getText());
+                    }
+                }
+            }
+            if(pacsResultList.size()>0){
+                for (String pacsResult:pacsResultList) {
+                    if(rule.containsKey(pacsResult)){
+                        List<Rule> rules = rule.get(pacsResult);
+
+                        List<MedicalIndicationDetail> mds = new ArrayList<>();
+                        MedicalIndicationDetail medicalIndicationDetail = new MedicalIndicationDetail();
+                        medicalIndicationDetail.setType(4);
+                        JSONObject jsonObject = new JSONObject();
+                        jsonObject.put("controlType",2);
+                        jsonObject.put("name",pacsResult);
+                        medicalIndicationDetail.setContent(jsonObject);
+                        mds.add(medicalIndicationDetail);
+                        MedicalIndication medicalIndication = new MedicalIndication();
+                        medicalIndication.setName(rules.get(0).getIdx_name()+","+rules.get(0).getRemind());
+                        medicalIndication.setDetails(mds);
+                        reminder.add(medicalIndication);
+                    }
+                }
+            }
+        } catch (Exception ex) {
+            ex.printStackTrace();
+        } finally {
+            return reminder;
+        }
+    }
+
+    private List<MedicalIndication> applytovital(String vital, Map<String, List<Rule>> rule) {
+
+        List<MedicalIndication> reminder = new ArrayList<>();
+
+        try {
+            Map<String, Object> vitobj = new HashMap<>();
+            Lexeme lexeme;
+            LexemePath<Lexeme> lexemes = ParticipleUtil.participle(vital);
+            for (int i=0; i<lexemes.size(); i++) {
+                lexeme = lexemes.get(i);
+                if (lexeme.getText().trim().length() > 0) {
+                    if (lexeme.getProperty().equals(Constants.word_property_vital_idx)) {
+                        vitobj = new HashMap<>();
+                        vitobj.put(vitkeyset[0], lexeme.getText());
+                    } else if (lexeme.getProperty().equals(Constants.word_property_number) &&
+                            vitobj.get(vitkeyset[0]) != null) {
+                        vitobj.put(vitkeyset[1], lexeme.getText());
+                    } else if (lexeme.getProperty().equals(Constants.word_property_unit) &&
+                            vitobj.get(vitkeyset[1]) != null) {
+                        vitobj.put(vitkeyset[2], lexeme.getText());
+
+                        if (vitobj.get(vitkeyset[0]).toString().equals(bptype[0]) &&
+                                vitobj.get(vitkeyset[1]).toString().contains(bptype[3])) {
+                            String[] idx = Arrays.asList(bptype).subList(1,3).toArray(new String[2]);
+                            String[] vals = vitobj.get(vitkeyset[1]).toString().split(bptype[3]);
+                            String unit = vitobj.get(vitkeyset[2]).toString();
+
+                            if (idx.length == vals.length) {
+                                for (int j=0; j<idx.length; j++) {
+                                    vitobj = new HashMap<>();
+                                    vitobj.put(vitkeyset[0], idx[j]);
+                                    vitobj.put(vitkeyset[1], vals[j]);
+                                    vitobj.put(vitkeyset[2], unit);
+                                    vitlist.add(vitobj);
+                                }
+                            }
+                        } else {
+                            vitlist.add(vitobj);
+                        }
+                    }
+                }
+//                System.out.println(lexeme.getText() + ": " + lexeme.getProperty());
+            }
+
+            for (Map<String, Object> obj : vitlist) {
+                String idx = obj.get(vitkeyset[0]).toString();
+                if (rule.get(idx) != null) {
+                    reminder.addAll(comparevit(rule.get(idx), obj));
+                }
+            }
+            System.out.println("\n");
+        } catch (Exception ex) {
+            ex.printStackTrace();
+        } finally {
+            return reminder;
+        }
+    }
+
+
+    private List<MedicalIndication> comparelis(List<Rule> rules, LisDetail lis) {
+        List<MedicalIndication> reminder = new ArrayList<>();
+
+        try {
+            String detailname = lis.getDetailName();
+            Double numval = lis.getValue();
+            String unit = lis.getUnits();
+            String otherval = lis.getOtherValue();
+
+            reminder = compare(rules, reminder, detailname, numval, unit, otherval);
+        } catch (Exception ex) {
+            ex.printStackTrace();
+        } finally {
+            return reminder;
+        }
+    }
+
+    private List<MedicalIndication> comparevit(List<Rule> rules, Map<String, Object> vit) {
+        List<MedicalIndication> reminder = new ArrayList<>();
+
+        try {
+            String detailname = vit.get(vitkeyset[0]).toString();
+            Double numval = Double.valueOf(vit.get(vitkeyset[1]).toString());
+            String unit = vit.get(vitkeyset[2]).toString();
+            String otherval = "";
+
+            reminder = compare(rules, reminder, detailname, numval, unit, otherval);
+        } catch (Exception ex) {
+            ex.printStackTrace();
+        } finally {
+            return reminder;
+        }
+    }
+
+    private List<MedicalIndication> compare(List<Rule> rules, List<MedicalIndication> reminder,
+                                            String detailname, Double numval, String unit, String otherval) {
+        boolean minmatch, maxmatch;
+        Double minval, maxval;
+        String minop, maxop, minunit, maxunit;
+
+        try {
+            if (null == numval && otherval.trim().length() > 0) {
+                for (Rule rule : rules) {
+                    if (rule.getEq_operator().equals("=") && otherval.contains(rule.getEq_value())) {
+                        StringBuffer rulesContent = new StringBuffer();
+                        StringBuffer append = rulesContent.append(rule.getIdx_name()).append(rule.getMin_operator()).append(rule.getMin_value()).append(rule.getMin_unit())
+                                .append(rule.getMax_operator()).append(rule.getMax_value()).append(rule.getMax_unit())
+                                .append(rule.getEq_operator()).append(rule.getEq_value()).append(rule.getEq_unit());
+                        MedicalIndication medind = new MedicalIndication();
+                        List<MedicalIndicationDetail> k = new ArrayList<>();
+                        MedicalIndicationDetail mid = new MedicalIndicationDetail();
+                        JSONObject jsonObject = new JSONObject();
+//                        jsonObject.put("name",detailname + ": " + otherval+ ", " +rule.getRemind());
+                        jsonObject.put("name",append.toString());
+                        jsonObject.put("controlType",2);
+                        mid.setType(4);
+                        mid.setContent(jsonObject);
+                        k.add(mid);
+                        medind.setName(rule.getRemind());
+                        medind.setDetails(k);
+                        medind.setRule(append.toString());
+                        reminder.add(medind);
+
+                        System.out.println(medind.getRule() + " -> " + medind.getName());
+                    }
+                }
+            } else if (String.valueOf(numval).trim().length() > 0 && unit.length() > 0){
+                for (Rule rule : rules) {
+                    minmatch = maxmatch = false;
+                    minval = (rule.getMin_value().length()==0)?0:Double.valueOf(rule.getMin_value());
+                    maxval = (rule.getMax_value().length()==0)?0:Double.valueOf(rule.getMax_value());
+                    minunit = rule.getMin_unit();
+                    maxunit = rule.getMax_unit();
+                    minop = rule.getMin_operator();
+                    maxop = rule.getMax_operator();
+
+                    if ( String.valueOf(minval).trim().length() > 0) {
+                        if (minunit.equals(unit) ) {
+                            switch (minop) {
+                                case ">":
+                                    if (numval > minval) { minmatch = true; }
+                                    break;
+                                case ">=":
+                                    if (numval >= minval) { minmatch = true; }
+                                    break;
+                            }
+                        } else { minmatch = false; }
+                    } else { minmatch = false; }
+
+                    if (String.valueOf(maxval).trim().length() > 0 ) {
+                        if (maxunit.equals(unit) ) {
+                            switch (maxop) {
+                                case "<":
+                                    if (numval < maxval) {
+                                        maxmatch = true;
+                                    }
+                                    break;
+                                case "<=":
+                                    if (numval <= maxval) {
+                                        maxmatch = true;
+                                    }
+                                    break;
+                            }
+                        } else { maxmatch = false; }
+                    } else { maxmatch = false; }
+
+                    if (minmatch  || maxmatch) {
+                        StringBuffer rulesContent = new StringBuffer();
+                        StringBuffer append = rulesContent.append(rule.getIdx_name()).append(rule.getMin_operator()).append(rule.getMin_value()).append(rule.getMin_unit())
+                                .append(rule.getMax_operator()).append(rule.getMax_value()).append(rule.getMax_unit());
+
+                        MedicalIndication medind = new MedicalIndication();
+                        List<MedicalIndicationDetail> k = new ArrayList<>();
+                        MedicalIndicationDetail mid = new MedicalIndicationDetail();
+                        JSONObject jsonObject = new JSONObject();
+//                        jsonObject.put("name",detailname + ": " + numval + " " + unit+ "," +rule.getRemind());
+                        jsonObject.put("name", append.toString());
+                        jsonObject.put("controlType",2);
+                        mid.setType(4);
+                        mid.setContent(jsonObject);
+                        k.add(mid);
+                        medind.setName(rule.getRemind());
+                        medind.setDetails(k);
+                        medind.setRule(append.toString());
+                        reminder.add(medind);
+
+                        System.out.println(medind.getRule() + " -> " + medind.getName());
+                    }
+                }
+            }
+
+        } catch (Exception ex) {
+            ex.printStackTrace();
+        } finally {
+            return reminder;
+        }
+    }
+
+    private List<LisDetail> processLis(List<LisDetail> lisArr) {
+        if (lisArr == null) {
+            return new ArrayList<>();
+        }
+        if (lisArr.size() == 0) {
+            return lisArr;
+        }
+
+        String Otherval = "";
+
+        for (int i = 0; i < lisArr.size(); i++) {
+            LisDetail lisres = lisArr.get(i);
+
+//            Otherval = (lisres.getOtherValue().trim().length() > 0) ? lisres.getOtherValue().trim() + "\n" : "";
+            Otherval = lisres.getOtherValue();
+
+            if (Otherval.indexOf(pos) >= 0 || Otherval.indexOf(neg) >= 0) {
+                lisres.setOtherValue(lisres.getDetailName() + Otherval);
+            } else {
+                Otherval = (Otherval.trim().length() > 0) ? Otherval.trim() + "\n" : "";
+                if (lisres.getValue() == null) {
+                    continue;
+                } else if (lisres.getMaxValue() != null && lisres.getValue() > lisres.getMaxValue()) {
+                    lisres.setOtherValue(Otherval + lisres.getDetailName() + up);
+                } else if (lisres.getMinValue() != null && lisres.getValue() < lisres.getMinValue()) {
+                    lisres.setOtherValue(Otherval + lisres.getDetailName() + down);
+                } else {
+                    lisres.setOtherValue(Otherval + lisres.getDetailName() + normal);
+                }
+            }
+        }
+
+        return lisArr;
+    }
+}

+ 1 - 1
push-web/src/main/resources/application.yml

@@ -12,7 +12,7 @@ spring:
       charset: UTF-8
       enabled: true
   datasource:       # mybatis 配置,使用druid数据源
-      url: jdbc:mysql://192.1.3.116:3306/bigdata-web?useUnicode=true&characterEncoding=UTF-8
+      url: jdbc:mysql://1.1.1.1:3306/bigdata-web?useUnicode=true&characterEncoding=UTF-8
       username: root
       password: langtong
       type: com.alibaba.druid.pool.DruidDataSource

+ 49 - 14
push-web/src/main/resources/static/pages/algorithm/list.html

@@ -181,6 +181,31 @@
                     <!-- /.box -->
                 </div>
 
+                <div class="col-xs-4">
+                    <div class="box">
+                        <div class="box-header">
+                            <h3 class="box-title">归一前诊断信息</h3>&nbsp;&nbsp;<label id="before_combine_participle_diag"></label>
+                        </div>
+                        <!-- /.box-header -->
+                        <div class="box-body">
+                            <table id="before_combine_diag_list" class="table table-bordered table-striped">
+                                <thead>
+                                <tr>
+                                    <th>diag</th>
+                                    <th>dept</th>
+                                    <th>rate</th>
+                                </tr>
+                                </thead>
+                                <tbody>
+
+                                </tbody>
+                            </table>
+                        </div>
+                        <!-- /.box-body -->
+                    </div>
+                    <!-- /.box -->
+                </div>
+
                 <div class="col-xs-4">
                     <div class="box">
                         <div class="box-header">
@@ -206,6 +231,14 @@
                 </div>
                 <!-- /.col -->
 
+
+
+
+
+            </div>
+            <!-- /.row -->
+
+            <div class="row">
                 <div class="col-xs-4">
                     <div class="box">
                         <div class="box-header">
@@ -231,12 +264,6 @@
                 </div>
                 <!-- /.col -->
 
-
-
-            </div>
-            <!-- /.row -->
-
-            <div class="row">
                 <div class="col-xs-4">
                     <div class="box">
                         <div class="box-header">
@@ -367,18 +394,20 @@
         var symptom = $("#symptom").val();
         if (diag != '' && symptom == '') {
             $('#diag_list').html("");
+            $('#before_combine_diag_list').html("");
             startDiag('/algorithm/page_neural', '#symptom_list', '1', resourceType, '111', '1');
-            startDiag('/algorithm/page_neural', '#vital_list', '3', resourceType, '131', '3');
-            startDiag('/algorithm/page_neural', '#lis_list', '4', resourceType, '141', '4');
-            startDiag('/algorithm/page_neural', '#pacs_list', '5', resourceType, '151', '5');
+            startDiag('/algorithm/page_neural', '#vital_list', '3,2,7', resourceType, '131', '3');
+            startDiag('/algorithm/page_neural', '#lis_list', '4,2,7', resourceType, '141', '4');
+            startDiag('/algorithm/page_neural', '#pacs_list', '5,2,7', resourceType, '151', '5');
 
         } else {
             startDiag('/algorithm/page_neural', '#symptom_list', '1', resourceType, '11', '1');
-            startDiag('/algorithm/page_neural', '#vital_list', '3', resourceType, '31', '3');
-            startDiag('/algorithm/page_neural', '#lis_list', '4', resourceType, '41', '4');
-            startDiag('/algorithm/page_neural', '#pacs_list', '5', resourceType, '51', '5');
+            startDiag('/algorithm/page_neural', '#vital_list', '3,2,7', resourceType, '31', '3');
+            startDiag('/algorithm/page_neural', '#lis_list', '4,2,7', resourceType, '41', '4');
+            startDiag('/algorithm/page_neural', '#pacs_list', '5,2,7', resourceType, '51', '5');
 
             startDiagMapping('/algorithm/page_neural', '#diag_list', '2', resourceType, '21', '2');
+            startDiagMapping('/algorithm/page_neural', '#before_combine_diag_list', '2', resourceType, '21', '6');
         }
     }
 
@@ -485,7 +514,10 @@
                         $("#participle_pacs").html(json.data.participleSymptom);
                         json.data = json.data.pacs;
                     }
-
+                    if (tp == '6') {
+                        $("#before_combine_participle_diag").html(json.data.participleSymptom);
+                        json.data = json.data.beforeCombineDis;
+                    }
                     return json.data;
                 }
             }
@@ -601,7 +633,10 @@
                         $("#participle_pacs").html(json.data.participleSymptom);
                         json.data = json.data.pacs;
                     }
-
+                    if (tp == '6') {
+                        $("#before_combine_participle_diag").html(json.data.participleSymptom);
+                        json.data = json.data.beforeCombineDis;
+                    }
                     return json.data;
                 }
             }

+ 1 - 1
push-web/src/main/resources/static/pages/extract/feature.html

@@ -99,7 +99,7 @@
                     <input type="checkbox" name="featureType" value="4"/>检验&nbsp;&nbsp;
                     <input type="checkbox" name="featureType" value="5"/>检查&nbsp;&nbsp;
                     <input type="checkbox" name="featureType" value="9"/>特征&nbsp;&nbsp;
-
+                    <input type="checkbox" name="featureType" value="10"/>时间&nbsp;&nbsp;
                     <button type="button" class="btn btn-success pull-right" onclick="_ajax('/feature/generate')"><i
                             class="fa fa-credit-card"></i> 提取
                     </button>

+ 2 - 2
push-web/src/main/resources/static/pages/relation/sample.html

@@ -343,7 +343,7 @@
                 function _ajax(url) {
                     $.support.cors = true;
                     $.ajax({
-                        url: nlp_web_url + '/participle/split_and_highlight',
+                        url: push_web_url + '/participle/split_and_highlight',
                         data: $("#participle_form").serialize(),
                         dataType: "json",
                         type: "post",
@@ -353,7 +353,7 @@
                     });
 
                     $.ajax({
-                        url: nlp_web_url + url,
+                        url: push_web_url + url,
                         data: $("#participle_form").serialize(),
                         dataType: "json",
                         type: "post",