瀏覽代碼

宁波人民医院

shiyue 4 年之前
父節點
當前提交
2fbe949ee1

+ 3 - 2
algorithm/src/main/resources/algorithm.properties

@@ -1,8 +1,9 @@
 ################################ model basic url ###################################
 
 #basicPath=E:/project/push/algorithm/src/main/models/model_version_replacement/model
-basicPath=/opt/models/dev/models/model_version_replacement/model
-#basicPath=E:/models_2019_9_24_16_21_29/model_version_replacement/model
+basicPath=/home/server/push/models/model_version_replacement/model
+
+#basicPath=E:/models/model_version_replacement/model
 
 ############################### current model version ################################
 diagnosisPredict.version=outpatient_556_IOE_1

+ 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", "lantone", "jdbc:mysql://192.168.2.121:3306/med?useUnicode=true&characterEncoding=UTF-8");
+        MysqlJdbc nlpJdbc = new MysqlJdbc("root", "L@ngt0ng", "jdbc:mysql://10.48.45.182:3306/med?useUnicode=true&characterEncoding=UTF-8");
         Connection conn = nlpJdbc.connect();
         Statement st = null;
         ResultSet rs = null;

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

@@ -24,8 +24,8 @@ 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.122:3306/med?useUnicode=true&characterEncoding=UTF-8";
+    private String password = "L@ngt0ng";
+    private String url = "jdbc:mysql://10.48.45.182:3306/med?useUnicode=true&characterEncoding=UTF-8";
 
     private String path = "";
 

+ 9 - 0
common-push/src/main/java/org/diagbot/common/push/filter/rule/PretreatmentRule.java

