Merge branch 'dev/diagbotcloud20190911_disease' into dev/diagbotcloud20190918_vital

# Conflicts:
#	knowledgeman-service/src/main/java/com/diagbot/facade/ConceptFacade.java

aipt-service/src/main/java/com/diagbot/dto/ConceptDetailDTO.java

@@ -30,4 +30,9 @@ public class ConceptDetailDTO {
      * 是否诊断依据（1-是，0-否）
      */
     private Integer isReason;
-}
+
+    /**
+     * 显示位置（多选）：1-推送展示，2-更多展示，3-一般治疗展示，4-手术治疗展示，5-药品说明书，6-不良反应，7-症状描述信息(智能分诊)
+     */
+    private String position;
+}

data-service/src/main/java/com/diagbot/dto/ConceptDetailDTO.java

@@ -30,4 +30,9 @@ public class ConceptDetailDTO {
      * 是否诊断依据（1-是，0-否）
      */
     private Integer isReason;
-}
+
+    /**
+     * 显示位置（多选）：1-推送展示，2-更多展示，3-一般治疗展示，4-手术治疗展示，5-药品说明书，6-不良反应，7-症状描述信息(智能分诊)
+     */
+    private String position;
+}

docs/017.20190911知识库疾病科室分类维护/init_icss.sql

@@ -0,0 +1,7 @@
+-- ICSS 是否同时对接预问诊设置
+use `sys-tran`;
+INSERT INTO `sys-tran`.`tran_sys_set` (`hospital_code`, `plan`, `sys_type`, `name`, `code`, `value`, `remark`) VALUES ('A001', '0', '11', '是否同时对接预问诊', 'connect_prec', '1', '是否同时对接预问诊（0-不对接，1-对接）');
+
+use `sys-icss`;
+ALTER TABLE `icss_question_info`
+MODIFY COLUMN  `spec_flag` int(11) DEFAULT 0 COMMENT '特殊标记（0：没有标记，1：主诉高亮，2：诱因记录，3：推送可搜索，4：生命体征标记）';

docs/017.20190911知识库疾病科室分类维护/init_med.sql

@@ -0,0 +1,27 @@
+-- 知识库诊断设置科室和疾病分类
+use `med`;
+INSERT INTO `med`.`kl_dictionary_info` (`id`, `is_deleted`, `gmt_create`, `gmt_modified`, `creator`, `modifier`, `group_type`, `name`, `val`, `return_type`, `order_no`, `remark`) VALUES ('3', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '2', 'Ⅰ', 'Ⅰ', '1', '1', '疾病分级-Ⅰ级');
+INSERT INTO `med`.`kl_dictionary_info` (`id`, `is_deleted`, `gmt_create`, `gmt_modified`, `creator`, `modifier`, `group_type`, `name`, `val`, `return_type`, `order_no`, `remark`) VALUES ('4', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '2', 'Ⅱ', 'Ⅱ', '1', '2', '疾病分级-Ⅱ级');
+
+INSERT INTO kl_disease(concept_id)
+SELECT
+a.id
+FROM kl_concept a LEFT JOIN kl_disease b ON a.id=b.concept_id
+WHERE b.id IS NULL AND a.lib_type=18;
+
+UPDATE kl_disease a JOIN 
+(SELECT
+a.id,b.dept_id
+FROM kl_concept a JOIN kl_concept_common b ON a.id=b.concept_id
+WHERE a.lib_type=18 AND b.dept_id IS NOT NULL) b
+ON a.concept_id=b.id
+SET a.dept_id=b.dept_id;
+
+UPDATE  kl_disclaimer_information  SET STATUS = 0   WHERE disclaimer_code = 1 AND title = "1.诊断免责信息";
+ 
+UPDATE  kl_disclaimer_information  SET STATUS = 0   WHERE disclaimer_code = 2  AND title = "2.推送免责信息";
+
+INSERT INTO `kl_disclaimer_information`
+ (`is_deleted`, `gmt_create`, `gmt_modified`, `creator`, `modifier`, `version_id`, `title`, `description`, `order_no`, `status`, `disclaimer_code`, `remark`) 
+ VALUES('N','2019-09-17 13:34:03','2019-09-17 13:34:03','1','1','0','1.诊疗推送（new）','以上诊疗推送仅供医生诊疗过程中参考使用，实际情况以医生临床诊断为准',NULL,'1','2',NULL);
+

