Browse Source

测试数据

zhoutg 5 years atrás
parent
commit
d155f0526b

+ 8 - 4
src/main/java/com/diagbot/dto/BillMsg.java

@@ -12,8 +12,12 @@ public class BillMsg {
 
     // 提示信息
     private String msg;
-    // 输入名称
-    private String name;
-    // 标准名称
-    private String standName;
+    // 开单名称
+    private String orderName;
+    // 开单标准名称
+    private String orderStandName;
+    // 匹配名称
+    private String compareName;
+    // 匹配标准名称
+    private String compareStandName;
 }

+ 4 - 0
src/main/java/com/diagbot/dto/WordCrfDTO.java

@@ -6,7 +6,9 @@ import com.diagbot.model.label.*;
 import lombok.Data;
 
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * crf 解析后各個模塊出參
@@ -22,6 +24,8 @@ public class WordCrfDTO {
     private Integer age;
     // 性别(1:男,2:女)
     private Integer sex;
+    // 标准词转换
+    Map<String, Map<String, String>> standConvertMap = new HashMap<>();
     // 化验项目和结果
     private List<Lis> lis = new ArrayList<>();
     // 辅检项目和结果

+ 1 - 0
src/main/java/com/diagbot/facade/CommonFacade.java

@@ -64,6 +64,7 @@ public class CommonFacade {
         standConvert.setDiaglList(diagList);
         return standConvert;
     }
+
     //把图谱返回的标准词set到label中
     public WordCrfDTO dataTypeSet(WordCrfDTO wordCrfDTO, Map<String, Map<String, String>> map){
         ChiefLabel chiefLabel = wordCrfDTO.getChiefLabel();

+ 3 - 2
src/main/java/com/diagbot/facade/IndicationFacade.java

@@ -39,8 +39,9 @@ public class IndicationFacade {
 
         // 标准词转换
         StandConvert standConvert = commonFacade.dataTypeGet(wordCrfDTO);
-        Map<String, Map<String, String>> typeStand = neoFacade.standConvert(standConvert);
-//        wordCrfDTO = commonFacade.dataTypeSet(wordCrfDTO, typeStand);
+        Map<String, Map<String, String>> standConvertMap = neoFacade.standConvert(standConvert);
+        wordCrfDTO = commonFacade.dataTypeSet(wordCrfDTO, standConvertMap);
+        wordCrfDTO.setStandConvertMap(standConvertMap);
 
         List<String> ruleTypeList = Arrays.asList(indicationPushVO.getRuleType().split(","));
 

+ 3 - 1
src/main/java/com/diagbot/vo/StandConvert.java

@@ -1,6 +1,5 @@
 package com.diagbot.vo;
 
-import com.diagbot.model.entity.Clinical;
 import lombok.Data;
 
 import java.util.List;
@@ -16,4 +15,7 @@ import java.util.List;
 public class StandConvert {
     private List<String> clinicalList;
     private List<String> diaglList;
+    private List<String> lisList;
+    private List<String> pacsList;
+    private List<String> drugList;
 }