Merge remote-tracking branch 'origin/master'

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

@@ -18,6 +18,7 @@ import java.util.*;
 
 import org.diagbot.common.javabean.MedicalIndication;
 import org.diagbot.common.javabean.MedicalIndicationDetail;
+import org.diagbot.graph.util.CacheUtil;
 import org.diagbot.graphWeb.util.MapValueComparator;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -38,8 +39,12 @@ public class GraphCalculate {
 //        ParamsDataProxy paramsDataProxy = new ParamsDataProxy();
 //        paramsDataProxy.createSearchData(request, searchData);
         List<String> inputList = new ArrayList<>();
+        int age = searchData.getAge();
+        String sex = searchData.getSex();
+        logger.info("前端传来的年龄为 :"+age+" 前端传来的性别为 :"+sex);
         //获取缓存
-//        Map<String, String> lexionCache = CacheUtil.getLexionCache();
+        Map<String, String> lexionCache = CacheUtil.getLexionCache();
+        Map<String, Map<String, String>> sexAgeCache = CacheUtil.getSexAgeCache();
         Map<String, Map<String, String>> inputs = searchData.getInputs();
         Set<String> ss = new HashSet<>();
         if(inputs.size()>0){
@@ -69,14 +74,21 @@ public class GraphCalculate {
         List<FeatureRate> featureRates = new ArrayList<>();
         if(condition != null){
             for (Map.Entry<String, Map<String,String>> d : condition.entrySet()) {
-                FeatureRate featureRate = new FeatureRate();
-                featureRate.setFeatureName(d.getKey());
-                featureRate.setExtraProperty("");
-                Map<String, String> value = d.getValue();
-                String s = JSON.toJSONString(value);
-                featureRate.setDesc(s);
-                featureRate.setRate("neo4j");
-                featureRates.add(featureRate);
+                String dis = d.getKey();
+                Map<String, String> sexAgeMap = sexAgeCache.get(dis);
+                if(sexAgeMap != null){
+                    String sexType = sexAgeMap.get("sexType");
+                    if(sex.equals(sexType)){
+                        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");
+                        featureRates.add(featureRate);
+                    }
+                }
             }
         }
         Set<String> diseaseSet =null;
@@ -120,8 +132,7 @@ public class GraphCalculate {
                 responseData.setManagementEvaluation(mangementEvaluation1);
             }
         }
-        int age = searchData.getAge();
-        String sex = searchData.getSex();
+
         //指标推送
         if (featureTypeList.contains("22") ) {
             //查找指标

graph/pom.xml

@@ -27,6 +27,13 @@
             <artifactId>common-service</artifactId>
             <version>1.0.0</version>
         </dependency>
+
+        <dependency>
+            <groupId>org.diagbot</groupId>
+            <artifactId>nlp</artifactId>
+            <version>1.0.0</version>
+        </dependency>
+
         <dependency>
             <groupId>org.neo4j</groupId>
             <artifactId>neo4j</artifactId>

graph/src/main/java/org/diagbot/graph/util/CacheUtil.java

@@ -0,0 +1,47 @@
+package org.diagbot.graph.util;
+
+import org.diagbot.nlp.participle.cfg.Configuration;
+import org.diagbot.nlp.participle.cfg.DefaultConfig;
+
+import java.util.HashMap;
+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";
+        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]);
+            }
+
+        }
+        return lexionMap;
+    }
+    public static Map<String,Map<String,String>> getSexAgeCache(){
+        String path = "sexAge.dict";
+        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);
+            }
+        }
+        return sexAgeMap;
+    }
+}

graph/src/main/resources/lexicon.dict

@@ -0,0 +1,70 @@
+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

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

@@ -0,0 +1,78 @@
+package org.diagbot.graph;
+
+import org.diagbot.pub.jdbc.MysqlJdbc;
+import org.diagbot.pub.utils.security.EncrypDES;
+
+import java.io.FileWriter;
+import java.sql.Connection;
+import java.sql.ResultSet;
+import java.sql.Statement;
+
+public class CacheFile {
+    public static void main(String[] args) {
+        CacheFile cacheFile = new CacheFile();
+        cacheFile.sexAge();
+    }
+    //诊断和性别,年龄的对应
+    public void sexAge(){
+        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, 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);
+            FileWriter fw = new FileWriter(path + "src/main/resources/sexAge.dict");
+            String r1, r2 ,r3,r4;
+            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();
+        } catch (Exception e) {
+            e.printStackTrace();
+        } finally {
+            nlpJdbc.close(rs, st, conn);
+        }
+    }
+
+    //标签类型对应
+    public void contentMaping()  {
+        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 id,name FROM `kl_lexicon`";
+            st = conn.createStatement();
+            rs = st.executeQuery(sql);
+            FileWriter fw = new FileWriter(path + "src/main/resources/lexicon.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);
+        }
+    }
+}