Merge remote-tracking branch 'origin/master'

src/main/java/com/diagbot/config/RedisConfigurer.java

@@ -36,7 +36,7 @@ public class RedisConfigurer extends CachingConfigurerSupport {
 
     @Value("${spring.redis.database.cache}")
     private String databaseCache;
-    @Value("${spring.redis.database.token}")
+    @Value("${spring.redis.database.similar}")
     private String databaseMr;
     @Value("${spring.redis.host}")
     private String host;
@@ -139,17 +139,17 @@ public class RedisConfigurer extends CachingConfigurerSupport {
     }
 
     /**
-     * Token使用的redis
+     * Similar使用的redis
      *
      * @return
      */
-    @Bean("factoryForToken")
+    @Bean("factoryForSimilar")
     public LettuceConnectionFactory redisConnectionFactoryForToken() {
         return getRedisConnectionFactory(Integer.valueOf(databaseMr));
     }
 
-    @Bean(name = "redisTemplateForToken")
-    public RedisTemplate<String, Object> redisTemplateForToken(@Qualifier("factoryForToken") LettuceConnectionFactory factory) {
+    @Bean(name = "redisTemplateForSimilar")
+    public RedisTemplate<String, Object> redisTemplateForToken(@Qualifier("factoryForSimilar") LettuceConnectionFactory factory) {
         return getRedisTemplate(factory);
     }
 

src/main/java/com/diagbot/facade/NeoFacade.java

@@ -11,6 +11,7 @@ import com.diagbot.entity.node.*;
 import com.diagbot.enums.StandConvertEnum;
 import com.diagbot.model.ai.ModelAI;
 import com.diagbot.repository.*;
+import com.diagbot.util.ListUtil;
 import com.diagbot.vo.BillNeoVO;
 import com.diagbot.vo.PushNeoVO;
 import com.diagbot.vo.StandConvert;
@@ -277,6 +278,18 @@ public class NeoFacade {
                 similarMap.get(StandConvertEnum.clinical.getName()), "chief_present");
         map.put(StandConvertEnum.clinical.getName(), clinicalMap);
 
+        // 诊断数据
+        List<String> diag_list = standConvert.getDiaglList();
+        Map<String, String> diseaseMap = getStandConvertTypeMap(modelAI, diag_list,
+                similarMap.get(StandConvertEnum.disease.getName()), "diagnose");
+        map.put(StandConvertEnum.disease.getName(), diseaseMap);
+
+        // 手术数据
+        List<String> operation_list = standConvert.getOperationList();
+        Map<String, String> operationMap = getStandConvertTypeMap(modelAI, operation_list,
+                similarMap.get(StandConvertEnum.operation.getName()), "operation");
+        map.put(StandConvertEnum.operation.getName(), operationMap);
+
         return map;
     }
 
@@ -291,6 +304,9 @@ public class NeoFacade {
      */
     public Map<String, String> getStandConvertTypeMap(ModelAI modelAI, List<String> text, List<String> cacheList, String modelName) {
         Map<String, String> map = new LinkedHashMap<>();
+        if (ListUtil.isEmpty(cacheList)) {
+            return map;
+        }
         for (String s : text) {
             JSONArray jsonArray = modelAI.loadSimilarAI(s, cacheList,
                     false, modelName, chiefPresentSimilarityServiceClient);

src/main/java/com/diagbot/util/RedisUtil.java

@@ -0,0 +1,53 @@
+package com.diagbot.util;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.stereotype.Component;
+
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @description:
+ * @author: zhoutg
+ * @time: 2020/8/11 19:52
+ */
+@Component
+public class RedisUtil {
+
+    @Autowired
+    @Qualifier("redisTemplateForSimilar")
+    RedisTemplate redisTemplate;
+
+    /**
+     * 获取指定类型的数据
+     *
+     * @param list
+     * @param type
+     * @return
+     */
+    public Map<String, String> getValueByType(List<String> list, String type) {
+        Map<String, String> res = new LinkedHashMap<>();
+        Map<String, String> map = (Map<String, String>)redisTemplate.opsForValue().get(type);
+        if (map == null) {
+            return res;
+        }
+        for (String str : list) {
+            res.put(str, map.get(str) == null ? "" : map.get(str));
+        }
+        return res;
+    }
+
+
+    /**
+     * 更新指定类型下的数据
+     *
+     * @param map
+     * @param type
+     */
+    public void updateValueByType(Map<String, String> map, String type) {
+        redisTemplate.opsForValue().set(type, map);
+    }
+}

src/main/java/com/diagbot/vo/SearchData.java

@@ -101,6 +101,10 @@ public class SearchData extends HospitalBaseVO {
      * 药品文本数据
      */
     private String drugString = "";
+    /**
+     * 科室
+     */
+    private List<Item> dept = new ArrayList<>();
     /**
      * 化验项目和结果
      */

src/main/resources/application-dev.yml

@@ -87,7 +87,7 @@ spring:
   redis:
     database:
       cache: 11 # cache索引
-      token: 11 # Token索引
+      similar: 11 # similar索引
     host: 192.168.2.236  #Redis服务器地址
     port: 6379 # Redis服务器连接端口(本地环境端口6378，其他环境端口是6379)
     password: lantone # Redis服务器连接密码（默认为空）
@@ -147,3 +147,6 @@ swagger:
 
 CRF:
   url: http://192.168.2.234:3456
+
+ChiefPresentSimilarity:
+  url: http://192.168.2.234:3456

src/main/resources/application-local.yml

@@ -87,7 +87,7 @@ spring:
   redis:
     database:
       cache: 11 # cache索引
-      token: 11 # Token索引
+      similar: 11 # similar索引
     host: 192.168.2.236  #Redis服务器地址
     port: 6378 # Redis服务器连接端口(本地环境端口6378，其他环境端口是6379)
     password: lantone # Redis服务器连接密码（默认为空）
@@ -148,6 +148,5 @@ swagger:
 CRF:
   url: http://192.168.2.234:3456
 
-
 ChiefPresentSimilarity:
   url: http://192.168.2.234:3456

src/main/resources/application-pre.yml

@@ -87,7 +87,7 @@ spring:
   redis:
     database:
       cache: 11 # cache索引
-      token: 11 # Token索引
+      similar: 11 # similar索引
     host: 192.168.2.121  #Redis服务器地址
     port: 6379 # Redis服务器连接端口(本地环境端口6378，其他环境端口是6379)
     password: lantone # Redis服务器连接密码（默认为空）
@@ -147,3 +147,6 @@ swagger:
 
 CRF:
   url: http://192.168.2.234:3456
+
+ChiefPresentSimilarity:
+  url: http://192.168.2.234:3456

src/main/resources/application-pro.yml

@@ -87,7 +87,7 @@ spring:
   redis:
     database:
       cache: 11 # cache索引
-      token: 11 # Token索引
+      similar: 11 # similar索引
     host: 192.168.2.122  #Redis服务器地址
     port: 6379 # Redis服务器连接端口(本地环境端口6378，其他环境端口是6379)
     password: lantone # Redis服务器连接密码（默认为空）
@@ -149,3 +149,6 @@ swagger:
 
 CRF:
   url: http://192.168.2.234:3456
+
+ChiefPresentSimilarity:
+  url: http://192.168.2.234:3456

src/main/resources/application-test.yml

@@ -87,7 +87,7 @@ spring:
   redis:
     database:
       cache: 11 # cache索引
-      token: 11 # Token索引
+      similar: 11 # similar索引
     host: 192.168.2.241  #Redis服务器地址
     port: 6379 # Redis服务器连接端口(本地环境端口6378，其他环境端口是6379)
     password: lantone # Redis服务器连接密码（默认为空）
@@ -147,3 +147,6 @@ swagger:
 
 CRF:
   url: http://192.168.2.234:3456
+
+ChiefPresentSimilarity:
+  url: http://192.168.2.234:3456