docs/017.20190911知识库疾病科室分类维护/init_prec.sql

@@ -0,0 +1,7 @@
+-- 智能预问诊新增时间控件（待定）
+use `sys-prec`;
+ALTER TABLE `prec_question_info`
+MODIFY COLUMN `control_type` tinyint(4) NOT NULL DEFAULT 0 COMMENT '控件类型(0：无类型，默认值 1：单选 2：多选 3：多行输入，生命体征 4：上传图片 5：文本域，自行服药 6：文本框 7：数字文本框 8：多选伴无，9：时间带单位)';
+
+INSERT INTO `prec_dictionary_info` (`id`, `is_deleted`, `gmt_create`, `gmt_modified`, `creator`, `modifier`, `group_type`, `name`, `val`, `return_type`, `order_no`, `remark`) VALUES ('17', 'N', '1970-01-01 12:00:00', '1970-01-01 12:00:00', '0', '0', '2', '时间带单位', '9', '1', '90', '单标签组件类型');
+

icss-service/src/main/java/com/diagbot/dto/ConceptDetailDTO.java

@@ -30,4 +30,9 @@ public class ConceptDetailDTO {
      * 是否诊断依据（1-是，0-否）
      */
     private Integer isReason;
-}
+
+    /**
+     * 显示位置（多选）：1-推送展示，2-更多展示，3-一般治疗展示，4-手术治疗展示，5-药品说明书，6-不良反应，7-症状描述信息(智能分诊)
+     */
+    private String position;
+}

icss-service/src/main/java/com/diagbot/facade/PushFacade.java

