词性转换

aipt-service/src/main/java/com/diagbot/enums/ConceptTypeEnum.java

@@ -8,7 +8,7 @@ import lombok.Setter;
  * @Author:zhaops
  * @time: 2019/5/7 14:06
  */
-public enum  ConceptTypeEnum implements KeyedNamed {
+public enum ConceptTypeEnum implements KeyedNamed {
     Symptom(1, "症状"),
     Past(2, "既往史"),
     Other(3, "其他史"),

common/src/main/java/com/diagbot/enums/LexiconTypeEnum.java

@@ -1,99 +0,0 @@
-package com.diagbot.enums;
-
-import com.diagbot.core.KeyedNamed;
-import lombok.Setter;
-
-/**
- * @Description: 术语分类枚举
- * @author: gaodm
- * @time: 2019/5/6 13:58
- */
-public enum LexiconTypeEnum implements KeyedNamed {
-    SYMPTOM(1,"症状"),
-    TIME(2,"时间"),
-    BODYPART(3,"部位"),
-    NATURE(4,"性质"),
-    CAUSE(5,"诱因"),
-    DEGREE(6,"程度"),
-    NEGATIVE(7,"阴性"),
-    POSITIVE(8,"阳性"),
-    COMPANY(9,"单位"),
-    DRUGS(10,"药品"),
-    TREATMENT(11,"治疗"),
-    LIS_PACKAGE(12,"化验套餐"),
-    LIS_DETAILS(13,"化验明细"),
-    LIS_RESULTS(14,"化验结果"),
-    PACS_PACKAGE(15,"辅检套餐"),
-    PACS_ITEMS(16,"辅检项目"),
-    PACS_RESULTS(17,"辅检结果"),
-    DIAGNOSIS(18,"诊断"),
-    CONNECTIVES(19,"连接词"),
-    POSITION(20,"方位"),
-    RELATIVES(21,"亲属"),
-    MARRIAGE(22,"婚姻"),
-    FOOD(23,"食品"),
-    HISTORY(24,"历史"),
-    OPERATION(25,"手术"),
-    SYMPTOM_MANIFESTATION(26,"症状表现"),
-    DIGITAL_QUANTIFIER(27,"数字量词"),
-    NUMBER(28,"数字"),
-    DRUG_CATEGORY_BIG(29,"药品大类"),
-    DRUG_CATEGORY_SMALL(30,"药品小类"),
-    PACS_CATEGORY_BIG(31,"辅检大类"),
-    PACS_CATEGORY_SMALL(32,"辅检小类"),
-    VITAL_INDEX(33,"体征指标"),
-    VITAL_INDEX_VALUE(34,"体征指标值"),
-    VITAL_RESULT(35,"体征结果"),
-    PLACE(36,"地点"),
-    OCCUPATION(37,"职业"),
-    PERSONAL_HISTORY(38,"个人史"),
-    PERSONAL_HISTORY_DESCRIPTION(39,"个人史描述"),
-    TIME_DESCRIPTION(40,"时间描述"),
-    SYMPTOM_INDEX(41,"症状指标"),
-    MEDICAL_SUPPLIES(42,"医用耗材 "),
-    DEGREE_CLASSIFIER(43,"程度量词"),
-    OTHER(44,"其他"),
-    DELETE(45,"删除"),
-    LIS_TABLES(46,"化验公表项"),
-    DEPARTMENT(47,"科室"),
-    GAUGE(48,"量表"),
-    SIDE_EFFECTS(49,"不良反应"),
-    CORE_INDICATORS(50,"核心指标"),
-    TYPES_OF_DISEASE(51,"疾病类型(慢病|急诊)");
-
-    @Setter
-    private Integer key;
-
-    @Setter
-    private String name;
-
-    LexiconTypeEnum(Integer key, String name) {
-        this.key = key;
-        this.name = name;
-    }
-
-    public static LexiconTypeEnum getEnum(Integer key) {
-        for (LexiconTypeEnum item : LexiconTypeEnum.values()) {
-            if (item.key == key) {
-                return item;
-            }
-        }
-        return null;
-    }
-
-    public static String getName(Integer key) {
-        LexiconTypeEnum item = getEnum(key);
-        return item != null ? item.name : null;
-    }
-
-    @Override
-    public int getKey() {
-        return key;
-    }
-
-    @Override
-    public String getName() {
-        return name;
-    }
-}
-

common/src/main/java/com/diagbot/enums/ConceptTypeEnum.java

@@ -8,7 +8,7 @@ import lombok.Setter;
  * @Author:zhaops
  * @time: 2019/5/7 14:06
  */
-public enum  ConceptTypeEnum implements KeyedNamed {
+public enum ConceptTypeEnum implements KeyedNamed {
     Symptom(1, "症状"),
     Past(2, "既往史"),
     Other(3, "其他史"),

icss-service/src/main/java/com/diagbot/web/PushController.java

@@ -56,7 +56,7 @@ public class PushController {
                     "lis：source：数据来源（必填）,Integer<br>" +
                     "pacs：辅检,String<br>" +
                     "diag：诊断,String<br>" +
-                    "featureType：类型(必填)，1：症状，3：其他史，4：查体，5：化验，6：辅检，7：诊断,11-管理评估,21-量表内容,22-指标,String<br>" +
+                    "featureType：类型(必填)，1：症状，3：其他史，4：查体，5：化验，6：辅检，7：诊断,22-指标,String<br>" +
                     "diseaeId：取治疗方案的诊断,Long<br>" +
                     "scaleName：量表名称,String<br>" +
                     "scaleId：量表id,Long<br>" +
@@ -67,7 +67,7 @@ public class PushController {
     @PostMapping("/pushInner")
     @SysLogger("pushInner")
     public RespDTO<PushDTO> pushInner(@RequestBody @Valid PushVO pushVO) {
-        return RespDTO.onSuc(pushFacade.pushInner(pushVO, InputModeEnum.Structured.getKey()));
+        return RespDTO.onSuc(pushFacade.pushInner(pushVO));
     }
 
     @ApiOperation(value = "知识库标准化-治疗方案[by:zhaops]",
@@ -89,14 +89,14 @@ public class PushController {
                     "pacs：辅检,String<br>" +
                     "diag：诊断,String<br>" +
                     "featureType：类型(必填)，8：治疗方案,String<br>" +
-                    "diseaeName：取治疗方案的诊断,Long<br>" +
+                    "diseaeName：取治疗方案的诊断,String<br>" +
                     "patientId：病人id,Long<br>" +
                     "disType：诊断类型，1-慢病，2-急诊，普通病不填,Integer<br>" +
                     "indications：指标结果,String<br>" +
                     "adverseReactions：不良反应,List<不良反应明细><br>")
     @PostMapping("/pushTreatment")
     @SysLogger("pushTreatment")
-    public RespDTO<Map<String,Object>> pushTreatment(@RequestBody @Valid PushVO pushVO) {
+    public RespDTO<Map<String, Object>> pushTreatment(@RequestBody @Valid PushVO pushVO) {
         return RespDTO.onSuc(pushFacade.pushTreatment(pushVO));
     }
 
@@ -129,7 +129,7 @@ public class PushController {
     @PostMapping("/pushText")
     @SysLogger("pushText")
     public RespDTO<PushDTO> pushText(@RequestBody @Valid PushVO pushVO) {
-        return RespDTO.onSuc(pushFacade.pushInner(pushVO, InputModeEnum.Text.getKey()));
+        return RespDTO.onSuc(pushFacade.pushInner(pushVO));
     }
 
     @ApiOperation(value = "推理接口（大数据结果）[by:zhaops]",

knowledgeman-service/src/main/java/com/diagbot/enums/ConceptTypeEnum.java

@@ -0,0 +1,65 @@
+package com.diagbot.enums;
+
+import com.diagbot.core.KeyedNamed;
+import lombok.Setter;
+
+/**
+ * @Description:
+ * @Author:zhaops
+ * @time: 2019/5/7 14:06
+ */
+public enum ConceptTypeEnum implements KeyedNamed {
+    Symptom(1, "症状"),
+    Past(2, "既往史"),
+    Other(3, "其他史"),
+    Vital(4, "查体"),
+    Lis(5, "化验"),
+    Pacs(6, "辅检"),
+    Disease(7, "诊断"),
+    Drug(8, "药品"),
+    Drug_Category_Big(9, "药品分类-大类"),
+    SIDE_EFFECTS(10, "不良反应"),
+    Drug_Category_Small(11, "药品分类-小类"),
+    LIS_TABLES(12,"化验公表项"),
+    DEPARTMENT(15,"科室"),
+    Scale(21, "量表"),
+    Indication(22, "指标"),
+    LisDetail(51, "化验明细");
+
+
+
+    @Setter
+    private Integer key;
+
+    @Setter
+    private String name;
+
+    ConceptTypeEnum(Integer key, String name) {
+        this.key = key;
+        this.name = name;
+    }
+
+    public static ConceptTypeEnum getEnum(Integer key) {
+        for (ConceptTypeEnum item : ConceptTypeEnum.values()) {
+            if (item.key == key) {
+                return item;
+            }
+        }
+        return null;
+    }
+
+    public static String getName(Integer key) {
+        ConceptTypeEnum item = getEnum(key);
+        return item != null ? item.name : null;
+    }
+
+    @Override
+    public int getKey() {
+        return key;
+    }
+
+    @Override
+    public String getName() {
+        return name;
+    }
+}