@@ -26,6 +26,7 @@ public class PretreatmentRule {
         //症状规则 主诉、现病史提取
         if (!StringUtils.isEmpty(searchData.getChief())) {
             searchData.setChief(add2PreResultList(new PretreatmentSymptom(), searchData.getChief(), "symptom", searchData));
+            add2PreResultList(new PretreatmentOther(), searchData.getChief(), "other", searchData);         //其他
         }
         //现病史 提取手术史和过敏史
         if (!StringUtils.isEmpty(searchData.getSymptom())) {
@@ -34,7 +35,9 @@ public class PretreatmentRule {
             add2PreResultList(new PretreatmentSymptom(), searchData.getSymptom(), "symptom", searchData);       //症状
             add2PreResultList(new PretreatmentInfectious(), searchData.getSymptom(), "infectious", searchData);     //传染病史
             add2PreResultList(new PretreatmentPacs(), searchData.getSymptom(), "pacs", searchData);         //检查
+            add2PreResultList(new PretreatmentOther(), searchData.getSymptom(), "other", searchData);         //其他
         }
+
         //体征数据 体征、现病史提取
         if (!StringUtils.isEmpty(searchData.getVital())) {
             searchData.setVital(add2PreResultList(new PretreatmentVital(), searchData.getVital(), "vital", searchData));
@@ -95,6 +98,10 @@ public class PretreatmentRule {
         if (!StringUtils.isEmpty(searchData.getVaccination())) {
             add2PreResultList(new PretreatmentVaccination(), searchData.getVaccination(), "vaccination", searchData);
         }
+        //月经史
+        if (!StringUtils.isEmpty(searchData.getMenstrual())){
+            add2PreResultList(new PretreatmentOther(), searchData.getMenstrual(), "other", searchData);
+        }
         //其他史
         if (!StringUtils.isEmpty(searchData.getOther())) {
             add2PreResultList(new PretreatmentPast(), searchData.getOther(), "pasts", searchData);
@@ -107,6 +114,8 @@ public class PretreatmentRule {
             add2PreResultList(new PretreatmentVaccination(), searchData.getOther(), "vaccination", searchData);
             add2PreResultList(new PretreatmentDrug(), searchData.getOther(), "drug", searchData);
             add2PreResultList(new PretreatmentDiag(), searchData.getOther(), "diag", searchData);
+            add2PreResultList(new PretreatmentOther(), searchData.getOther(), "other", searchData);         //其他
+
         }
         //lis结构化信息
         if (searchData.getLis() != null && searchData.getLis().size() > 0) {

+ 3 - 3
graph-web/src/main/resources/url.properties

@@ -1,5 +1,5 @@
-highrisk.http.url=http://192.168.2.123:5004/knowledge/getHighRisk
-lisPacs.http.url=http://192.168.2.123:5004/knowledge/getLisPacs
-disease.http.url=http://192.168.2.123:5004/knowledge/getDisease
+highrisk.http.url=http://10.48.45.180:5004/knowledge/getHighRisk
+lisPacs.http.url=http://10.48.45.180:5004/knowledge/getLisPacs
+disease.http.url=http://10.48.45.180:5004/knowledge/getDisease
 #lisPacs.http.url=http://192.168.3.9:5004/knowledge/getLisPacs
 #highrisk.http.url=http://192.168.3.9:5004/knowledge/getHighRisk

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

@@ -5,15 +5,15 @@ pass_235 = diagbot@20180822
 
 # neo4j bolt credentials
 #\u7EBF\u4E0A\u4F7F\u7528
-bolt.uri=bolt://192.168.2.123
+bolt.uri=bolt://10.48.45.180
 bolt.user=neo4j
-bolt.passwd=root
+bolt.passwd=lt@great
 
 
 #\u6D4B\u8BD5\u4F7F\u7528
-bolt112.uri=bolt://192.168.3.112
+bolt112.uri=bolt://10.48.45.180
 bolt112.user=neo4j
-bolt112.passwd=123456
+bolt112.passwd=lt@great
 
 #\u63A8\u786E\u8BCA\u5904\u7406sql
 #\u67E5\u627E\u662F\u5426\u6709\u7EC4\u5408\u7684\u8BCD

+ 4 - 4
graphdb/src/main/resources/application.yml

@@ -6,16 +6,16 @@ spring:
     active: local
   data:
     neo4j:
-      uri: bolt://192.168.2.123:7687
+      uri: bolt://192.168.2.139:7687
       username: neo4j
-      password: root
+      password:
 
 # 驱动配置信息
   datasource:
     driver-class-name: org.neo4j.jdbc.Driver
-    url: jdbc:neo4j:http://192.168.2.123:7474
+    url: jdbc:neo4j:http://10.48.45.180:7474
     username: neo4j
-    password: root
+    password: lt@great
     #定义初始连接数
     initialSize: 0
     #定义最大连接数

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

@@ -99,9 +99,9 @@ public class DefaultConfig implements Configuration {
             if (StringUtils.isEmpty(path)) {
                 path = DEFAULT_PATH;
             }
-            //            is = this.getClass().getClassLoader().getResourceAsStream(path);
+//                        is = this.getClass().getClassLoader().getResourceAsStream(path);
             File file = new File(path);
-            //            File file = new File(this.getClass().getResource(path).getFile());
+//                        File file = new File(this.getClass().getResource(path).getFile());
             is = new FileInputStream(file);
             if (is == null) {
                 throw new RuntimeException(path + ".......文件未找到!!");

+ 6 - 0
nlp/src/main/java/org/diagbot/nlp/rule/pretreat/PretreatmentOther.java

@@ -29,6 +29,12 @@ public class PretreatmentOther extends Pretreatment {
                 result.setValue(NlpUtil.concept(l, NegativeEnum.MARRIED_DESC));
                 preResults.add(result);
             }
+            if (l.getText().contains("经期")){//针对月经期处理
+                result.setUniqueName("其他--");
+                result.setDetailName("其他--");
+                result.setValue(l.getText());
+                preResults.add(result);
+            }
         }
         return preResults;
     }

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

@@ -1,6 +1,6 @@
 #数据文件存放路径
 cache.file.dir=/opt/diagbot-push/cache_file/
-#cache.file.dir=e:\\cache_file\\
+#cache.file.dir=E:\\opt\\diagbot-push\\cache_file
 
 #抽取时——特征提取范围(不限制范围时配置:all)
 extract.feature.num=all