@@ -114,6 +114,9 @@ public class PushFacade {
         String[] featureTypes = featureType.split(",|，");
         Set<String> featureTypeSet = new HashSet(Arrays.asList(featureTypes));
 
+        //推理结果返回科室
+        pushDTO.setDept(data.getDept());
+
         //症状 概念+标签id
         if (featureTypeSet.contains(String.valueOf(FeatureTypeEnum.Symptom.getKey()))) {
             List<ConceptPushDTO> symptom = data.getSymptom();

knowledgeman-service/src/main/java/com/diagbot/dto/GetConceptInfoDTO.java

@@ -51,4 +51,22 @@ public class GetConceptInfoDTO {
     @ApiModelProperty(value="症状发生的最大年龄")
     private Integer maxAge;
     
+    /**
+     * 术语类型
+     */
+    @ApiModelProperty(value="术语类型")
+    private String type;
+    
+    /**
+     * 科室概念id
+     */
+    @ApiModelProperty(value="科室概念id")
+    private Long deptId;
+
+    /**
+     * 诊断类型
+     */
+    @ApiModelProperty(value="诊断类型")
+    private String classify;
+    
 }

knowledgeman-service/src/main/java/com/diagbot/entity/Disease.java

@@ -0,0 +1,157 @@
+package com.diagbot.entity;
+
+import java.io.Serializable;
+import java.util.Date;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+
+/**
+ * <p>
+ * 疾病表
+ * </p>
+ *
+ * @author gaodm
+ * @since 2019-09-16
+ */
+@TableName("kl_disease")
+public class Disease implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    /**
+     * 是否删除,N:未删除，Y:删除
+     */
+    private String isDeleted;
+
+    /**
+     * 记录创建时间
+     */
+    private Date gmtCreate;
+
+    /**
+     * 记录修改时间,如果时间是1970年则表示纪录未修改
+     */
+    private Date gmtModified;
+
+    /**
+     * 创建人，0表示无创建人值
+     */
+    private String creator;
+
+    /**
+     * 修改人,如果为0则表示纪录未修改
+     */
+    private String modifier;
+
+    /**
+     * 术语概念id
+     */
+    private Long conceptId;
+
+    /**
+     * 科室概念id
+     */
+    private Long deptId;
+
+    private String classify;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+    public String getIsDeleted() {
+        return isDeleted;
+    }
+
+    public void setIsDeleted(String isDeleted) {
+        this.isDeleted = isDeleted;
+    }
+    public Date getGmtCreate() {
+        return gmtCreate;
+    }
+
+    public void setGmtCreate(Date gmtCreate) {
+        this.gmtCreate = gmtCreate;
+    }
+    public Date getGmtModified() {
+        return gmtModified;
+    }
+
+    public void setGmtModified(Date gmtModified) {
+        this.gmtModified = gmtModified;
+    }
+    public String getCreator() {
+        return creator;
+    }
+
+    public void setCreator(String creator) {
+        this.creator = creator;
+    }
+    public String getModifier() {
+        return modifier;
+    }
+
+    public void setModifier(String modifier) {
+        this.modifier = modifier;
+    }
+    public Long getConceptId() {
+        return conceptId;
+    }
+
+    public void setConceptId(Long conceptId) {
+        this.conceptId = conceptId;
+    }
+    public Long getDeptId() {
+        return deptId;
+    }
+
+    public void setDeptId(Long deptId) {
+        this.deptId = deptId;
+    }
+    public String getClassify() {
+        return classify;
+    }
+
+    public void setClassify(String classify) {
+        this.classify = classify;
+    }
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+
+    @Override
+    public String toString() {
+        return "Disease{" +
+        "id=" + id +
+        ", isDeleted=" + isDeleted +
+        ", gmtCreate=" + gmtCreate +
+        ", gmtModified=" + gmtModified +
+        ", creator=" + creator +
+        ", modifier=" + modifier +
+        ", conceptId=" + conceptId +
+        ", deptId=" + deptId +
+        ", classify=" + classify +
+        ", remark=" + remark +
+        "}";
+    }
+}

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

@@ -0,0 +1,45 @@
+package com.diagbot.enums;
+
+import com.diagbot.core.KeyedNamed;
+import lombok.Setter;
+
+public enum DiseaseClassifyEnum implements KeyedNamed{
+	
+	LevelFirst(1, "Ⅰ"),
+	LevelSecond(2, "Ⅱ");
+	
+	@Setter
+    private Integer key;
+
+    @Setter
+    private String name;
+
+    DiseaseClassifyEnum(Integer key, String name) {
+        this.key = key;
+        this.name = name;
+    }
+
+    public static DiseaseClassifyEnum getEnum(Integer key) {
+        for (DiseaseClassifyEnum item : DiseaseClassifyEnum.values()) {
+            if (item.key == key) {
+                return item;
+            }
+        }
+        return null;
+    }
+
+    public static String getName(Integer key) {
+    	DiseaseClassifyEnum item = getEnum(key);
+        return item != null ? item.name : null;
+    }
+
+    @Override
+    public int getKey() {
+        return key;
+    }
+
+    @Override
+    public String getName() {
+        return name;
+    }
+}

knowledgeman-service/src/main/java/com/diagbot/facade/ConceptFacade.java

@@ -16,11 +16,13 @@ import com.diagbot.dto.GetConceptInfoDetailDTO;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.entity.Concept;
 import com.diagbot.entity.ConceptCommon;
+import com.diagbot.entity.Disease;
 import com.diagbot.entity.Lexicon;
 import com.diagbot.entity.LibraryInfo;
 import com.diagbot.entity.QuestionInfo;
 import com.diagbot.entity.Relation;
 import com.diagbot.entity.wrapper.ConceptWrapper;
+import com.diagbot.enums.DiseaseClassifyEnum;
 import com.diagbot.enums.IsDeleteEnum;
 import com.diagbot.enums.LexiconRSTypeEnum;
 import com.diagbot.enums.LexiconTypeEnum;
@@ -28,6 +30,7 @@ import com.diagbot.exception.CommonErrorCode;
 import com.diagbot.exception.CommonException;
 import com.diagbot.service.ConceptCommonService;
 import com.diagbot.service.ConceptService;
+import com.diagbot.service.DiseaseService;
 import com.diagbot.service.LibraryInfoService;
 import com.diagbot.service.impl.ConceptServiceImpl;
 import com.diagbot.util.BeanUtil;
@@ -108,6 +111,11 @@ public class ConceptFacade extends ConceptServiceImpl {
     @Autowired
     private ConceptCommonFacade conceptCommonFacade;
     @Autowired
+    private DiseaseFacade diseaseFacade;
+    @Autowired
+    @Qualifier("diseaseServiceImpl")
+    private DiseaseService diseaseService;
+    @Autowired
     private LisMappingFacade lisMappingFacade;
     @Autowired
     private ICSSManServiceClient icssManServiceClient;
@@ -434,9 +442,10 @@ public class ConceptFacade extends ConceptServiceImpl {
         getConceptInfoDTO.setLibName(getConceptInfoDetailDTOList.stream().filter(i -> i.getIsConcept() != null && i.getIsConcept() == 1).collect(Collectors.toList()));
         getConceptInfoDTO.setOtherNames(getConceptInfoDetailDTOList.stream().filter(i -> i.getIsConcept() == null || i.getIsConcept() == 0).collect(Collectors.toList()));
 
-        Integer isHasCommon = lexiconFacade.getById(concept.getLibType()).getIsHasCommon();
-        getConceptInfoDTO.setIsHasCommon(isHasCommon);
-        if (isHasCommon == 1) {
+        Lexicon lexicon = lexiconFacade.getById(concept.getLibType());
+        getConceptInfoDTO.setIsHasCommon(lexicon.getIsHasCommon());
+        getConceptInfoDTO.setType(lexicon.getName());
+        if (lexicon.getIsHasCommon() == 1) {
             QueryWrapper<ConceptCommon> conceptCommonQe = new QueryWrapper<>();
             conceptCommonQe.eq("concept_id", getConceptInfoDetailVO.getConceptId());
             ConceptCommon conceptCommon = conceptCommonFacade.getOne(conceptCommonQe);
@@ -447,6 +456,16 @@ public class ConceptFacade extends ConceptServiceImpl {
             }
         }
 
+        if(LexiconTypeEnum.DIAGNOSIS.getKey()==concept.getLibType().intValue()){
+        	QueryWrapper<Disease> diseaseQe = new QueryWrapper<>();
+        	diseaseQe.eq("concept_id", concept.getId());
+        	Disease disease = diseaseFacade.getOne(diseaseQe);
+        	if(disease!=null){
+        		getConceptInfoDTO.setDeptId(disease.getDeptId());
+        		getConceptInfoDTO.setClassify(disease.getClassify());
+        	}
+        }
+
         return getConceptInfoDTO;
     }
 
@@ -628,6 +647,32 @@ public class ConceptFacade extends ConceptServiceImpl {
             conceptCommonFacade.saveOrUpdate(conceptCommon);
         }
 
+        if(lexicon.getName().equals(LexiconTypeEnum.DIAGNOSIS.getName())){
+        	QueryWrapper<Disease> diseaseQe = new QueryWrapper<>();
+        	diseaseQe.eq("concept_id", conceptId);
+        	Disease disease = diseaseFacade.getOne(diseaseQe);
+        	if(disease==null){
+        		disease = new Disease();
+        		disease.setGmtCreate(now);
+        		disease.setCreator(currentUser);
+        	}
+        	disease.setConceptId(conceptId);
+        	disease.setGmtModified(now);
+        	disease.setModifier(currentUser);
+
+        	if(addConceptInfoVO.getAddCptDiseaseExtVO()==null){
+        		QueryWrapper<Concept> conceptQe = new QueryWrapper<>();
+        		conceptQe.eq("lib_name", "全科");
+        		conceptQe.eq("lib_type", LexiconTypeEnum.DEPARTMENT.getKey());
+        		disease.setDeptId(getOne(conceptQe).getId());
+        		disease.setClassify(DiseaseClassifyEnum.LevelFirst.getName());
+        	}else{
+        		BeanUtil.copyProperties(addConceptInfoVO.getAddCptDiseaseExtVO(), disease);
+        	}
+
+        	diseaseFacade.saveOrUpdate(disease);
+        }
+
         return true;
     }
 
@@ -1032,6 +1077,31 @@ public class ConceptFacade extends ConceptServiceImpl {
         if (ListUtil.isNotEmpty(saveOrUpdateConceptCommonList)) {
             conceptCommonService.saveOrUpdateBatch(saveOrUpdateConceptCommonList);
         }
+
+        List<AddConceptInfoVO> disExtConList = addConceptInfoVOList.stream().filter(i->i.getConceptId()==null&&i.getType().equals(LexiconTypeEnum.DIAGNOSIS.getName())).collect(Collectors.toList());
+        if(ListUtil.isNotEmpty(disExtConList)){
+        	String currentUser = UserUtils.getCurrentPrincipleID();
+            Date now = DateUtil.now();
+
+            QueryWrapper<Concept> conceptQe = new QueryWrapper<>();
+    		conceptQe.eq("lib_name", "全科");
+    		conceptQe.eq("lib_type", LexiconTypeEnum.DEPARTMENT.getKey());
+    		Concept deptConcept = getOne(conceptQe);
+
+            List<Disease> saveDiseaseList = Lists.newArrayList();
+            disExtConList.forEach(i->{
+            	Disease disease = new Disease();
+            	disease.setGmtCreate(now);
+            	disease.setCreator(currentUser);
+            	disease.setGmtModified(now);
+            	disease.setModifier(currentUser);
+            	disease.setConceptId(i.getConcept().getId());
+            	disease.setDeptId(deptConcept.getId());
+            	disease.setClassify("Ⅰ");
+            	saveDiseaseList.add(disease);
+            });
+        	diseaseService.saveBatch(saveDiseaseList);
+        }
     }
 
     @SuppressWarnings("deprecation")

knowledgeman-service/src/main/java/com/diagbot/facade/DiseaseFacade.java

@@ -0,0 +1,11 @@
+package com.diagbot.facade;
+
+import org.springframework.stereotype.Component;
+
+import com.diagbot.service.impl.DiseaseServiceImpl;
+
+@Component
+public class DiseaseFacade extends DiseaseServiceImpl {
+
+
+}

knowledgeman-service/src/main/java/com/diagbot/mapper/DiseaseMapper.java

@@ -0,0 +1,16 @@
+package com.diagbot.mapper;
+
+import com.diagbot.entity.Disease;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 疾病表 Mapper 接口
+ * </p>
+ *
+ * @author gaodm
+ * @since 2019-09-16
+ */
+public interface DiseaseMapper extends BaseMapper<Disease> {
+
+}

knowledgeman-service/src/main/java/com/diagbot/service/DiseaseService.java

@@ -0,0 +1,16 @@
+package com.diagbot.service;
+
+import com.diagbot.entity.Disease;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 疾病表 服务类
+ * </p>
+ *
+ * @author gaodm
+ * @since 2019-09-16
+ */
+public interface DiseaseService extends IService<Disease> {
+
+}

knowledgeman-service/src/main/java/com/diagbot/service/impl/DiseaseServiceImpl.java

@@ -0,0 +1,20 @@
+package com.diagbot.service.impl;
+
+import com.diagbot.entity.Disease;
+import com.diagbot.mapper.DiseaseMapper;
+import com.diagbot.service.DiseaseService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 疾病表 服务实现类
+ * </p>
+ *
+ * @author gaodm
+ * @since 2019-09-16
+ */
+@Service
+public class DiseaseServiceImpl extends ServiceImpl<DiseaseMapper, Disease> implements DiseaseService {
+
+}

knowledgeman-service/src/main/java/com/diagbot/service/impl/EnumsDataServiceImpl.java

@@ -33,9 +33,12 @@ public class EnumsDataServiceImpl implements EnumsDataService {
     @Override
     public Map<String, List<EnumEntriesBuilder.Entry>> getEnumsData() {
         Map<String, List<EnumEntriesBuilder.Entry>> enumMap = new EnumEntriesBuilder()
-                .addEnums("disclaimerCodeEnum", DisclaimerCodeEnum.values())
+                .addEnums("disclaimerCodeAllEnum", DisclaimerCodeEnum.values())
+                .addEnums("disclaimerCodeEnum",
+                        DisclaimerCodeEnum.PushLiability, DisclaimerCodeEnum.Disclaimer)
                 .addEnums("positionTypeEnum", PositionTypeEnum.values())
-                .addEnums("lexiconRSTypeEnum", LexiconRSTypeEnum.INCLUDE_OF, LexiconRSTypeEnum.PUSH)
+                .addEnums("lexiconRSTypeEnum",
+                        LexiconRSTypeEnum.INCLUDE_OF, LexiconRSTypeEnum.PUSH)
                 .addEnums("lexiconTypeEnum", LexiconTypeEnum.values())
                 .addEnums("productTypeEnum", ProductTypeEnum.values())
                 .addEnums("concatLexiconTypeEnum",

knowledgeman-service/src/main/java/com/diagbot/vo/AddConceptInfoVO.java

@@ -51,6 +51,12 @@ public class AddConceptInfoVO {
 	@NotEmpty(message="术语明细不能为空")
 	private List<AddConceptInfoDetailVO> detailList;
 	
+	/**
+	 * 诊断类型术语扩展
+	 */
+	@ApiModelProperty(value="诊断类型术语扩展")
+	private AddCptDiseaseExtVO addCptDiseaseExtVO;
+	
 	/**
      * 性别：1:男, 2:女, 3:通用
      */

knowledgeman-service/src/main/java/com/diagbot/vo/AddCptDiseaseExtVO.java

@@ -0,0 +1,33 @@
+package com.diagbot.vo;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * @Description
+ * @author rgb
+ * @time 2019-03
+ */
+@Getter
+@Setter
+public class AddCptDiseaseExtVO {
+	
+	/**
+     * 诊断归属科室id
+     */
+	@ApiModelProperty(value="诊断归属科室id",required=true)
+	@NotNull(message="诊断归属科室id必传")
+    private Long deptId;
+
+	/**
+	 * 诊断归属类型
+	 */
+	@ApiModelProperty(value="诊断归属类型",required=true)
+	@NotBlank(message="诊断归属类型必传")
+    private String classify;
+	
+}

knowledgeman-service/src/main/java/com/diagbot/web/ConceptController.java

@@ -137,7 +137,7 @@ public class ConceptController {
             notes = "type: 1:科室、2:辅检、3:慢病")
     @PostMapping("/getConceptListByType")
     @SysLogger("getConceptListByType")
-    @ApiIgnore
+//    @ApiIgnore
     public RespDTO<List<ConceptBaseDTO>> getConceptListByType(@RequestBody ConceptTypeVO conceptTypeVO) {
         return RespDTO.onSuc(conceptFacade.getConceptListByType(conceptTypeVO));
     }

knowledgeman-service/src/main/resources/mapper/DiseaseMapper.xml

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.diagbot.mapper.DiseaseMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.diagbot.entity.Disease">
+        <id column="id" property="id" />
+        <result column="is_deleted" property="isDeleted" />
+        <result column="gmt_create" property="gmtCreate" />
+        <result column="gmt_modified" property="gmtModified" />
+        <result column="creator" property="creator" />
+        <result column="modifier" property="modifier" />
+        <result column="concept_id" property="conceptId" />
+        <result column="dept_id" property="deptId" />
+        <result column="classify" property="classify" />
+        <result column="remark" property="remark" />
+    </resultMap>
+
+</mapper>

ltapi-service/src/main/java/com/diagbot/dto/ConceptDetailDTO.java

@@ -30,4 +30,9 @@ public class ConceptDetailDTO {
      * 是否诊断依据（1-是，0-否）
      */
     private Integer isReason;
-}
+
+    /**
+     * 显示位置（多选）：1-推送展示，2-更多展示，3-一般治疗展示，4-手术治疗展示，5-药品说明书，6-不良反应，7-症状描述信息(智能分诊)
+     */
+    private String position;
+}

prec-service/src/main/java/com/diagbot/facade/InquiryInfoFacade.java

@@ -214,12 +214,12 @@ public class InquiryInfoFacade extends InquiryInfoServiceImpl {
         if (getInquiryDetailVO.getHospitalId() == null && StringUtil.isBlank(getInquiryDetailVO.getHospitalCode())) {
             throw new CommonException(CommonErrorCode.PARAM_IS_NULL, "医院信息(医院id或者医院编码)必传！");
         }
-        if (getInquiryDetailVO.getHospitalDeptId() == null && StringUtil.isBlank(getInquiryDetailVO.getHospitalDeptCode())) {
+        /*if (getInquiryDetailVO.getHospitalDeptId() == null && StringUtil.isBlank(getInquiryDetailVO.getHospitalDeptCode())) {
             throw new CommonException(CommonErrorCode.PARAM_IS_NULL, "科室信息(科室id或者科室编码)必传！");
         }
         if (getInquiryDetailVO.getDoctorId() == null && StringUtil.isBlank(getInquiryDetailVO.getDoctorCode())) {
             throw new CommonException(CommonErrorCode.PARAM_IS_NULL, "医生信息(医生id或者医生编码)必传！");
-        }
+        }*/
         if (getInquiryDetailVO.getPatientId() == null && StringUtil.isBlank(getInquiryDetailVO.getPatientCode()) && StringUtil.isBlank(getInquiryDetailVO.getPatientIdNo())) {
             throw new CommonException(CommonErrorCode.PARAM_IS_NULL, "患者信息(患者id或者患者编码或者患者病历号)必传！");
         }