|
@@ -115,8 +115,11 @@ public class KgFacade extends KgServiceImpl {
|
|
|
|
|
|
public TreeDTO getTreeFac(KgTreeVO kgTreeVO) {
|
|
|
TreeDTO treeDTO = new TreeDTO();
|
|
|
- if (kgTreeVO.getType() == 1
|
|
|
- && kgTreeVO.getSubType() == 1) {
|
|
|
+ if ((kgTreeVO.getType() == 1
|
|
|
+ && (kgTreeVO.getSubType() == 1 || kgTreeVO.getSubType() == 2 || kgTreeVO.getSubType() == 3))
|
|
|
+ || (kgTreeVO.getType() == 2 && (kgTreeVO.getSubType() == 0))
|
|
|
+ || (kgTreeVO.getType() == 3 && (kgTreeVO.getSubType() == 0))
|
|
|
+ || (kgTreeVO.getType() == 4 && (kgTreeVO.getSubType() == 0))) {
|
|
|
// KgQueryVO kgQueryVO = new KgQueryVO();
|
|
|
// kgQueryVO.setLabelName("诊断依据");
|
|
|
// kgQueryVO.setInputStr("诊断依据");
|
|
@@ -124,7 +127,10 @@ public class KgFacade extends KgServiceImpl {
|
|
|
PresetInfo presetInfo = presetInfoFacade.getOne(new QueryWrapper<PresetInfo>()
|
|
|
.eq("is_deleted", IsDeleteEnum.N.getKey())
|
|
|
.eq("type", (kgTreeVO.getType() * 10 + kgTreeVO.getSubType())), false);
|
|
|
- String tree = presetInfo.getContent();
|
|
|
+ String tree = "";
|
|
|
+ if (null != presetInfo){
|
|
|
+ tree = presetInfo.getContent();
|
|
|
+ }
|
|
|
if (StringUtil.isBlank(tree)) {
|
|
|
throw new CommonException(CommonErrorCode.NOT_EXISTS);
|
|
|
} else {
|