Browse Source

新版推理

Zhaops 6 năm trước cách đây
mục cha
commit
b01ee4b036

+ 1 - 1
config-server/src/main/resources/shared/icss-service-dev.yml

@@ -100,7 +100,7 @@ mybatis-plus:
 
 ai:
   server:
-    address: http://192.168.2.234:8080
+    address: http://192.168.2.234:5008
 
 treat:
   server:

+ 1 - 1
config-server/src/main/resources/shared/icss-service-local.yml

@@ -100,7 +100,7 @@ mybatis-plus:
 
 ai:
   server:
-    address: http://192.168.2.234:8080
+    address: http://192.168.2.234:5008
 
 treat:
   server:

+ 1 - 1
config-server/src/main/resources/shared/icss-service-pro.yml

@@ -100,7 +100,7 @@ mybatis-plus:
 
 ai:
   server:
-    address: http://192.168.2.234:8080
+    address: http://192.168.2.234:5008
 
 treat:
   server:

+ 1 - 1
config-server/src/main/resources/shared/icss-service-test.yml

@@ -100,7 +100,7 @@ mybatis-plus:
 
 ai:
   server:
-    address: http://192.168.2.234:8080
+    address: http://192.168.2.234:5008
 
 treat:
   server:

+ 1 - 1
icss-service/src/main/java/com/diagbot/client/AIServiceClient.java

@@ -15,6 +15,6 @@ import org.springframework.web.bind.annotation.RequestBody;
  */
 @FeignClient(name = "AI", url = "${ai.server.address}", fallback = AIServiceHystrix.class)
 public interface AIServiceClient {
-    @PostMapping(value = "/web/doc/algorithm/neural")
+    @PostMapping(value = "/push-web/algorithm/neural")
     Response<ResponseData> bayesPageData(@RequestBody SearchData searchData);
 }

+ 2 - 1
icss-service/src/main/java/com/diagbot/client/bean/MedicitionClass.java

@@ -18,6 +18,7 @@ public class MedicitionClass {
      * 1-有提示信息,0-没有提示信息
      */
     private String showInfo = "0";
-    private String drugsName;//药类名
+    private String bigdrugsName;//药类名
+    private String subdrugsName;//药类名-小类
     private LinkedList<Medicition> medicitionsList;
 }

+ 6 - 6
icss-service/src/main/java/com/diagbot/facade/TreatmentFacade.java

@@ -70,19 +70,19 @@ public class TreatmentFacade {
         retMap.put("surgeryTreatment", surgeryTreatmentDetailList.size() > 0 ? surgeryTreatmentDetailList.get(0).getContent() : "");
 
         //获取知识图谱治疗方案
-        JSONObject diseaseJson = treatmentMap.get(disease.getTagName());
-        if (diseaseJson == null || diseaseJson.isEmpty()) {
+        JSONObject treatmentJson = treatmentMap.get(disease.getTagName());
+        if (treatmentJson == null || treatmentJson.isEmpty()) {
             return retMap;
         }
 
-        JSONObject treatmentJson = diseaseJson.getJSONObject(disease.getTagName());
+        /*JSONObject treatmentJson = diseaseJson.getJSONObject(disease.getTagName());
         if (treatmentJson == null || treatmentJson.isEmpty()) {
             return retMap;
-        }
+        }*/
 
         List<MedicitionClass> drugsList = FastJsonUtils.getJsonToListByKey(treatmentJson.toString(), "treatment", MedicitionClass.class);
 
-        List<String> classNameList = drugsList.stream().map(drugs -> drugs.getDrugsName()).collect(Collectors.toList());
+        List<String> classNameList = drugsList.stream().map(drugs -> drugs.getBigdrugsName()).collect(Collectors.toList());
         List<QuestionInfo> drugClassList = getTopQuestionList(classNameList, QuestionTypeEnum.DrugClass.getKey());
         Map<String, QuestionInfo> drugClassMap = EntityUtil.makeEntityMap(drugClassList, "tagName");
         List<Long> drugClassIds = drugClassList.stream().map(drugClass -> drugClass.getId()).collect(Collectors.toList());
@@ -90,7 +90,7 @@ public class TreatmentFacade {
         Map<Long, IntroduceMap> introduceMapMap = EntityUtil.makeEntityMap(introduceMapList, "questionId");
 
         for (MedicitionClass medicitionClass : drugsList) {
-            QuestionInfo drugClass = drugClassMap.get(medicitionClass.getDrugsName());
+            QuestionInfo drugClass = drugClassMap.get(medicitionClass.getBigdrugsName());
             if (drugClass != null) {
                 medicitionClass.setId(drugClass.getId());
                 if (introduceMapMap.get(drugClass.getId()) != null) {