Merge branch 'master' into his/common

src/main/java/com/diagbot/client/CdssCoreClient.java

@@ -245,9 +245,17 @@ public interface CdssCoreClient {
     @PostMapping("/klDisease/searchConcept")
     RespDTO<List<GetAllForRelationDTO>> searchConcept(@Valid @RequestBody SearchConceptVO searchConceptVO);
 
+    //术语集合新增
+    @PostMapping("/klDisease/addConceptClass")
+    RespDTO<List<GetAllForRelationDTO>> addConceptClass(@Valid @RequestBody SearchConceptVO searchConceptVO);
+
+    //规则维护术语查询
+    @PostMapping("/klDisease/searchConceptRuleClass")
+    RespDTO<List<GetAllForRelationDTO>> searchConceptRuleClass(@Valid @RequestBody SearchConceptVO searchConceptVO);
+
     @PostMapping("/cache/clearRuleInfoAll")
     RespDTO<Boolean> clearRuleAll();
 
     @PostMapping("/term/termMatching")
     public RespDTO<List<TermConceptDTO>> getTermMatching(@Valid @RequestBody TermMatchingVO termMatchingVO);
-}
+}

src/main/java/com/diagbot/client/hystrix/CdssCoreHystrix.java

@@ -318,6 +318,18 @@ public class CdssCoreHystrix implements CdssCoreClient {
         return null;
     }
 
+    @Override
+    public RespDTO<List<GetAllForRelationDTO>> addConceptClass(@Valid SearchConceptVO searchConceptVO) {
+        log.error("【hystrix】调用{}异常", "addConceptClass");
+        return null;
+    }
+
+    @Override
+    public RespDTO<List<GetAllForRelationDTO>> searchConceptRuleClass(@Valid SearchConceptVO searchConceptVO) {
+        log.error("【hystrix】调用{}异常", "searchConceptRuleClass");
+        return null;
+    }
+
     @Override
     public RespDTO<Boolean> clearRuleAll() {
         log.error("【hystrix】调用{}异常", "clearRuleAll");
@@ -329,4 +341,4 @@ public class CdssCoreHystrix implements CdssCoreClient {
         log.error("【hystrix】调用{}异常", "getTermMatching");
         return null;
     }
-}
+}

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

@@ -125,6 +125,8 @@ public class ResourceServerConfigurer extends ResourceServerConfigurerAdapter {
                 .antMatchers("/klRule/disableRuleInfo").permitAll()
                 .antMatchers("/klRule/startRuleInfo").permitAll()
                 .antMatchers("/klDisease/searchConcept").permitAll()
+                .antMatchers("/klDisease/addConceptClass").permitAll()
+                .antMatchers("/klDisease/searchConceptRuleClass").permitAll()
                 .antMatchers("/cache/clearRuleAll").permitAll()
                 .antMatchers("/term/termMatching").permitAll()
                 .antMatchers("/dataPage/docking/getDataService").permitAll()
@@ -162,4 +164,4 @@ public class ResourceServerConfigurer extends ResourceServerConfigurerAdapter {
         log.info("Created jwtTokenEnhancerClient success");
         return converter;
     }
-}
+}

src/main/java/com/diagbot/config/security/UrlAccessDecisionManager.java

@@ -167,6 +167,8 @@ public class UrlAccessDecisionManager implements AccessDecisionManager {
                 || matchers("/klRule/disableRuleInfo", request)
                 || matchers("/klRule/startRuleInfo", request)
                 || matchers("/klDisease/searchConcept", request)
+                || matchers("/klDisease/addConceptClass", request)
+                || matchers("/klDisease/searchConceptRuleClass", request)
                 || matchers("/cache/clearRuleAll", request)
                 || matchers("/term/termMatching", request)
                 || matchers("/dataPage/docking/getDataService", request)
@@ -186,4 +188,4 @@ public class UrlAccessDecisionManager implements AccessDecisionManager {
         }
         return false;
     }
-}
+}

src/main/java/com/diagbot/dto/GetAllForRelationDTO.java

@@ -36,7 +36,11 @@ public class GetAllForRelationDTO {
     @ApiModelProperty(value="概念名称(类型)")
     private String conceptNameType;
 
-
+    /**
+     * 说明
+     */
+    @ApiModelProperty(value="说明（remark）")
+    private String remark;
 
 }
 

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

@@ -1029,4 +1029,16 @@ public class ConceptInfoFacade extends ConceptInfoServiceImpl {
         RespDTOUtil.respNGDeal(relationDTORespDTO, "查询诊断依据相关的类型术语失败");
         return relationDTORespDTO.data;
     }
