Merge remote-tracking branch 'origin/dev/log_20211020' into dev/log_20211020

src/main/java/com/diagbot/enums/LexiconEnum.java

@@ -40,6 +40,9 @@ public enum LexiconEnum implements KeyedNamed {
     Tcmdisease(127, "中医疾病"),
     Tcmsyndrome(128, "中医证候"),
     Inducement(129, "诱因"),
+    Law(130, "政策法规"),
+    not(131, "否定词"),
+    Physicotherapy(132, "物理治疗"),
     ICD10Class(300,"ICD10疾病类别"),
     MedChemClass(301,"药品化学物质类别"),
     MedZhiLiaoClass(302,"药品治疗学类别"),
@@ -69,6 +72,7 @@ public enum LexiconEnum implements KeyedNamed {
     TcmdiseaseCollection(326,"中医疾病集合"),
     TcmsyndromeCollection(327,"中医证候集合"),
     InducementCollection(328,"诱因集合"),
+    DugrouteCollection(329,"给药途径集合"),
     ICD10ClassNode(400,"ICD10疾病类别根节点"),
     DeptDiseaseNode(401,"科室疾病类别根节点"),
     MedChemClassNode(402,"药品化学物质类别根节点"),
@@ -79,8 +83,7 @@ public enum LexiconEnum implements KeyedNamed {
     OperationClassNode(407,"手术和操作类别根节点"),
     LisClassNode(408,"实验室检查类别根节点"),
     PacsClassNode(409,"辅助检查类别根节点"),
-    Age(410,"年龄"),
-    Law(130,"政策法规");
+    Age(410,"年龄");
 
 
     @Setter
@@ -126,4 +129,4 @@ public enum LexiconEnum implements KeyedNamed {
     public String getName() {
         return name;
     }
-}
+}

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

@@ -7,6 +7,8 @@ import com.diagbot.dto.RetrievalConceptDTO;
 import com.diagbot.dto.RetrievalDTO;
 import com.diagbot.dto.StaticKnowledgeIndexDTO;
 import com.diagbot.enums.LexiconEnum;
+import com.diagbot.exception.CommonErrorCode;
+import com.diagbot.exception.CommonException;
 import com.diagbot.util.BeanUtil;
 import com.diagbot.util.EntityUtil;
 import com.diagbot.util.ListUtil;
@@ -46,6 +48,10 @@ public class MedRetrievalFacade {
         if (retrievalVO.getSize() == null) {
             retrievalVO.setSize(100);
         }
+        if (retrievalVO.getDefaultList().equals(0)
+                && StringUtil.isBlank(retrievalVO.getInputStr())) {
+            throw new CommonException(CommonErrorCode.PARAM_IS_NULL, "请输入检索内容");
+        }
         RetrievalDTO retrievalDTO = new RetrievalDTO();
         MedRetrievalVO medRetrievalVO = new MedRetrievalVO();
         BeanUtil.copyProperties(retrievalVO, medRetrievalVO);

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

@@ -23,7 +23,7 @@ public class RetrievalVO {
     /**
      * 检索内容
      */
-    @NotBlank(message = "请输入检索内容")
+    //@NotBlank(message = "请输入检索内容")
     private String inputStr;
     //    /**
     //     * 性别：1-男、2-女、3-通用
@@ -38,4 +38,9 @@ public class RetrievalVO {
      */
     @ApiModelProperty(hidden = true)
     private Integer size;
+
+    /**
+     * 默认展示 0:不展示，1：展示全部
+     */
+    private Integer defaultList = 0;
 }

src/main/java/com/diagbot/web/RetrievalController.java

@@ -44,6 +44,7 @@ public class RetrievalController {
     @ApiOperation(value = "术语检索[zhaops]",
             notes = "type： 类型：1-化验大项、2-化验小项、3-辅检、4-诊断、5-药品、6-手术和操作、7-科室、8-输血、9-症状、10-量表、11-护理、12-中医诊断、13-中医证候、14-麻醉、15-药品剂型、16-给药途径 <br>" +
                     "inputStr： 检索内容<br>" +
+                    "defaultList： 默认展示 0:不展示，1：展示全部<br>" +
                     "sex： 性别：1-男、2-女、3-通用 <br>" +
                     "age： 年龄<br>")
     @PostMapping("/index")