诊断归一词库更新

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

@@ -14,13 +14,14 @@ 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) {
+   /* public static void main(String[] args) {
 
         List<String> disList = new LinkedList<>();
         String[] disArray = {"急性胰腺炎","冠心病","急性冠状动脉综合征","急性非ST段抬高型心肌梗死","急性ST段抬高型心肌梗死"
@@ -46,7 +47,7 @@ public class ClassifyDiag {
             System.out.println(d.getFeatureName()+"\t"+d.getRate()+"\t"+d.getExtraProperty());
         }
 
-    }
+    }*/
 
     /**
      * 根据诊断依据规则过滤诊断
@@ -111,10 +112,11 @@ public class ClassifyDiag {
          * 如果图谱推出的诊断和可能诊断有层级关系，就把对应的可能诊断剔除
          */
         List<String> newBIgDiagList = this.removeKeng(queDiagList, bigDiagList);
-
+        System.out.println("图谱归一前数据 ："+queDiagList);
         if(queDiagList != null && queDiagList.size()>0){
             //图谱归一
             Set<String> queSet = this.diagProcess(queDiagList);
+            System.out.println("图谱归一后的数据    ："+queSet);
             if(queSet != null && queSet.size()>0){
                 for (String queDis:queSet) {
                     if(queDiagList.indexOf(queDis)>=0){ //可以找到，就取出来，用原来的

graph/src/main/resources/diagClassify.dict

@@ -53,9 +53,9 @@ aoyMNdWOkHezBcuWAN69djha8zxf3Hy7
 lIV9YVV9QejkIyCl824uizha8zxf3Hy7
 LAP6atSHlLJw2EZUYZ9TOTha8zxf3Hy7
 LAP6atSHlLIqGEwAN87XepyzLvIGtX+Ol1M+9nQLrYQtpHqBV1Ei4WVeX46M4V00m0CcuRvPf+M=
-BklPGQplmWIXRKXy8T3Jw7Ni4V+oGfGr
+BklPGQplmWLohT4jcppA9F7IHDS5I2/n
 BklPGQplmWJrhbPpUhe2EArZxL5wy5xjb0zp3pbRbBgPSkwiuy+mJg==
-BklPGQplmWJ9tcg3DubQ+dNTGLrlDClHW2BQgfS2KKA=
+BklPGQplmWJrtdU0KGYRIKzLO3h9qz3/
 p9xqtUeJYuV763zk1n7SVFIPcgQwW0ctynkGSrhDIiOM60xJYFx0aQ==
 p9xqtUeJYuV763zk1n7SVPMvMCS4x4x/YiRu1ikKWf8Z2wSwovQtcRqv2V2sZD8x
 RDRqSmn8EECp5vSNnZ4Fp31H6jXXJjK2ht920Hnr08U=
@@ -79,3 +79,7 @@ WEck0+cxgSIjbkhvE0jRPBw91EHpsWRO
 WEck0+cxgSIjbkhvE0jRPJTYEeFyhgm3JxzpZJtLMQNKYBGd+lGX+w==
 Liq4+z+iHBbQC3hom0PzAIso9V888m13KiDzJFJhabu03GZdWL8lkDx5HY77PTBpcNQEpTpRXla03GZdWL8lkET0g0IOo8TG
 Liq4+z+iHBYKw1llIDNuU5Qw++y19ijkrrOwRuaa87u03GZdWL8lkJbWROriztT4xcrxFBQsXlC03GZdWL8lkET0g0IOo8TG
+9K+PZ38Hd/1bK60dslh9jD08xZT/RFfX3Xy+aWqbuA9KYBGd+lGX+w==
+9K+PZ38Hd/0lZB4l/ViRPT08xZT/RFfX3Xy+aWqbuA9KYBGd+lGX+w==
+entv5lp5ztFvMc6gf+vo7Hp7b+Zaec7RkAeuGME68RI=
+entv5lp5ztEp+RSWAxFgMXp7b+Zaec7RkAeuGME68RI=

graph/src/test/java/org/diagbot/graph/CacheFile.java

@@ -13,7 +13,7 @@ import java.util.*;
 public class CacheFile {
     public static void main(String[] args) {
         CacheFile cacheFile = new CacheFile();
-        cacheFile.diagSort();
+        cacheFile.diagClassifyMaping();
 
     }
     //疾病 -- 科室