-}
+
+    public List<GetAllForRelationDTO> addConceptClass(SearchConceptVO searchConceptVO) {
+        RespDTO<List<GetAllForRelationDTO>> relationDTORespDTO = cdssCoreClient.addConceptClass(searchConceptVO);
+        RespDTOUtil.respNGDeal(relationDTORespDTO, "术语集合新增失败");
+        return relationDTORespDTO.data;
+    }
+
+    public List<GetAllForRelationDTO> searchConceptRuleClass(SearchConceptVO searchConceptVO) {
+        RespDTO<List<GetAllForRelationDTO>> relationDTORespDTO = cdssCoreClient.searchConceptRuleClass(searchConceptVO);
+        RespDTOUtil.respNGDeal(relationDTORespDTO, "查询规则维护术语查询术语失败");
+        return relationDTORespDTO.data;
+    }
+}

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

@@ -3,11 +3,13 @@ package com.diagbot.vo;
 import com.diagbot.biz.push.entity.Item;
 import com.diagbot.biz.push.entity.Lis;
 import com.diagbot.biz.push.entity.Pacs;
+import com.diagbot.biz.push.entity.Scale;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
 
 import javax.validation.constraints.NotNull;
+import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 import java.util.Map;
@@ -185,6 +187,14 @@ public class PushJoinVO {
      * 其他指标
      */
     private Map<String, String> otherIndex;
+    /**
+     * 其他医嘱
+     */
+    private List<Item> otherAdvice = new ArrayList<>();
+    /**
+     * 量表结果
+     */
+    private List<Scale> scale = new ArrayList<>();
 
     //创建时间
     @ApiModelProperty(hidden = true)

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

@@ -17,7 +17,6 @@ import java.util.List;
 @Getter
 public class SearchConceptVO {
     @ApiModelProperty(value="名称")
-    @NotBlank(message = "请输入搜索名称")
     private String name;
     /**
      * 词性id
@@ -30,4 +29,10 @@ public class SearchConceptVO {
      */
     @ApiModelProperty(value="需要排除的概念id集合")
     private List<Long> excludedConceptIds;
+
+    /**
+     * 标志（新增 -1 修改 2）
+     */
+//    @ApiModelProperty(value="新增修改标志")
+//    private Integer sign;
 }

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

@@ -3,6 +3,7 @@ package com.diagbot.vo;
 import com.diagbot.biz.push.entity.Item;
 import com.diagbot.biz.push.entity.Lis;
 import com.diagbot.biz.push.entity.Pacs;
+import com.diagbot.biz.push.entity.Scale;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
@@ -176,4 +177,13 @@ public class SearchData extends HospitalBaseVO {
      * 其他指标
      */
     private Map<String, String> otherIndex;
+    /**
+     * 其他医嘱
+     */
+    private List<Item> otherAdvice = new ArrayList<>();
+    /**
+     * 量表结果
+     */
+    private List<Scale> scale = new ArrayList<>();
+
 }

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

@@ -37,7 +37,8 @@ public class KlDiseaseController {
     @ApiOperation(value = "查询诊断依据相关的类型术语[by:kongwz]",
             notes = "name: 查询术语的名称<br>" +
                     "libType: 查询术语的词性<br>" +
-                    "excludedConceptIds: 需要排除的概念id集合")
+                    "excludedConceptIds: 需要排除的概念id集合"+
+                    "sign: 新增 -1 修改 2")
     @PostMapping("/searchConcept")
     @SysLogger("searchConcept")
     public RespDTO<List<GetAllForRelationDTO>> searchConcept(@Valid @RequestBody SearchConceptVO searchConceptVO) {
@@ -45,4 +46,26 @@ public class KlDiseaseController {
         return RespDTO.onSuc(getAllForRelationDTOS);
     }
 
+    @ApiOperation(value = "术语集合新增[by:kongwz]",
+            notes = "name: 查询术语的名称<br>" +
+                    "libType: 查询术语的词性<br>" +
+                    "excludedConceptIds: 需要排除的概念id集合")
+    @PostMapping("/addConceptClass")
+    @SysLogger("addConceptClass")
+    public RespDTO<List<GetAllForRelationDTO>> addConceptClass(@Valid @RequestBody SearchConceptVO searchConceptVO) {
+        List<GetAllForRelationDTO> getAllForRelationDTOS = klConceptFacade.addConceptClass(searchConceptVO);
+        return RespDTO.onSuc(getAllForRelationDTOS);
+    }
+
+    @ApiOperation(value = "规则维护术语查询[by:kongwz]",
+            notes = "name: 查询术语的名称<br>" +
+                    "libType: 查询术语的词性<br>" +
+                    "excludedConceptIds: 需要排除的概念id集合")
+    @PostMapping("/searchConceptRuleClass")
+    @SysLogger("searchConceptRuleClass")
+    public RespDTO<List<GetAllForRelationDTO>> searchConceptRuleClass(@Valid @RequestBody SearchConceptVO searchConceptVO) {
+        List<GetAllForRelationDTO> getAllForRelationDTOS = klConceptFacade.searchConceptRuleClass(searchConceptVO);
+        return RespDTO.onSuc(getAllForRelationDTOS);
+    }
+
 }